ldr 0.34.11 → 0.34.13

package/README.md

@@ -147,7 +147,7 @@ MPD-embedded parts, such as Studio/OMR unofficial parts or stickers, become part
 | `lodEdgeCap` | `0.75` | LOD: a part draws at most `lodEdgeCap` × d² of its edge segments (its longest), d = its size on screen in pixels. `0` = no cap. |
 | `lodUnder` | `true` | LOD: skip undersides that can't be seen (camera behind every bottom face of a cluster's parts, or the body drawn as its closed bounding box). Lossless in the fidelity checks. |
 
-`LdrObject`: `object`, `stats` (`instances`, `drawn`, `missing[]`, `studsHidden/Total`, `undersHidden/Total`, `buildMs`, `condBatches`, `texBatches`, `textures`, `glossmaps`, `clusters`), `stepCount`, `stepViews`, `texturesReady`, `setStep(n | null)`, `setEdges(on)`, `setConditionalLines(on)`, `setCulling(studs, undersides)`, `setSide(side)`, `setLod(on)`, `setGhost(on, { opacity, color, whiten }?)`, `getBox(target?)`, `dispose()`.
+`LdrObject`: `object`, `stats` (`instances`, `drawn`, `missing[]`, `studsHidden/Total`, `undersHidden/Total`, `buildMs`, `condBatches`, `texBatches`, `textures`, `glossmaps`, `clusters`), `stepCount`, `stepViews`, `texturesReady`, `setStep(n | null, mask?, ghostAfter?)` (`ghostAfter`: the ghost shows only the steps after it, e.g. `setStep(s - 1, mask, s)` while step s's parts animate in, so none is drawn as a ghost and a solid at once), `setEdges(on)`, `setConditionalLines(on)`, `setCulling(studs, undersides)`, `setSide(side)`, `setLod(on)`, `setGhost(on, { opacity, color, whiten }?)`, `getBox(target?)`, `dispose()`.
 
 `setStep` doesn't rebuild anything: it compacts instance buffers, and culling is step-aware (a stud covered only by a later step's part stays visible). `stats` reflect the shown step.
 

