@johnmorrisdotca/uchusen-rockets 0.19.0 → 0.20.0

package/dist/element/scene.js

@@ -31,6 +31,7 @@ import { placeNameLabels } from "./namePlace.js";
 import { plinthGroup } from "./plinth.js";
 import { PartPlumes, PlumeKit } from "./plumes.js";
 import { ThrusterLayer } from "./thrusterLayer.js";
+import { glProbe } from "./probe.js";
 import { craftJets, endQuads } from "../thrusters.js";
 /** The ships whose lamps turn the sun down in the Lit look. Kit modules stay in daylight. */
 const NIGHT_SHIPS = new Set(["fleet-ship-01", "fleet-kyotori", "fleet-drone", "fleet-ship-03", "fleet-ship-ariake", "fleet-02", "fleet-02-original", "fleet-kaminari", "fleet-emiake", "fleet-romaryu"]);
@@ -55,15 +56,8 @@ const COMPILE_MS = 4000;
 /** A change of craft, section or Fit eases the camera for this long, even in scale. */
 const SIZE_EASE_MS = 800;
 const autoRotateOf = (spin) => (spin.seconds <= 0 ? 0 : (60 / spin.seconds) * (spin.way === "cw" ? -1 : 1));
-/** A real graphics card keeps smooth edges. Software drawing spends the frame on them, and a heavy ship then misses a frame of the wait. */
-const smoothEdges = () => {
-    const canvas = document.createElement("canvas");
-    const gl = canvas.getContext("webgl2");
-    const info = gl?.getExtension("WEBGL_debug_renderer_info");
-    const name = info && gl ? String(gl.getParameter(info.UNMASKED_RENDERER_WEBGL)) : "";
-    gl?.getExtension("WEBGL_lose_context")?.loseContext();
-    return !/swiftshader|llvmpipe|softpipe/i.test(name);
-};
+/** A real graphics card keeps smooth edges. Software drawing spends the frame on them, and a heavy ship then misses a frame of the wait. The page's one WebGL probe says which this is. */
+const smoothEdges = () => !glProbe().software;
 const LINE_VERTEX = /* glsl */ `
 varying vec3 vNormal;
 varying vec2 vUv;
@@ -427,6 +421,31 @@ export class RocketViewer {
         this.offScreen = next;
         this.wake();
     }
+    /** The direction towards the Sun, in the craft's own frame, when a page gives one; null keeps the showroom light. */
+    sunFrom = null;
+    /** One light from the Sun's real direction, as in space: the far side dark, with at most a faint fill. Null puts the showroom light back. */
+    setSun(direction) {
+        const before = this.sunFrom;
+        this.sunFrom = direction ? new Vector3(...direction) : null;
+        this.canvas.dataset.sun = this.sunFrom ? "on" : "off";
+        if (before === this.sunFrom || (before && this.sunFrom && before.equals(this.sunFrom)))
+            return;
+        this.nightSide();
+        this.aimKey();
+        this.wake();
+    }
+    /** The key light comes from the Sun when there is one, else from the showroom's upper front. */
+    keyDirection() {
+        return (this.sunFrom ?? new Vector3(3, 5, 4)).clone().normalize();
+    }
+    aimKey() {
+        if (this.shadows && this.built) {
+            this.fitShadow();
+            return;
+        }
+        this.sun.position.copy(this.sun.target.position).addScaledVector(this.keyDirection(), 7);
+        this.sun.target.updateMatrixWorld();
+    }
     /** Open space lets a craft leave the frame. Wrap, the older float, brings it back on the other side. */
     edgesOpen = false;
     setEdges(open) {
@@ -1081,6 +1100,15 @@ export class RocketViewer {
     /** The Lit look of a named SPX ship is the night side. Daylight stays the default, so lamps glow in the sun, and a kit module stays in daylight. */
     nightSide() {
         const night = this.shipNight && this.lightsMode !== "off" && this.glowOn;
+        if (this.sunFrom && !night) {
+            // in space there is one light: the Sun, a little stronger than the showroom's key, and next to nothing from anywhere else
+            this.sun.intensity = 2.4;
+            this.rim.intensity = 0;
+            this.fill.intensity = 0;
+            this.sky.intensity = 0.03;
+            this.scene.environmentIntensity = 0.06;
+            return;
+        }
         this.sun.intensity = night ? 0.16 : 1.6;
         this.rim.intensity = night ? 0.04 : 1.1;
         this.fill.intensity = night ? 0.03 : 0.35;
@@ -1607,7 +1635,7 @@ export class RocketViewer {
         const { min, max } = this.built.boundsOf(this.show);
         const centre = new Vector3((min[0] + max[0]) / 2, (min[1] + max[1]) / 2, (min[2] + max[2]) / 2);
         const radius = Math.max(1, Math.hypot(max[0] - min[0], max[1] - min[1], max[2] - min[2]) / 2);
-        const direction = new Vector3(3, 5, 4).normalize();
+        const direction = this.keyDirection();
         this.sun.position.copy(centre).addScaledVector(direction, radius * 2);
         this.sun.target.position.copy(centre);
         const shadow = this.sun.shadow;

package/dist/element.d.ts

@@ -63,8 +63,12 @@ export declare class UchusenRocket extends HTMLBase {
     private builtNow;
     private queued;
     private stateNow;
+    /** What the flag in the corner is for: a country's code, "" for none, "off", or "-" before the first look. */
+    private flagKey;
     private shownAt;
     private starting;
+    /** Whether this element has asked the page's WebGL answer since it started watching. */
+    private glAsked;
     private key;
     private driven;
     private placeFrame;
@@ -199,6 +203,8 @@ export declare class UchusenRocket extends HTMLBase {
     /** The drawing for what the attributes say now. It is made from code, so it needs no file. A zoom or a move only changes which part of it the box shows (its viewBox), so the drawing is as sharp as the box and never grows past it. */
     private redraw;
     private mark;
+    /** `flags`: the rocket's country's flag in the picture's corner, from hata (an optional peer) when the page has it. `data-flag` is the code shown, or empty once it is settled that none is; it is absent while one is loading or the attribute is off. */
+    private syncFlag;
     private applyRocket;
     /** A fleet ship is built coarse first (the first picture and the far view) and fine when the camera comes near, an inset opens or one part is shown alone: once per visit, never on a turn or a look change. */
     private fine;
@@ -255,6 +261,7 @@ export declare class UchusenLineup extends HTMLBase {
  */
 export declare function defineUchusenRocket(): void;
 export { ROCKETS, UchusenFlight };
+export { setFlagLoader, type FlagSource } from "./element/flag.ts";
 export type { FlightWords } from "./flightbar.ts";
 declare global {
     interface HTMLElementTagNameMap {

package/dist/element.js

@@ -6,6 +6,7 @@ import { buildOf } from "./buildPlay.js";
 import { bellsOf, enginesWanted, pickBells } from "./engines.js";
 import { lightMode } from "./model/fleet/lights.js";
 import { thrusterMode } from "./thrusters.js";
+import { parseSun } from "./sun.js";
 import { motionsOf, motionSpeed, motionWanted } from "./model/fleet/motion.js";
 import { engineChart } from "./draw/plume.js";
 import { burnsOf, FlightClock, flightOf, frameAt, phaseAt, phasePosition } from "./flight.js";
@@ -21,7 +22,9 @@ import { ROCKETS, SLOT_NAMES } from "./rockets.js";
 import { tiltMode, tiltTurn } from "./tilt.js";
 import { skyQuery } from "./element/solarGroups.js";
 import { Panel } from "./element/panel.js";
+import { glProbe } from "./element/probe.js";
 import { spinOf } from "./spin.js";
+import { flagSvg } from "./element/flag.js";
 const HTMLBase = typeof HTMLElement === "undefined" ? class {
 } : HTMLElement;
 /** A view out of sight keeps its WebGL canvas this long before letting it go (a browser allows only a few at a time). */
@@ -46,6 +49,15 @@ export function setAssetBase(url) {
     assetBase = url.endsWith("/") ? url : `${url}/`;
 }
 const defaultBase = () => assetBase ?? new URL("./assets/", import.meta.url).href;
+/** A country's name in the page's language, or its code where the browser has no name for it. */
+function regionName(code, lang) {
+    try {
+        return new Intl.DisplayNames([lang || "en"], { type: "region" }).of(code) ?? code;
+    }
+    catch {
+        return code;
+    }
+}
 const CSS = `
 :host { display: block; position: relative; color: inherit; }
 :host([hidden]) { display: none; }
