@addozhang/dsh-3d-model-viewer 0.3.1 → 0.3.2

package/README.md

@@ -74,9 +74,9 @@ cookie for its private server instance. Env knobs: `E2E_WORKSPACE`,
 
 ## Current limitations
 
-- 3MF support covers mesh geometry + `basematerials` colors; build-item
-  transforms, per-component overrides, and slicer-specific metadata are not
-  reconstructed.
+- 3MF support covers mesh geometry, build-item and component transforms
+  (multi-plate projects render every plate at its true position), and
+  `basematerials` part colors; slicer-specific metadata is ignored.
 - Files are capped at 250 MB / 5 M triangles; meshes above 400 k triangles
   fall back to bounding-box-only picking (moot with button-based drag modes).
 - This is a geometry previewer: no slicing, no printability analysis.

package/README.zh-CN.md

@@ -46,7 +46,7 @@ e2e 脚本依赖本机 python3 + playwright + Chrome，从 `~/.dsh/.credentials.
 
 ## 当前限制
 
-- 3MF 支持网格几何 + `basematerials` 颜色；build-item 变换、组件级覆盖与切片器私有元数据不还原
+- 3MF 支持网格几何、build-item / component 变换（多盘工程按真实盘位渲染全部盘）与 `basematerials` 部件颜色；切片器私有元数据忽略
 - 单文件限制 250 MB / 500 万三角面；超过 40 万三角面的网格拾取只用包围盒（按键式拖动模式下影响甚微）
 - 这是几何预览器：不做切片，不做可制造性分析
 

package/lib/client.js

@@ -247,12 +247,36 @@
     if (hex.length === 3) hex = [...hex].map((c) => c + c).join("");
     return [0, 2, 4].map((i) => parseInt(hex.slice(i, i + 2), 16) / 255);
   }
+  var MAT4_IDENTITY = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
+  function mat4FromTransform(text) {
+    if (typeof text !== "string") return MAT4_IDENTITY;
+    const parts = text.trim().split(/\s+/);
+    if (parts.length === 0 || parts.length === 1 && parts[0] === "") return MAT4_IDENTITY;
+    if (parts.length !== 12) throw Error(`3MF \u53D8\u6362\u9700\u8981 12 \u4E2A\u6570\u5B57\uFF0C\u5F97\u5230 ${parts.length}`);
+    const m = parts.map(Number);
+    for (const v of m) if (!Number.isFinite(v)) throw Error("3MF \u53D8\u6362\u5305\u542B\u975E\u6570\u5B57");
+    return [m[0], m[1], m[2], 0, m[3], m[4], m[5], 0, m[6], m[7], m[8], 0, m[9], m[10], m[11], 1];
+  }
+  function mat4Mul(child, parent) {
+    const out = new Array(16);
+    for (let r = 0; r < 4; r++) for (let c = 0; c < 4; c++) {
+      out[r * 4 + c] = child[r * 4] * parent[c] + child[r * 4 + 1] * parent[4 + c] + child[r * 4 + 2] * parent[8 + c] + child[r * 4 + 3] * parent[12 + c];
+    }
+    return out;
+  }
+  function mat4Apply(m, x, y, z) {
+    return [
+      x * m[0] + y * m[4] + z * m[8] + m[12],
+      x * m[1] + y * m[5] + z * m[9] + m[13],
+      x * m[2] + y * m[6] + z * m[10] + m[14]
+    ];
+  }
+  var P_NS = "http://schemas.microsoft.com/3dmanufacturing/production/2015/06";
   async function parse3mf(buf) {
     const files = await unzip(buf);
     const models = files.filter((f) => /\.model$/i.test(f.name));
     if (!models.length) throw Error("3MF \u4E2D\u6CA1\u6709 .model \u7F51\u683C");
-    const vals = [], cols = [];
-    let triangles = 0, sawColor = false;
+    const registry = /* @__PURE__ */ new Map();
     for (const f of models) {
       const doc = new DOMParser().parseFromString(new TextDecoder().decode(f.data), "application/xml");
       if (doc.querySelector("parsererror")) continue;
@@ -261,32 +285,81 @@
       for (const bm of doc.getElementsByTagNameNS("*", "basematerials")) {
         materialMap[bm.getAttribute("id")] = [...bm.getElementsByTagNameNS("*", "base")].map((base) => parseHexColor(base.getAttribute("color")));
       }
-      const emit = (mesh2, defaultColor, materialColors) => {
-        const verts = [...mesh2.getElementsByTagNameNS("*", "vertex")].map((v) => [+v.getAttribute("x") * factor, +v.getAttribute("y") * factor, +v.getAttribute("z") * factor]);
-        for (const t of mesh2.getElementsByTagNameNS("*", "triangle")) {
-          const ids = [+t.getAttribute("v1"), +t.getAttribute("v2"), +t.getAttribute("v3")];
-          const a = verts[ids[0]], b = verts[ids[1]], c = verts[ids[2]];
-          if (!a || !b || !c) continue;
-          const ux = b[0] - a[0], uy = b[1] - a[1], uz = b[2] - a[2], vx = c[0] - a[0], vy = c[1] - a[1], vz = c[2] - a[2];
-          const nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx, l = Math.hypot(nx, ny, nz) || 1;
-          for (const v of [a, b, c]) vals.push(v[0], v[1], v[2], nx / l, ny / l, nz / l);
-          let color = defaultColor;
-          const matid = t.getAttribute("matid");
-          if (materialColors && matid !== null && materialColors[+matid - 1]) color = materialColors[+matid - 1];
-          if (color) sawColor = true;
-          if (color) cols.push(color[0], color[1], color[2], color[0], color[1], color[2], color[0], color[1], color[2]);
-          else cols.push(0, 0, 0, 0, 0, 0, 0, 0, 0);
-          triangles++;
-          if (triangles > 5e6) throw Error("\u6A21\u578B\u8D85\u8FC7 500 \u4E07\u4E09\u89D2\u9762\u9650\u5236");
+      const objects = /* @__PURE__ */ new Map();
+      for (const obj of doc.getElementsByTagNameNS("*", "object")) {
+        if (obj.getAttribute("id") !== null) objects.set(obj.getAttribute("id"), obj);
+      }
+      registry.set(f.name.replace(/^\//, ""), { doc, factor, materialMap, objects, name: f.name.replace(/^\//, "") });
+    }
+    let rootName = "3D/3dmodel.model";
+    const rels = files.find((f) => f.name.replace(/^\//, "") === "_rels/.rels");
+    if (rels) {
+      try {
+        const relDoc = new DOMParser().parseFromString(new TextDecoder().decode(rels.data), "application/xml");
+        for (const rel of relDoc.getElementsByTagNameNS("*", "Relationship")) {
+          if ((rel.getAttribute("Type") || "").endsWith("/3dmodel")) {
+            rootName = (rel.getAttribute("Target") || "").replace(/^\//, "");
+            break;
+          }
         }
-      };
-      const objects = [...doc.getElementsByTagNameNS("*", "object")];
-      for (const obj of objects) {
-        const materialColors = materialMap[obj.getAttribute("pid")] || null;
-        const objColor = materialColors ? materialColors[+(obj.getAttribute("pindex") || 0)] || null : null;
-        for (const mesh2 of obj.getElementsByTagNameNS("*", "mesh")) emit(mesh2, objColor, materialColors);
+      } catch {
+      }
+    }
+    const root = registry.get(rootName) || registry.get("3D/3dmodel.model");
+    if (!root) throw Error("3MF \u4E2D\u627E\u4E0D\u5230\u6839\u6A21\u578B");
+    const vals = [], cols = [];
+    let triangles = 0, sawColor = false;
+    const emitMesh = (mesh2, objEl, M, fileRec) => {
+      const materialColors = objEl ? fileRec.materialMap[objEl.getAttribute("pid")] || null : null;
+      const objColor = materialColors ? materialColors[+(objEl.getAttribute("pindex") || 0)] || null : null;
+      const verts = [...mesh2.getElementsByTagNameNS("*", "vertex")].map((v) => [+v.getAttribute("x") * fileRec.factor, +v.getAttribute("y") * fileRec.factor, +v.getAttribute("z") * fileRec.factor]);
+      for (const t of mesh2.getElementsByTagNameNS("*", "triangle")) {
+        const ids = [+t.getAttribute("v1"), +t.getAttribute("v2"), +t.getAttribute("v3")];
+        const raw = [verts[ids[0]], verts[ids[1]], verts[ids[2]]];
+        if (!raw[0] || !raw[1] || !raw[2]) continue;
+        const pts = raw.map((p) => M === MAT4_IDENTITY ? p : mat4Apply(M, p[0], p[1], p[2]));
+        const [a, b, c] = pts;
+        const ux = b[0] - a[0], uy = b[1] - a[1], uz = b[2] - a[2], vx = c[0] - a[0], vy = c[1] - a[1], vz = c[2] - a[2];
+        const nx = uy * vz - uz * vy, ny = uz * vx - ux * vz, nz = ux * vy - uy * vx, l = Math.hypot(nx, ny, nz) || 1;
+        for (const p of pts) vals.push(p[0], p[1], p[2], nx / l, ny / l, nz / l);
+        let color = objColor;
+        const matid = t.getAttribute("matid");
+        if (materialColors && matid !== null && materialColors[+matid - 1]) color = materialColors[+matid - 1];
+        if (color) {
+          sawColor = true;
+          cols.push(color[0], color[1], color[2], color[0], color[1], color[2], color[0], color[1], color[2]);
+        } else {
+          cols.push(0, 0, 0, 0, 0, 0, 0, 0, 0);
+        }
+        triangles++;
+        if (triangles > 5e6) throw Error("\u6A21\u578B\u8D85\u8FC7 500 \u4E07\u4E09\u89D2\u9762\u9650\u5236");
+      }
+    };
+    const emitObject = (fileRec, objId, M, visiting) => {
+      const obj = fileRec.objects.get(objId);
+      if (!obj) return;
+      const key = fileRec.name + "#" + objId;
+      if (visiting.has(key)) return;
+      visiting.add(key);
+      const mesh2 = obj.getElementsByTagNameNS("*", "mesh")[0] || null;
+      if (mesh2) emitMesh(mesh2, obj, M, fileRec);
+      for (const comp of obj.getElementsByTagNameNS("*", "component")) {
+        const path = comp.getAttributeNS(P_NS, "path");
+        const childRec = path ? registry.get(path.replace(/^\//, "")) : fileRec;
+        if (!childRec) continue;
+        const cm = mat4FromTransform(comp.getAttribute("transform"));
+        const combined = M === MAT4_IDENTITY && cm === MAT4_IDENTITY ? MAT4_IDENTITY : mat4Mul(cm, M);
+        emitObject(childRec, comp.getAttribute("objectid"), combined, visiting);
+      }
+      visiting.delete(key);
+    };
+    const items = [...root.doc.getElementsByTagNameNS("*", "item")];
+    if (items.length) {
+      for (const item of items) {
+        emitObject(root, item.getAttribute("objectid"), mat4FromTransform(item.getAttribute("transform")), /* @__PURE__ */ new Set());
       }
-      if (!objects.length) for (const mesh2 of doc.getElementsByTagNameNS("*", "mesh")) emit(mesh2, null, null);
+    } else {
+      for (const id of root.objects.keys()) emitObject(root, id, MAT4_IDENTITY, /* @__PURE__ */ new Set());
     }
     if (!triangles) throw Error("3MF \u4E2D\u6CA1\u6709\u53EF\u663E\u793A\u7684\u4E09\u89D2\u7F51\u683C");
     const mesh = finishMesh(new Float32Array(vals), triangles);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addozhang/dsh-3d-model-viewer",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Interactive STL/3MF viewer plugin for the DeepSeek Harness Web GUI: sidebar document preview, live session drawer, CAD navigation, orthographic dimension labels, 3MF part colors.",
   "license": "MIT",
   "engines": {