package/dist/cli.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/cli.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/cli.ts
 import fs4 from "node:fs";
 import zlib from "node:zlib";
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/node/build-pack.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/node/build-pack.ts
 import fs3 from "node:fs";
 import path3 from "node:path";
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/node/resolver.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/node/resolver.ts
 import fs from "node:fs";
 import path from "node:path";
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/spec.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/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;
@@ -848,7 +848,7 @@ function fileStepViews(f) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/model.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/model.ts
 class ModelLimitError extends Error {
   limit;
   code = "ldr-model-limit";
@@ -898,6 +898,15 @@ function flatten(doc, opts = {}) {
   const loose = opts.looseGeometry !== false, tx = !!opts.textures, co = !!opts.callouts;
   const src = new Map;
   let subs = 0;
+  const stepSingles = [];
+  const stepPathOf = (path, s) => {
+    if (path.length)
+      return [...path, s];
+    let a = stepSingles[s];
+    if (!a)
+      stepSingles[s] = a = [s];
+    return a;
+  };
   const open = new Set;
   const maxN = opts.maxInstances ?? 2000000;
   let work = 0;
@@ -977,7 +986,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, scope0).source = lazy(f, k);
+        emit(loosePartName(f.name, k), color, m, stepPathOf(stepPath, k), k, false, null, colour, scope0).source = lazy(f, k);
       }
     };
     for (const c0 of f.cmds) {
@@ -1008,10 +1017,10 @@ function flatten(doc, opts = {}) {
         continue;
       if (tx && c.fallback)
         continue;
-      const mm = mul(m, c.m);
+      const mm = m === I ? c.m : mul(m, c.m);
       if (!inRange12(mm))
         continue;
-      const col = c.color === 16 ? color : c.color, cd = c.color === 16 ? colour : scope?.get(c.color), sp = [...stepPath, s];
+      const col = c.color === 16 ? color : c.color, cd = c.color === 16 ? colour : scope?.get(c.color), sp = stepPathOf(stepPath, s);
       const tex = tx ? c.tex ?? texIn : null;
       const local = tex ? invert(c.m) : null;
       const lt = tex && local ? transformTexMap(tex, local) : null;
@@ -1290,7 +1299,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-cBWp5F/src/node/resolver.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/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();
@@ -1617,11 +1626,11 @@ function collectDeps(lib, refs) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/node/compile.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/node/compile.ts
 import fs2 from "node:fs";
 import path2 from "node:path";
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/node/lod.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/node/lod.ts
 import { MeshoptSimplifier, MeshoptEncoder } from "meshoptimizer";
 await Promise.all([MeshoptSimplifier.ready, MeshoptEncoder.ready]);
 function reorderMesh(P, N, C, I) {
@@ -1927,7 +1936,7 @@ function levelLines(P, I, E, err, always, tol = 0.01) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-cBWp5F/src/node/compile.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/node/compile.ts
 class BfcState {
   accum;
   ccw = true;
@@ -2230,6 +2239,22 @@ class Compiler {
     seatStuds(out, fullKind, (k) => this.compile(k, false).bbox);
     if (this.opts.tex && this.hasTex(key))
       this.texPass(key, out, separateStuds, colorOf);
+    const cap = OPEN_BOTTOM[key.replace(/^.*[\\/]/, "").toLowerCase()];
+    if (cap && isFinite(out.bbox[0])) {
+      const [cx0, cz0, cx1, cz1] = cap, y = out.bbox[4], b = out.body, per = b.col.length / (b.pos.length / 3);
+      let v = -1;
+      for (let i = 1;i < b.pos.length; i += 3)
+        if (Math.abs(b.pos[i] - y) < 0.01) {
+          v = (i - 1) / 3;
+          break;
+        }
+      if (v >= 0) {
+        const rgba = b.col.slice(v * per, v * per + per);
+        b.pos.push(cx0, y, cz0, cx0, y, cz1, cx1, y, cz1, cx0, y, cz0, cx1, y, cz1, cx1, y, cz0);
+        for (let k = 0;k < 6; k++)
+          b.col.push(...rgba);
+      }
+    }
     const [x0, y0, z0, x1, y1, z1] = out.bbox;
     let ax0 = Infinity, ax1 = -Infinity, az0 = Infinity, az1 = -Infinity;
     for (const b of [out.body, out.under])
@@ -2455,6 +2480,7 @@ class Compiler {
     }
   }
 }
+var OPEN_BOTTOM = { "11477.dat": [-10, -20, 10, 20] };
 function underEnclosed(c) {
   const u = c.under.pos;
   let uy0 = Infinity, uy1 = -Infinity, ux0 = Infinity, ux1 = -Infinity, uz0 = Infinity, uz1 = -Infinity;
@@ -2871,7 +2897,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-cBWp5F/src/node/build-pack.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/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, ...o.partWorkLimit ? { workLimit: o.partWorkLimit } : {} };
 }
@@ -2944,7 +2970,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-cBWp5F/src/cli.ts
+// ../../../../../../../tmp/ldr-build-s89ZOB/src/cli.ts
 var HELP = `ldr pack — build a parts pack for the ldr three.js renderer
 
 Usage:

package/dist/index.d.ts

@@ -6,8 +6,9 @@ export type { StepCameraView, StepCameraOptions, Vec3 } from "./instructions.js"
 export type { PartInstance, FlattenOptions, LDrawColor, LDrawFinish, LDrawFinishType, LDrawMaterialGrain, ColourSurface } from "./model.js";
 export { loadPack, decodePack, buildLdrScene, buildLdrSceneAsync, makeMaterial, makeFinishMaterial, createInstancedEdges, computeCulling, cullCore, forEachStud, conditionalLines, createInstancedConditionalEdges, conditionalLineVisible, warmPackGeometry, makeTexturedMaterial, packTexture, pngHasAlpha } from "./render.js";
 export { precomputeCull, sceneInstances } from "./cull.js";
-export type { Pack, LdrParams, Inst, CullResult, BuildLdrSceneAsyncOptions, GlossMap } from "./render.js";
+export type { StudMask, Pack, LdrParams, Inst, CullResult, BuildLdrSceneAsyncOptions, GlossMap } from "./render.js";
 export { createLdrObject, createLdrObjectAsync } from "./scene.js";
+export { studDecalUniforms, type StudDecalUniforms } from "./stud-decal.js";
 export type { LdrObject, LdrObjectOptions, LdrStats, ColorSource, GhostOptions } from "./scene.js";
 export { decompressPack, decodeModelText, modelFileName } from "./pack-io.js";
 export { loadModel, loadParts, loadPartsIndex, mergePacks, prepareModel, bodyTriangles, estimateBudgetFromIndex, BudgetError, DEFAULT_PARTS_CDN } from "./cdn.js";