ldr 0.29.0 → 0.30.0

package/README.md

@@ -83,7 +83,7 @@ Light the scene (or set `scene.environment`) as you would for any `MeshStandardM
 | export | description |
 |---|---|
 | `parse(text, name?, { geometryText? }) → Doc` | Parses LDraw text into files and commands. MPD-aware: `0 FILE`/`0 NOFILE` and `0 !DATA` blocks. |
-| `flatten(doc, options?) → PartInstance[]` | Expands submodels into placed parts. Each instance has `part`, `color`, a 12-number matrix `m`, `step`, nested `steps`, `path` and the ROTSTEP `view` of its step. `colour` (an `LDrawColor`) is set when a `0 !COLOUR` line in the model itself defines the instance's colour. |
+| `flatten(doc, options?) → PartInstance[]` | Expands submodels into placed parts. Each instance has `part`, `color`, a 12-number matrix `m`, `step`, nested `steps`, `path` and the ROTSTEP `view` of its step. `colour` (an `LDrawColor`) is set when a `0 !COLOUR` line in the model itself defines the instance's colour. `colPart` / `colSource` name the part with the model's definitions in scope applied inside it (a synthetic part, `<part>#col-<hash>`; packs from `buildPack` have it only when it changes a colour, and the renderer falls back to `part`). |
 | `parseModel(text, name?, options?)` | `parse` followed by `flatten`. |
 | `sequenceSteps(instances) → { count, stepOf, views }` | Gives each instance a global build-step index, sequencing nested submodel steps. `views` holds the ROTSTEP view per global step. |
 | `parseLDConfig(text) → Map<code, LDrawColor>` | Reads a `!COLOUR` table into `{ code, name, hex, edge, alpha, luminance, finish }` (CHROME / PEARLESCENT / RUBBER / METAL / MATTE_METALLIC / MATERIAL GLITTER|SPECKLE|FABRIC). |
@@ -213,7 +213,7 @@ Reproduce: `cd bench && bun run setup && bun run perf` (regression gate) or `bun
 - `0 STEP`, nested submodel step sequencing, `0 ROTSTEP` (`REL`/`ADD`/`ABS`/`END`), and `0 BUFEXCHG`.
 - `!TEXMAP` `START`/`NEXT`/`FALLBACK`/`END`, with `PLANAR`, `CYLINDRICAL` and `SPHERICAL` projections (orientation matches LDView), `GLOSSMAP` (alpha = gloss amount, same UVs), and model-level `!TEXMAP` around part references.
 - Colours: LDConfig `!COLOUR`, edge colours, main/edge colour inheritance (16/24), and direct colours (`0x2RRGGBB`).
-- `!COLOUR` lines in a model follow the spec's scope rule. A definition applies from its line to the end of its file and to the files that file references, and it never leaks back to the parent. It sets the instance colour and finish. `!COLOUR` lines inside a part (an MPD-embedded part and its subparts) follow the same rule when the part is compiled, and a model file's own loose geometry sees that file's definitions: its triangles and studs take the part's own definitions (RGB; baked part colours are opaque, as for LDConfig codes). A model's definitions don't reach the colours hard-coded inside the parts it places: those come from LDConfig or the part's own definitions, because parts are precompiled.
+- `!COLOUR` lines in a model follow the spec's scope rule. A definition applies from its line to the end of its file and to the files that file references, and it never leaks back to the parent. It sets the instance colour and finish. `!COLOUR` lines inside a part (an MPD-embedded part and its subparts) follow the same rule when the part is compiled, and a model file's own loose geometry sees that file's definitions: its triangles and studs take the part's own definitions (RGB; baked part colours are opaque, as for LDConfig codes). A model's definitions also reach the colours hard-coded inside the parts it places ("passed to subfiles"): `buildPack` compiles a variant of such a part with those definitions applied (only where one changes a colour the part uses), and the renderer draws it; the part's own later definitions still win inside it. Parts from the hosted parts CDN (`loadModel` / `prepareModel`) don't have these variants yet, so there the colours inside parts come from LDConfig or the part's own definitions.
 - Named colour codes: a `!COLOUR` CODE may be an identifier instead of a number (`0 !COLOUR My_Red CODE MyRed VALUE #FF0000 EDGE #333333`, then `1 myred ...`), which the spec allows outside strict LDraw compatibility. Identifiers are case-insensitive and follow the same scope rule. `parseColor` turns one into a stable negative code (`namedColorCode`, `isNamedColor`), and `colorToken` turns it back into the identifier. A named code with no definition in scope draws the fallback colour.
 - Blended colour codes 256-511 that LDConfig doesn't define (used by old models, e.g. 382 in Datsville) render as the spec's average of two ldraw.exe colours instead of the fallback grey.
 - Case-insensitive, backslash-normalized file lookup; `~Moved to` alias parts.

