@chestnutlabs/gcode-model-renderer 0.11.0 → 0.12.0

package/dist/three-mf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"three-mf.d.ts","sourceRoot":"","sources":["../src/three-mf.ts"],"names":[],"mappings":"AAqBA,OAAO,EAML,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAkC,KAAK,WAAW,EAAuB,MAAM,aAAa,CAAC;AAkbpG,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CACnD;AA0FD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,UAAU,GAAG,WAAW,EAChC,MAAM,CAAC,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,eAAe,GACrB,OAAO,CAAC,UAAU,CAAC,CAyKrB"}
+{"version":3,"file":"three-mf.d.ts","sourceRoot":"","sources":["../src/three-mf.ts"],"names":[],"mappings":"AAqBA,OAAO,EAML,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAkC,KAAK,WAAW,EAAuB,MAAM,aAAa,CAAC;AAkbpG,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;CACnD;AA4GD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,UAAU,GAAG,WAAW,EAChC,MAAM,CAAC,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,eAAe,GACrB,OAAO,CAAC,UAAU,CAAC,CAyKrB"}

package/dist/three-mf.js

@@ -428,17 +428,27 @@ const EST_REJECT_MARGIN = 2;
 /**
  * Fast structural cost estimate (DD-022 Phase 0), run after the (tiny, for production-extension files)
  * main part is parsed but BEFORE any large external geometry part is decompressed. Walks the build-item /
- * component tree counting instance placements and a lower-bound triangle estimate:
- *   - a mesh object's own triangles are counted exactly (already parsed);
- *   - an external `p:path` component is estimated from its ZIP-directory uncompressed size / the
- *     conservative bytes-per-triangle bound, and treated as a leaf (not recursed) — a safe under-count.
- * Throws {@link ModelParseError} for a clear instance-bomb / oversize file so it rejects in sub-second
- * time instead of ~10 s of decompress-and-bake. Files near the budget do not reject here — the exact
- * per-triangle limit in the real parse still applies.
+ * component tree counting **placements** (all of them) and a lower-bound **unique**-triangle estimate:
+ *   - a mesh master's triangles are counted **once per unique master** (already parsed), NOT per placement;
+ *   - an external `p:path` part is estimated from its ZIP-directory uncompressed size / the conservative
+ *     bytes-per-triangle bound, counted **once per unique path** (a safe under-count), treated as a leaf.
+ * Because instancing renders each master once (DD-022 Phase 1), the triangle estimate must be UNIQUE — a
+ * full-sheet plate of ~40 copies costs its ~1 master, not ~40× baked, so it is NOT rejected here. The
+ * placement count still guards an instance bomb (`maxInstances`). Throws {@link ModelParseError} for a
+ * clear instance-bomb / oversize file so it rejects in sub-second time instead of ~10 s of decompress-and-
+ * bake; files near the budget fall through to the exact per-triangle parse.
  */
 function estimateSceneCost(mainPart, entryByName, lim) {
     let instanceCount = 0;
     let estTriangles = 0;
+    // Unique masters already counted toward the triangle estimate (keyed by objectid / external path), so a
+    // reused master is counted once — matching the instanced render, not the old per-placement bake.
+    const countedMasters = new Set();
+    const checkInstances = () => {
+        if (instanceCount > lim.maxInstances) {
+            throw new ModelParseError('E_MODEL_TOO_MANY_INSTANCES', `3MF declares more than ${lim.maxInstances} instance placements`);
+        }
+    };
     const visit = (part, objectid, depth) => {
         if (depth > MAX_DEPTH)
             return;
@@ -447,23 +457,30 @@ function estimateSceneCost(mainPart, entryByName, lim) {
             return;
         if (obj.tris.length > 0) {
             instanceCount++;
-            estTriangles += obj.tris.length / 3;
+            const key = `local:${objectid}`;
+            if (!countedMasters.has(key)) {
+                countedMasters.add(key);
+                estTriangles += obj.tris.length / 3;
+            }
+            checkInstances();
         }
         for (const comp of obj.components) {
             if (comp.path !== undefined) {
                 // External production-extension part: estimate from its directory size WITHOUT decompressing it.
-                const entry = entryByName(comp.path.replace(/^\//, '').toLowerCase());
+                const norm = comp.path.replace(/^\//, '').toLowerCase();
+                const entry = entryByName(norm);
                 if (entry !== undefined) {
                     instanceCount++;
-                    estTriangles += entry.uncompressedSize / EST_MAX_BYTES_PER_TRIANGLE;
+                    if (!countedMasters.has(norm)) {
+                        countedMasters.add(norm);
+                        estTriangles += entry.uncompressedSize / EST_MAX_BYTES_PER_TRIANGLE;
+                    }
+                    checkInstances();
                 }
             }
             else {
                 visit(part, comp.objectid, depth + 1); // local sub-object (already-parsed geometry)
             }
-            if (instanceCount > lim.maxInstances) {
-                throw new ModelParseError('E_MODEL_TOO_MANY_INSTANCES', `3MF declares more than ${lim.maxInstances} instance placements`);
-            }
         }
     };
     const roots = mainPart.items.length > 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chestnutlabs/gcode-model-renderer",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Three.js presentation renderer for source models (STL/3MF) — clean thumbnails/cards, distinct from toolpath inspection (DD-018).",
   "keywords": [
     "3d-printing",
@@ -51,9 +51,9 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@chestnutlabs/gcode-containers": "0.11.0",
-    "@chestnutlabs/gcode-renderer-three": "0.11.0",
-    "@chestnutlabs/toolpath-core": "0.11.0"
+    "@chestnutlabs/gcode-containers": "0.12.0",
+    "@chestnutlabs/gcode-renderer-three": "0.12.0",
+    "@chestnutlabs/toolpath-core": "0.12.0"
   },
   "devDependencies": {
     "@types/three": "0.178.0"