@@ -72,6 +84,8 @@ const CSS = `
 .panel table { border-collapse: collapse; width: 100%; }
 .panel th, .panel td { text-align: left; padding: 0.15rem 0.4rem; border-bottom: 1px solid color-mix(in srgb, currentColor 25%, transparent); vertical-align: top; }
 .panel p { margin: 0 0 0.5rem; }
+.flag { position: absolute; top: 0.5rem; left: 0.5rem; display: block; width: 1.5rem; aspect-ratio: 4 / 3; line-height: 0; pointer-events: none; box-shadow: 0 0 0 1px color-mix(in srgb, currentColor 35%, transparent); }
+.flag svg { display: block; width: 100%; height: 100%; }
 .tilt { position: absolute; right: 0.5rem; bottom: 0.5rem; min-height: 2rem; padding: 0.25rem 0.75rem; border: 1px solid currentColor; border-radius: 1rem; background: transparent; color: inherit; font: inherit; font-size: 0.8rem; cursor: pointer; }
 @media (prefers-reduced-motion: reduce) {
   .drawing, .canvas { filter: none !important; transition: opacity var(--uchusen-fade, 400ms) ease; }
@@ -94,29 +108,13 @@ function adopt(root, css, holder) {
 const rocketSheet = { sheet: null };
 const lineupSheet = { sheet: null };
 const media = (query) => typeof matchMedia === "function" && matchMedia(query).matches;
-let webgl = null;
-function webglWorks() {
-    if (webgl !== null)
-        return webgl;
-    try {
-        const probe = document.createElement("canvas");
-        const gl = probe.getContext("webgl2") ?? probe.getContext("webgl");
-        webgl = Boolean(gl);
-        gl?.getExtension("WEBGL_lose_context")?.loseContext();
-    }
-    catch {
-        webgl = false;
-    }
-    return webgl;
-}
+/** Why the 3D view is not wanted, from what is known without making a WebGL context. Whether WebGL works is asked once, when the first element comes on screen. */
 function whyNot(mode) {
     if (mode === "drawing")
         return "off";
     const connection = navigator.connection;
     if (connection?.saveData || media("(prefers-reduced-data: reduce)"))
         return "reduced-data";
-    if (!webglWorks())
-        return "no-webgl";
     return "";
 }
 /**
@@ -134,7 +132,7 @@ function whyNot(mode) {
  * ```
  */
 export class UchusenRocket extends HTMLBase {
-    static observedAttributes = ["rocket", "variant", "show", "look", "view", "build", "mode", "assets", "spin", "way", "label", "engines", "lights", "thrusters", "phase", "motion", "labels", "inspector", "beside", "captions", "scale-note", "off-screen", "scale", "progress", "float", "names", "leave", "docked", "edges", "world", "world-turn", "form"];
+    static observedAttributes = ["rocket", "variant", "show", "look", "view", "build", "mode", "assets", "spin", "way", "label", "engines", "lights", "thrusters", "phase", "motion", "labels", "inspector", "beside", "captions", "scale-note", "off-screen", "scale", "progress", "float", "names", "leave", "docked", "edges", "world", "world-turn", "form", "sun", "flags"];
     descriptionValue = null;
     picture = null;
     holder = null;
@@ -152,8 +150,12 @@ export class UchusenRocket extends HTMLBase {
     builtNow = null;
     queued = false;
     stateNow = "picture";
+    /** What the flag in the corner is for: a country's code, "" for none, "off", or "-" before the first look. */
+    flagKey = "-";
     shownAt = 0;
     starting = false;
+    /** Whether this element has asked the page's WebGL answer since it started watching. */
+    glAsked = false;
     key = "";
     driven = null;
     placeFrame = 0;
@@ -334,7 +336,9 @@ export class UchusenRocket extends HTMLBase {
     attributeChangedCallback(name, before, after) {
         if (before === after)
             return;
-        if (name === "scale") {
+        if (name === "flags")
+            this.syncFlag();
+        else if (name === "scale") {
             this.viewer?.setScaleMode(after === "true");
             // `scale="true"` is the true-scale view. A number is a Kaminari size, which rebuilds the craft.
             if (after !== "true" && after !== "false")
@@ -359,6 +363,8 @@ export class UchusenRocket extends HTMLBase {
             this.viewer?.setFloating(after !== null);
         else if (name === "edges")
             this.viewer?.setEdges(after === "open");
+        else if (name === "sun")
+            this.viewer?.setSun(parseSun(after));
         else if (name === "world")
             this.viewer?.setOrbit(after === "earth");
         else if (name === "world-turn")
@@ -677,6 +683,7 @@ export class UchusenRocket extends HTMLBase {
         holder.className = "stage";
         picture.append(drawing, holder);
         root.appendChild(picture);
+        this.flagKey = "-";
         this.picture = picture;
         this.drawing = drawing;
         this.holder = holder;
@@ -747,6 +754,40 @@ export class UchusenRocket extends HTMLBase {
         else
             delete this.dataset.docked;
         this.dataset.custom = String(this.builtNow.report.custom);
+        this.syncFlag();
+    }
+    /** `flags`: the rocket's country's flag in the picture's corner, from hata (an optional peer) when the page has it. `data-flag` is the code shown, or empty once it is settled that none is; it is absent while one is loading or the attribute is off. */
+    syncFlag() {
+        const picture = this.picture;
+        if (!picture)
+            return;
+        const on = this.hasAttribute("flags") && this.getAttribute("flags") !== "off";
+        const code = on && this.builtNow ? (ROCKETS[this.descriptionNow().rocket]?.country.value ?? "") : "";
+        const key = on ? code : "off";
+        if (key === this.flagKey)
+            return;
+        this.flagKey = key;
+        picture.querySelector(".flag")?.remove();
+        if (!on)
+            return void delete this.dataset.flag;
+        if (!code)
+            return void (this.dataset.flag = "");
+        delete this.dataset.flag;
+        void flagSvg(code).then((svg) => {
+            if (this.flagKey !== key || this.picture !== picture)
+                return;
+            if (svg) {
+                const badge = document.createElement("span");
+                badge.className = "flag";
+                badge.setAttribute("part", "flag");
+                badge.setAttribute("role", "img");
+                badge.setAttribute("aria-label", regionName(code, this.closest("[lang]")?.getAttribute("lang")));
+                badge.innerHTML = svg;
+                badge.firstElementChild?.setAttribute("aria-hidden", "true");
+                picture.append(badge);
+            }
+            this.dataset.flag = svg ? code : "";
+        });
     }
     async applyRocket() {
         this.mark();
@@ -900,7 +941,8 @@ export class UchusenRocket extends HTMLBase {
     }
     startWatching() {
         this.watch?.disconnect();
-        const reason = whyNot(this.getAttribute("mode") ?? "auto");
+        let reason = whyNot(this.getAttribute("mode") ?? "auto");
+        this.glAsked = false;
         if (reason) {
             this.setState(reason === "off" ? "picture" : "fallback", reason);
             if (reason !== "off")
@@ -916,6 +958,16 @@ export class UchusenRocket extends HTMLBase {
                 this.kickFlight();
             if (reason)
                 return;
+            if (seen.isIntersecting && !this.glAsked) {
+                // The probe makes a context, which software drawing takes seconds over: it waits until a view is about to draw, and is made once for the whole page.
+                this.glAsked = true;
+                if (!glProbe().works) {
+                    reason = "no-webgl";
+                    this.setState("fallback", reason);
+                    this.emit("uchusen-fallback", { reason });
+                    return;
+                }
+            }
             if (seen.isIntersecting) {
                 this.shownAt ||= performance.now();
                 window.clearTimeout(this.releaseTimer);
@@ -1003,6 +1055,7 @@ export class UchusenRocket extends HTMLBase {
                 made.drive(this.driven);
             made.setFloating(this.hasAttribute("float"));
             made.setEdges(this.getAttribute("edges") === "open");
+            made.setSun(parseSun(this.getAttribute("sun")));
             made.setNameLabels(this.getAttribute("names") !== "off");
             made.setVisible(true);
             const { look, show, viewName, angle } = this.settings(this.builtNow ?? built);
@@ -1195,3 +1248,4 @@ export function defineUchusenRocket() {
 }
 defineUchusenRocket();
 export { ROCKETS, UchusenFlight };
+export { setFlagLoader } from "./element/flag.js";

package/dist/index.d.ts

@@ -4,6 +4,8 @@ export { blank, figureWords } from "./data/types.ts";
 export type { Disagreement, Figure, Variant, VariantFacts, VariantStatus } from "./data/types.ts";
 export { MAKERS } from "./data/makers.ts";
 export type { MakerId } from "./data/makers.ts";
+export { COUNTRY_CODES, countryOf, MAKER_COUNTRIES } from "./data/countries.ts";
+export type { CountryCode } from "./data/countries.ts";
 export { FLIGHT_LOG, flightLogOf } from "./data/flight-log.ts";
 export type { LoggedFlight } from "./data/flight-log.ts";
 export { moved, movingGroupsOf } from "./model/moves.ts";
@@ -57,6 +59,7 @@ export { beaconLamp, dutyOf, lampFactor, lightMode, lightPool, sternLamp, workLa
 export type { Motion, MotionKind, MotionSpeed } from "./model/fleet/motion.ts";
 export { bellsOf, enginesWanted, FLAME_SETTLE_MS, pickBells, plumeLength, ringsOf } from "./engines.ts";
 export type { Bell } from "./engines.ts";
+export { parseSun } from "./sun.ts";
 export { OPTION_ATTRIBUTES, attributesFromOptions, optionsFromAttributes, rocketFromParams, rocketToParams } from "./attrs.ts";
 export type { RocketOptions } from "./attrs.ts";
 export { assetPathOf, CDN, EMBED_KINDS, SITE, THREE_VERSION, embedCode, embedNote, paintedCredit } from "./embed.ts";

package/dist/index.js

@@ -2,6 +2,7 @@
 export { PLANNED_ROCKETS, ROCKETS, partIdOf, SLOT_NAMES, variantOf } from "./rockets.js";
 export { blank, figureWords } from "./data/types.js";
 export { MAKERS } from "./data/makers.js";
+export { COUNTRY_CODES, countryOf, MAKER_COUNTRIES } from "./data/countries.js";
 export { FLIGHT_LOG, flightLogOf } from "./data/flight-log.js";
 export { moved, movingGroupsOf } from "./model/moves.js";
 export { PROPELLANTS, propellantOf } from "./data/propellants.js";
@@ -34,6 +35,7 @@ export { beamLight } from "./draw/beamLight.js";
 export { angleAt, MOTIONS, motionNote, motionSpeed, motionsOf, motionWanted, slideAt } from "./model/fleet/motion.js";
 export { beaconLamp, dutyOf, lampFactor, lightMode, lightPool, sternLamp, workLamp } from "./model/fleet/lights.js";
 export { bellsOf, enginesWanted, FLAME_SETTLE_MS, pickBells, plumeLength, ringsOf } from "./engines.js";
+export { parseSun } from "./sun.js";
 export { OPTION_ATTRIBUTES, attributesFromOptions, optionsFromAttributes, rocketFromParams, rocketToParams } from "./attrs.js";
 export { assetPathOf, CDN, EMBED_KINDS, SITE, THREE_VERSION, embedCode, embedNote, paintedCredit } from "./embed.js";
 export { COMPANIES, COMPANY_KINDS, companyOf } from "./model/fleet/company.js";

package/dist/inspace.js

@@ -7,6 +7,7 @@ const SPACE = {
     sls: ["upper-stage", "service-module", "capsule"],
     "falcon-9": ["second-stage", "fairing", "trunk", "capsule"],
     dragon: ["trunk", "capsule"],
+    "falcon-heavy": ["car", "starman"],
 };
 /**
  * The slots to draw when the craft is in space, or null when the picture stays the whole variant.

package/dist/model/registry.js

@@ -1,6 +1,6 @@
 // Every part there is, with its record and how to make its pieces. A new rocket adds its rows here and nothing else changes.
 import { DRAGON_VARIANTS } from "../data/dragon.js";
-import { FALCON_9_VARIANTS } from "../data/falcon.js";
+import { FALCON_9_VARIANTS, FALCON_HEAVY_VARIANTS } from "../data/falcon.js";
 import { STARSHIP_VARIANTS } from "../data/starship.js";
 import { capsule, centreCore, DRAGON_DRAWS, falconFairing, falconFirstStage, FALCON_DRAWS, falconSecondStage, grasshopper, merlin, sideBooster, trunk } from "./falcon.js";
 import { FALCON_1_VARIANTS } from "../data/falcon1.js";
@@ -37,6 +37,8 @@ import { HUBBLE_VARIANTS } from "../data/hubble.js";
 import { HUBBLE_BUILDS } from "./hubble.js";
 import { TIANGONG_VARIANTS } from "../data/tiangong.js";
 import { TIANGONG_BUILDS } from "./tiangong.js";
+import { ROADSTER_VARIANTS } from "../data/roadster.js";
+import { ROADSTER_BUILDS } from "./roadster.js";
 import { DRONE_VARIANTS } from "../data/drone.js";
 import { DRONE_BUILDS } from "./drone.js";
 import { DRAGON_INSIDE_BUILDS } from "./dragoninside.js";
@@ -145,11 +147,11 @@ const FH_FROM = "This package's code for the two line looks, proportions taken f
 const FH_SIDE_HEIGHT = 45.6;
 const FH_OFFSET = 4.25;
 const figure = (value, source) => ({ value, source });
-entries.push({ record: { id: "falcon-heavy-falcon-heavy-centre", kind: "first-stage", name: "Falcon Heavy centre core, with its upper stage and fairing", rocket: "falcon-heavy", trueTo: ["falcon-heavy"], height: 70, diameter: 5.2, sourced: { height: figure(70, "wikipedia-falcon-heavy"), diameter: { ...blankFigure, note: "3.7 m the core; 5.2 m the fairing." } }, joints: {}, painted: PAINTED["falcon-heavy-falcon-heavy-centre"], drawnFrom: FH_FROM }, pieces: () => centreCore(70, 1.85) }, { record: { id: "falcon-heavy-falcon-heavy-side-left", kind: "first-stage", name: "Falcon Heavy side booster, left", rocket: "falcon-heavy", trueTo: ["falcon-heavy"], height: FH_SIDE_HEIGHT, diameter: 3.7, strapOn: { x: -FH_OFFSET, z: 0 }, sourced: { height: blankFigure, diameter: figure(3.7, "wikipedia-falcon-heavy") }, joints: {}, painted: PAINTED["falcon-heavy-falcon-heavy-side-left"], drawnFrom: FH_FROM }, pieces: () => sideBooster(FH_SIDE_HEIGHT, 1.85, -1) }, { record: { id: "falcon-heavy-falcon-heavy-side-right", kind: "first-stage", name: "Falcon Heavy side booster, right", rocket: "falcon-heavy", trueTo: ["falcon-heavy"], height: FH_SIDE_HEIGHT, diameter: 3.7, strapOn: { x: FH_OFFSET, z: 0 }, sourced: { height: blankFigure, diameter: figure(3.7, "wikipedia-falcon-heavy") }, joints: {}, painted: PAINTED["falcon-heavy-falcon-heavy-side-right"], drawnFrom: FH_FROM }, pieces: () => sideBooster(FH_SIDE_HEIGHT, 1.85, 1) }, { record: { id: "grasshopper-grasshopper-vehicle", kind: "test-vehicle", name: "Grasshopper, test vehicle", rocket: "grasshopper", trueTo: ["grasshopper"], height: 32, diameter: 3.2, sourced: { height: figure(32, "wikipedia-grasshopper"), diameter: blankFigure }, joints: {}, painted: PAINTED["grasshopper-grasshopper-vehicle"], drawnFrom: "This package's code for the two line looks, proportions taken from Echo_3's low-poly model at the sourced height; that model for the painted look." }, pieces: () => grasshopper(32) });
+entries.push({ record: { id: "falcon-heavy-falcon-heavy-centre", kind: "first-stage", name: "Falcon Heavy centre core, with its upper stage and fairing", rocket: "falcon-heavy", trueTo: ["falcon-heavy"], height: 70, diameter: 5.2, sourced: { height: figure(70, "wikipedia-falcon-heavy"), diameter: { ...blankFigure, note: "3.7 m the core; 5.2 m the fairing." } }, joints: {}, painted: PAINTED["falcon-heavy-falcon-heavy-centre"], drawnFrom: FH_FROM }, pieces: () => centreCore(70, 1.85) }, { record: { id: "falcon-heavy-falcon-heavy-side-left", kind: "first-stage", name: "Falcon Heavy side booster, left", rocket: "falcon-heavy", trueTo: ["falcon-heavy", "test-flight"], height: FH_SIDE_HEIGHT, diameter: 3.7, strapOn: { x: -FH_OFFSET, z: 0 }, sourced: { height: blankFigure, diameter: figure(3.7, "wikipedia-falcon-heavy") }, joints: {}, painted: PAINTED["falcon-heavy-falcon-heavy-side-left"], drawnFrom: FH_FROM }, pieces: () => sideBooster(FH_SIDE_HEIGHT, 1.85, -1) }, { record: { id: "falcon-heavy-falcon-heavy-side-right", kind: "first-stage", name: "Falcon Heavy side booster, right", rocket: "falcon-heavy", trueTo: ["falcon-heavy", "test-flight"], height: FH_SIDE_HEIGHT, diameter: 3.7, strapOn: { x: FH_OFFSET, z: 0 }, sourced: { height: blankFigure, diameter: figure(3.7, "wikipedia-falcon-heavy") }, joints: {}, painted: PAINTED["falcon-heavy-falcon-heavy-side-right"], drawnFrom: FH_FROM }, pieces: () => sideBooster(FH_SIDE_HEIGHT, 1.85, 1) }, { record: { id: "grasshopper-grasshopper-vehicle", kind: "test-vehicle", name: "Grasshopper, test vehicle", rocket: "grasshopper", trueTo: ["grasshopper"], height: 32, diameter: 3.2, sourced: { height: figure(32, "wikipedia-grasshopper"), diameter: blankFigure }, joints: {}, painted: PAINTED["grasshopper-grasshopper-vehicle"], drawnFrom: "This package's code for the two line looks, proportions taken from Echo_3's low-poly model at the sourced height; that model for the painted look." }, pieces: () => grasshopper(32) });
 // ---------------------------------------------------------------------------------------------------------------------------------
 // Rockets drawn wholly by this package's code, from their tables
-const stackFacts = [...DRONE_VARIANTS, ...HUBBLE_VARIANTS, ...ISS_VARIANTS, ...TIANGONG_VARIANTS, ...JUPITER_C_VARIANTS, ...MERCURY_VARIANTS, ...GEMINI_VARIANTS, ...APOLLO_SOYUZ_VARIANTS, ...LUNAR_MODULE_VARIANTS, ...STARBASE_VARIANTS, ...DRAGON_VARIANTS, ...TOWER_VARIANTS, ...DRONESHIP_VARIANTS, ...LANDING_ZONE_VARIANTS, ...SOYUZ_VARIANTS, ...NEW_GLENN_VARIANTS, ...ELECTRON_VARIANTS, ...SLS_VARIANTS, ...FALCON_1_VARIANTS, ...SATURN_V_VARIANTS, ...SHUTTLE_VARIANTS, ...SHIP_02_VARIANTS];
-const stacks = [...DRONE_BUILDS, ...HUBBLE_BUILDS, ...ISS_BUILDS, ...TIANGONG_BUILDS, ...JUPITER_C_BUILDS, ...MERCURY_BUILDS, ...GEMINI_BUILDS, ...APOLLO_SOYUZ_BUILDS, ...LUNAR_MODULE_BUILDS, ...STARBASE_BUILDS, ...DRAGON_INSIDE_BUILDS, ...TOWER_BUILDS, ...DRONESHIP_BUILDS, ...LANDING_ZONE_BUILDS, ...SOYUZ_BUILDS, ...NEW_GLENN_BUILDS, ...ELECTRON_BUILDS, ...SLS_BUILDS, ...FALCON_1_BUILDS, ...SATURN_V_BUILDS, ...SHUTTLE_BUILDS, ...SHIP_02_BUILDS];
+const stackFacts = [...ROADSTER_VARIANTS, ...FALCON_HEAVY_VARIANTS, ...DRONE_VARIANTS, ...HUBBLE_VARIANTS, ...ISS_VARIANTS, ...TIANGONG_VARIANTS, ...JUPITER_C_VARIANTS, ...MERCURY_VARIANTS, ...GEMINI_VARIANTS, ...APOLLO_SOYUZ_VARIANTS, ...LUNAR_MODULE_VARIANTS, ...STARBASE_VARIANTS, ...DRAGON_VARIANTS, ...TOWER_VARIANTS, ...DRONESHIP_VARIANTS, ...LANDING_ZONE_VARIANTS, ...SOYUZ_VARIANTS, ...NEW_GLENN_VARIANTS, ...ELECTRON_VARIANTS, ...SLS_VARIANTS, ...FALCON_1_VARIANTS, ...SATURN_V_VARIANTS, ...SHUTTLE_VARIANTS, ...SHIP_02_VARIANTS];
+const stacks = [...ROADSTER_BUILDS, ...DRONE_BUILDS, ...HUBBLE_BUILDS, ...ISS_BUILDS, ...TIANGONG_BUILDS, ...JUPITER_C_BUILDS, ...MERCURY_BUILDS, ...GEMINI_BUILDS, ...APOLLO_SOYUZ_BUILDS, ...LUNAR_MODULE_BUILDS, ...STARBASE_BUILDS, ...DRAGON_INSIDE_BUILDS, ...TOWER_BUILDS, ...DRONESHIP_BUILDS, ...LANDING_ZONE_BUILDS, ...SOYUZ_BUILDS, ...NEW_GLENN_BUILDS, ...ELECTRON_BUILDS, ...SLS_BUILDS, ...FALCON_1_BUILDS, ...SATURN_V_BUILDS, ...SHUTTLE_BUILDS, ...SHIP_02_BUILDS];
 for (const build of stacks)
     for (const part of build.parts) {
         const { height, diameter } = facts(stackFacts, build.variant, part.slot);

package/dist/model/roadster.d.ts

@@ -0,0 +1,31 @@
+import type { Piece, Vec3 } from "./pieces.ts";
+import type { StackBuild } from "./stacks.ts";
+/** One car as measured from its model, in metres: nose towards +Z, on the ground at y = 0. */
+export interface CarDraw {
+    /** Nose to tail, and across. */
+    length: number;
+    width: number;
+    /** The top of the windscreen. */
+    height: number;
+    /** The wheels: their middles along the car, their radius and how far each stands from the middle. */
+    front: number;
+    rear: number;
+    wheel: number;
+    track: number;
+    /** The top of the doors. */
+    belt: number;
+    /** Where the windscreen meets the body, along the car. */
+    screen: number;
+    /** The driver's hip, in the left seat: across, up and along. */
+    seat: Vec3;
+    /** The middle of the steering wheel. */
+    wheelAt: Vec3;
+}
+export declare const ROADSTER_DRAWS: Readonly<Record<string, CarDraw>>;
+/** The car: its body seen from the side and pressed to its width, its cockpit open, the windscreen and the four wheels. */
+export declare function carPieces(d: CarDraw): Piece[];
+/** Starman in the driver's seat: legs forward to the pedals, his back against the seat, his right hand on the wheel, his left arm along the top of the door. */
+export declare function starmanPieces(d: CarDraw): Piece[];
+/** Where the payload stands in Falcon Heavy: 0.8 m above where its fairing begins (the fairing's sourced 13.1 m under the 70 m top), clear of the fairing's walls. The 0.8 m is a placing, not a figure. */
+export declare const FALCON_HEAVY_PAYLOAD_Y: number;
+export declare const ROADSTER_BUILDS: readonly StackBuild[];

package/dist/model/roadster.js

@@ -0,0 +1,112 @@
+// The Roadster in plain shapes for the line looks, and Starman in every look. The car's length, wheelbase, wheels and seat are measured from each licensed model at its sourced scale; the painted look is the
+// model. Starman is this package's own: a seated figure in a white suit with dark trim, a white helmet with a dark visor, his right hand on the wheel and his left arm on the door. He shares the car's origin
+// (the middle of the car on the ground), so he sits in its seat in any build that places the two together.
+import { ROADSTER_FLIGHT } from "../data/roadster.js";
+import { blank } from "../data/types.js";
+import { centreCore } from "./falcon.js";
+import { strut } from "./pieces.js";
+export const ROADSTER_DRAWS = {
+    "first-generation": { length: 3.946, width: 1.85, height: 1.03, front: 1.114, rear: -1.258, wheel: 0.3, track: 1.46, belt: 0.8, screen: 0.95, seat: [0.29, 0.34, -0.22], wheelAt: [0.29, 0.62, 0.37] },
+    "second-generation": { length: 4.47, width: 1.83, height: 1.14, front: 1.417, rear: -1.408, wheel: 0.31, track: 1.52, belt: 0.84, screen: 0.75, seat: [0.32, 0.22, -0.18], wheelAt: [0.32, 0.58, 0.3] },
+    "second-generation-2": { length: 4.28, width: 1.86, height: 1.07, front: 1.398, rear: -1.429, wheel: 0.31, track: 1.58, belt: 0.8, screen: 0.7, seat: [0.32, 0.17, -0.2], wheelAt: [0.32, 0.55, 0.28] },
+};
+const side = (d) => {
+    const nose = d.length / 2;
+    return [
+        [-nose, 0.22],
+        [-d.length * 0.16, 0.14],
+        [nose * 0.8, 0.14],
+        [nose, 0.32],
+        [nose * 0.92, 0.6],
+        [d.screen, d.belt - 0.02],
+        [-nose * 0.9, d.belt + 0.04],
+        [-nose, 0.62],
+    ];
+};
+const octagon = (r) => Array.from({ length: 12 }, (_, i) => [Math.cos((i * Math.PI) / 6) * r, Math.sin((i * Math.PI) / 6) * r]);
+/** The car: its body seen from the side and pressed to its width, its cockpit open, the windscreen and the four wheels. */
+export function carPieces(d) {
+    const half = d.width / 2;
+    const pieces = [{ kind: "plate", material: "red", frame: { o: [0, 0, 0], u: [0, 0, 1], v: [0, 1, 0], w: [1, 0, 0] }, outline: side(d), thickness: d.width - 0.06 }];
+    // the open cockpit, dark, sunk into the top of the body
+    pieces.push({ kind: "plate", material: "dark", frame: { o: [0, d.belt + 0.005, 0], u: [1, 0, 0], v: [0, 0, 1], w: [0, 1, 0] }, outline: [[-half + 0.2, -0.75], [half - 0.2, -0.75], [half - 0.2, d.screen - 0.05], [-half + 0.2, d.screen - 0.05]], thickness: 0.01, plain: true });
+    // the windscreen, leaning back from the scuttle
+    const lean = 0.55;
+    const rise = d.height - d.belt;
+    const up = [0, Math.cos(lean), -Math.sin(lean)];
+    pieces.push({ kind: "plate", material: "glass", frame: { o: [0, d.belt, d.screen], u: [1, 0, 0], v: up, w: [0, Math.sin(lean), Math.cos(lean)] }, outline: [[-half + 0.18, 0], [half - 0.18, 0], [half - 0.26, rise / Math.cos(lean)], [-half + 0.26, rise / Math.cos(lean)]], thickness: 0.012 });
+    for (const z of [d.front, d.rear])
+        for (const s of [1, -1]) {
+            const x = (s * d.track) / 2;
+            pieces.push({ kind: "plate", material: "black", frame: { o: [x, d.wheel, z], u: [0, 0, 1], v: [0, 1, 0], w: [1, 0, 0] }, outline: octagon(d.wheel), thickness: 0.24 });
+            pieces.push({ kind: "plate", material: "fin-dark", frame: { o: [x + s * 0.121, d.wheel, z], u: [0, 0, 1], v: [0, 1, 0], w: [1, 0, 0] }, outline: octagon(d.wheel * 0.62), thickness: 0.01, plain: true });
+        }
+    return pieces;
+}
+const at = (p, dx, dy, dz) => [p[0] + dx, p[1] + dy, p[2] + dz];
+/** Starman in the driver's seat: legs forward to the pedals, his back against the seat, his right hand on the wheel, his left arm along the top of the door. */
+export function starmanPieces(d) {
+    const hip = d.seat;
+    const shoulder = at(hip, 0, 0.52, -0.1);
+    const knee = at(hip, 0, 0.12, 0.44);
+    // the feet on the floor, which is never under the ground
+    const foot = [hip[0], Math.max(0.12, hip[1] - 0.18), hip[2] + 0.86];
+    const right = at(shoulder, -0.19, 0, 0);
+    const left = at(shoulder, 0.19, 0, 0);
+    const door = [Math.min(d.width / 2 - 0.08, hip[0] + 0.42), d.belt + 0.05, hip[2] + 0.12];
+    const pieces = [
+        // the torso, leaning back with the seat
+        { kind: "lathe", material: "white", segs: 16, at: [hip[0], hip[2]], lean: [0, -0.19], profile: [[0.14, hip[1]], [0.18, hip[1] + 0.22], [0.19, shoulder[1] - 0.06], [0.1, shoulder[1] + 0.04]] },
+        // the helmet, white, round, with its dark visor facing the road
+        { kind: "lathe", material: "white", segs: 20, at: [shoulder[0], shoulder[2] - 0.02], profile: [[0.07, shoulder[1] + 0.04], [0.15, shoulder[1] + 0.13], [0.155, shoulder[1] + 0.22], [0.12, shoulder[1] + 0.31], [0.001, shoulder[1] + 0.35]] },
+        { kind: "plate", material: "glass", frame: { o: [shoulder[0], shoulder[1] + 0.2, shoulder[2] + 0.12], u: [1, 0, 0], v: [0, 1, 0], w: [0, 0, 1] }, outline: [[-0.1, -0.06], [0.1, -0.06], [0.11, 0.05], [-0.11, 0.05]], thickness: 0.04, plain: true },
+        // a dark ring where the helmet meets the suit
+        { kind: "lathe", material: "black", segs: 16, at: [shoulder[0], shoulder[2] - 0.02], profile: [[0.12, shoulder[1] + 0.01], [0.12, shoulder[1] + 0.06]], only: "mesh" },
+    ];
+    for (const s of [-1, 1]) {
+        const h = at(hip, s * 0.1, 0, 0);
+        const k = at(knee, s * 0.1, 0, 0);
+        const f = at(foot, s * 0.1, 0, 0);
+        pieces.push(strut("white", h, k, 0.15, 0.15), strut("white", k, f, 0.13, 0.13), strut("black", f, at(f, 0, 0.02, 0.1), 0.12, 0.14));
+    }
+    // his right hand on the wheel's rim, his left arm on the door top
+    const hand = at(d.wheelAt, -0.12, 0.04, -0.03);
+    const elbowR = at(right, -0.02, -0.22, 0.2);
+    const elbowL = at(left, 0.12, -0.2, 0.05);
+    pieces.push(strut("white", right, elbowR, 0.11, 0.11), strut("white", elbowR, hand, 0.1, 0.1), strut("black", hand, at(hand, 0, 0, 0.06), 0.09, 0.09));
+    pieces.push(strut("white", left, elbowL, 0.11, 0.11), strut("white", elbowL, door, 0.1, 0.1), strut("black", door, at(door, 0, 0, 0.07), 0.09, 0.09));
+    return pieces;
+}
+const FILES = {
+    "first-generation": { file: "roadster-first-generation-car.glb", credit: "the86guy-roadster" },
+    "second-generation": { file: "roadster-second-generation-car.glb", credit: "metarex4d-roadster" },
+    "second-generation-2": { file: "roadster-second-generation-2-car.glb", credit: "gmmichaelonearth-roadster", also: ["minchou19-wheels"] },
+};
+const STARMAN_NAME = "Starman, a mannequin in a pressure suit";
+const carPart = (variant, place) => {
+    const d = ROADSTER_DRAWS[variant];
+    return { slot: "car", kind: "payload", name: variant === "first-generation" ? "The Roadster, first generation" : "The Roadster, second generation", height: d.height, diameter: d.width, sourcedDiameter: blank(`Its width as drawn: the model at its sourced scale is ${d.width} m across.`), painted: FILES[variant], ...(place ? { place } : {}), pieces: () => carPieces(d) };
+};
+const starmanPart = (variant, place) => {
+    const d = ROADSTER_DRAWS[variant];
+    return { slot: "starman", kind: "payload", name: STARMAN_NAME, height: d.seat[1] + 0.87, diameter: 0.6, sourcedDiameter: blank("No source read here gives Starman's size."), place, pieces: () => starmanPieces(d) };
+};
+const FROM = (variant) => variant === "first-generation"
+    ? "The 86 guy's model for the painted look, with its badges and roof left off and its bonnet made bare carbon; this package's plain shapes for the line looks, measured from it at the sourced length. Starman is this package's own in every look."
+    : "Its author's model for the painted look, with its badges left off, painted the first generation's red; this package's plain shapes for the line looks, measured from it at the sourced wheelbase. Starman is this package's own in every look.";
+/** Where the payload stands in Falcon Heavy: 0.8 m above where its fairing begins (the fairing's sourced 13.1 m under the 70 m top), clear of the fairing's walls. The 0.8 m is a placing, not a figure. */
+export const FALCON_HEAVY_PAYLOAD_Y = 70 - 13.1 + 0.8;
+export const ROADSTER_BUILDS = [
+    ...Object.keys(ROADSTER_DRAWS).map((variant) => ({ rocket: "roadster", variant, drawnFrom: FROM(variant), parts: [carPart(variant), starmanPart(variant, { x: 0, z: 0 })] })),
+    {
+        rocket: "falcon-heavy",
+        variant: ROADSTER_FLIGHT.id,
+        drawnFrom: "Antonio_Adams's low-poly Falcon Heavy and the 86 guy's Roadster for the painted look, this package's plain shapes for the line looks. Starman is this package's own in every look.",
+        parts: [
+            // the same vehicle as Falcon Heavy's own, on its first flight: its centre core is its own part here, so the test flight is reached from its own foot
+            { slot: "centre", kind: "first-stage", name: "Falcon Heavy centre core, with its upper stage and fairing", height: 70, diameter: 5.2, sourcedDiameter: blank("3.7 m the core; 5.2 m the fairing."), painted: { file: "falcon-heavy-falcon-heavy-centre.glb", credit: "antonio-falcon-heavy" }, pieces: () => centreCore(70, 1.85) },
+            carPart("first-generation", { x: 0, z: 0, y: FALCON_HEAVY_PAYLOAD_Y }),
+            starmanPart("first-generation", { x: 0, z: 0, y: FALCON_HEAVY_PAYLOAD_Y }),
+        ],
+    },
+];

package/dist/parts.d.ts

@@ -11,7 +11,7 @@ import type { Figure } from "./data/types.ts";
  * console.log(kind);
  * ```
  */
-export type PartKind = "booster" | "first-stage" | "ship" | "second-stage" | "fairing" | "capsule" | "trunk" | "engine" | "fin" | "flap" | "ring" | "test-vehicle" | "third-stage" | "fourth-stage" | "tail" | "adapter" | "service-module" | "tower" | "tank" | "solid-booster" | "liquid-booster" | "orbiter" | "deck" | "mount" | "arms" | "site" | "spacecraft" | "module" | "array" | "antenna";
+export type PartKind = "booster" | "first-stage" | "ship" | "second-stage" | "fairing" | "capsule" | "trunk" | "engine" | "fin" | "flap" | "ring" | "test-vehicle" | "third-stage" | "fourth-stage" | "tail" | "adapter" | "service-module" | "tower" | "tank" | "solid-booster" | "liquid-booster" | "orbiter" | "deck" | "mount" | "arms" | "site" | "spacecraft" | "module" | "array" | "antenna" | "payload";
 /**
  * Where a part mates. Every part's origin is the middle of its base on its axis, at its lowest point; Y is up and the windward side faces +Z, in metres.
  *