package/dist/cli.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/cli.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/cli.ts
 import fs4 from "node:fs";
 import zlib from "node:zlib";
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/node/build-pack.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/node/build-pack.ts
 import fs3 from "node:fs";
 import path3 from "node:path";
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/node/resolver.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/node/resolver.ts
 import fs from "node:fs";
 import path from "node:path";
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/spec.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/spec.ts
 var norm = (s) => s.trim().toLowerCase().replace(/\\/g, "/").replace(/\/+/g, "/");
 var COLOUR_ID_RE = /^[A-Za-z][A-Za-z0-9_]*$/;
 var namedCodes = new Map;
@@ -723,9 +723,35 @@ function fileStepViews(f) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/model.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/model.ts
 var CALLOUT_END = 999999;
 var stepKey = (steps) => steps.map((x) => String(x).padStart(6, "0")).join(".") + "~";
+var defLine = new WeakMap;
+var wrapMemo = new WeakMap;
+function scopeWrapper(part, scope) {
+  let w = wrapMemo.get(scope);
+  if (!w) {
+    const lines = [...scope.values()].map((d) => {
+      const t = defLine.get(d) ?? "";
+      const k = t.indexOf("!COLOUR");
+      return k < 0 ? "" : "0 " + t.slice(k).trim().replace(/\s+/g, " ");
+    }).filter(Boolean);
+    w = { head: lines.join(`
+`), parts: new Map };
+    wrapMemo.set(scope, w);
+  }
+  let r = w.parts.get(part);
+  if (!r) {
+    const n = norm(part), source = `0 ldr: ${n} placed in a model's !COLOUR scope
+0 BFC CERTIFY CCW
+${w.head}
+1 16 0 0 0 1 0 0 0 1 0 0 0 1 ${n}
+`;
+    r = { name: `${n}#col-${hash32(source)}`, source };
+    w.parts.set(part, r);
+  }
+  return r;
+}
 function flatten(doc, opts = {}) {
   const out = [];
   const maxDepth = opts.maxDepth ?? 64;
@@ -770,7 +796,7 @@ function flatten(doc, opts = {}) {
     const views = fileStepViews(f);
     const ls = loose ? looseSteps(f) : [];
     let li = 0;
-    const emit = (part, col, mm, sp, k, embedded, tex, cd) => {
+    const emit = (part, col, mm, sp, k, embedded, tex, cd, sc) => {
       if (fixed)
         sp = fixed;
       const i = { part, color: col, m: mm, step: sp[0], steps: sp, localStep: k, path };
@@ -789,6 +815,10 @@ function flatten(doc, opts = {}) {
         const w = texWrapper(part, tex);
         i.texPart = w.name;
         i.texSource = w.source;
+      } else if (sc) {
+        const w = scopeWrapper(part, sc);
+        i.colPart = w.name;
+        i.colSource = w.source;
       }
       const v = views[k];
       if (v)
@@ -799,7 +829,7 @@ function flatten(doc, opts = {}) {
     const flushLoose = (upTo) => {
       while (li < ls.length && ls[li] <= upTo) {
         const k = ls[li++];
-        emit(loosePartName(f.name, k), color, m, [...stepPath, k], k, false, null, colour).source = lazy(f, k);
+        emit(loosePartName(f.name, k), color, m, [...stepPath, k], k, false, null, colour, scope0).source = lazy(f, k);
       }
     };
     for (const c0 of f.cmds) {
@@ -815,8 +845,10 @@ function flatten(doc, opts = {}) {
       if (c.t === 0) {
         if (c.meta === "!COLOUR") {
           const def = parseColourLine(c.text);
-          if (def && def.code !== 16 && def.code !== 24)
+          if (def && def.code !== 16 && def.code !== 24) {
+            defLine.set(def, c.text);
             (scope = new Map(scope ?? [])).set(def.code, def);
+          }
           continue;
         }
         if (tx && c.geom?.t === 1)
@@ -837,7 +869,7 @@ function flatten(doc, opts = {}) {
           sub(d, c.file, mm, col, sp, lt, cd);
           continue;
         }
-        emit(c.file, col, mm, sp, s, true, lt, cd);
+        emit(c.file, col, mm, sp, s, true, lt, cd, scope);
         continue;
       }
       const ext = opts.resolveModel?.(c.file);
@@ -845,7 +877,7 @@ function flatten(doc, opts = {}) {
         sub(ext, c.file, mm, col, sp, lt, cd);
         continue;
       }
-      emit(c.file, col, mm, sp, s, false, lt, cd);
+      emit(c.file, col, mm, sp, s, false, lt, cd, scope);
     }
     flushLoose(Infinity);
     if (groups) {
@@ -1106,7 +1138,7 @@ function blendedColourHex(code) {
   return "#" + [0, 1, 2].map((k) => (a[k] + b[k] >> 1).toString(16).padStart(2, "0")).join("").toUpperCase();
 }
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/node/resolver.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/node/resolver.ts
 var TOP_STUD_RE = /^(stud|studa|stud2|stud2a|stud6|stud6a|stud10|stud15|stud2s|stud2s2|stud-logo\d*|stud2-logo\d*)\.dat$/i;
 var UNDER_STUD_RE = /^(stud3|stud3a|stud4.*|stud12|stud16.*|stud18a)\.dat$/i;
 var norm2 = (ref) => ref.trim().replace(/\\/g, "/").toLowerCase();
@@ -1192,6 +1224,53 @@ class Library {
   isPart(key) {
     return key.startsWith("parts/") && !key.startsWith("parts/s/");
   }
+  #codes = new Map;
+  #ldconfig;
+  colourCodes(key) {
+    let s = this.#codes.get(key);
+    if (s)
+      return s;
+    s = new Set;
+    this.#codes.set(key, s);
+    for (const line of this.read(key).split(/\r?\n/)) {
+      const t = line.trim(), c = t[0];
+      if (c !== "1" && c !== "3" && c !== "4")
+        continue;
+      const tok = t.split(/\s+/);
+      if (tok.length < 2)
+        continue;
+      const code = parseColor(tok[1]);
+      if (code !== 16 && code !== 24 && !Number.isNaN(code))
+        s.add(code);
+      if (c === "1") {
+        const r = parseType1(t);
+        const ck = r && this.resolve(r.name);
+        if (ck)
+          for (const x of this.colourCodes(ck))
+            s.add(x);
+      }
+    }
+    return s;
+  }
+  scopeChanges(key, wrapperSource) {
+    if (!this.#ldconfig) {
+      const f = path.join(this.root, "LDConfig.ldr");
+      this.#ldconfig = fs.existsSync(f) ? parseLDConfig(fs.readFileSync(f, "latin1")) : new Map;
+    }
+    const used = this.colourCodes(key);
+    for (const line of wrapperSource.split(`
+`)) {
+      if (!line.startsWith("0 !COLOUR"))
+        continue;
+      const d = parseColourLine(line);
+      if (!d || !used.has(d.code))
+        continue;
+      const g = this.#ldconfig.get(d.code);
+      if (!g || g.hex.toUpperCase() !== d.hex.toUpperCase())
+        return true;
+    }
+    return false;
+  }
   fileStats(key) {
     if (this.stats.has(key))
       return this.stats.get(key);
@@ -1331,6 +1410,7 @@ function flatten2(model, lib, onInstance, opts = {}) {
     lib.addVirtual(n, t);
   const doc = modelDoc(model);
   const at = new Map;
+  const changes = new Map;
   for (const i of flatten(doc, opts)) {
     let key;
     if (i.embedded)
@@ -1351,6 +1431,15 @@ function flatten2(model, lib, onInstance, opts = {}) {
       r.texRef = i.texPart;
       r.texPart = lib.addVirtual(i.texPart, i.texSource);
     }
+    if (i.colPart) {
+      let ch = changes.get(i.colPart);
+      if (ch === undefined)
+        changes.set(i.colPart, ch = lib.scopeChanges(key, i.colSource));
+      if (ch) {
+        r.colRef = i.colPart;
+        r.colPart = lib.addVirtual(i.colPart, i.colSource);
+      }
+    }
     onInstance(r);
   }
   return { missing };
@@ -1376,11 +1465,11 @@ function collectDeps(lib, refs) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/node/compile.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/node/compile.ts
 import fs2 from "node:fs";
 import path2 from "node:path";
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/node/lod.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/node/lod.ts
 import { MeshoptSimplifier, MeshoptEncoder } from "meshoptimizer";
 await Promise.all([MeshoptSimplifier.ready, MeshoptEncoder.ready]);
 function reorderMesh(P, N, C, I) {
@@ -1572,7 +1661,7 @@ function lodChain(P, C, I) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/node/compile.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/node/compile.ts
 function loadColors(root) {
   const map = new Map;
   for (const l of fs2.readFileSync(path2.join(root, "LDConfig.ldr"), "latin1").split(/\r?\n/)) {
@@ -2287,7 +2376,7 @@ function encodePack(parts, studKinds, weld, extra, options = {}) {
   return Buffer.concat([head, ...chunks.map((c) => new Uint8Array(c.buffer, c.byteOffset, c.byteLength))]);
 }
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/node/build-pack.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/node/build-pack.ts
 function packCompilerOpts(o) {
   return { studs: o.studs ?? "low", prims: o.primitives ?? "full", weld: o.weld ?? true, separateStuds: true, cond: !!o.cond, tex: !!o.textures };
 }
@@ -2307,6 +2396,8 @@ function buildPack(o) {
         refs.set(i.ref, i.part);
         if (i.texRef)
           refs.set(i.texRef, i.texPart);
+        if (i.colRef)
+          refs.set(i.colRef, i.colPart);
       }, { textures, looseGeometry: o.looseGeometry });
       for (const k of r.missing.keys())
         missing.add(k);
@@ -2358,7 +2449,7 @@ function buildPack(o) {
   return { data: encodePack(parts, kinds, comp.opts.weld, extra, { texture, lod: o.lod !== false, reorder: !!o.reorder }), parts: parts.size, studKinds: kinds.size, missing: [...missing], ...warnings.length ? { warnings } : {} };
 }
 
-// ../../../../../../../tmp/ldr-build-JOxLfU/src/cli.ts
+// ../../../../../../../tmp/ldr-build-P0dzRz/src/cli.ts
 var HELP = `ldr pack — build a parts pack for the ldr three.js renderer
 
 Usage: