hyperbook 0.99.0 → 0.99.1

package/dist/assets/directive-openscad/client.js

@@ -34436,12 +34436,68 @@ void main() {
     }
     return { vertices, faces, colors };
   };
+  var splitByColor = (vertices, faces, colorCount) => {
+    const groups = Array.from({ length: colorCount }, () => ({ faceIndices: [] }));
+    faces.forEach((face, faceIdx) => {
+      groups[face.colorIndex].faceIndices.push(faceIdx);
+    });
+    return groups.filter((g) => g.faceIndices.length > 0).map(({ faceIndices }, groupIdx) => {
+      const oldToNew = /* @__PURE__ */ new Map();
+      const groupVertices = [];
+      for (const faceIdx of faceIndices) {
+        for (const vIdx of faces[faceIdx].vertices) {
+          if (!oldToNew.has(vIdx)) {
+            oldToNew.set(vIdx, groupVertices.length);
+            groupVertices.push(vertices[vIdx]);
+          }
+        }
+      }
+      const groupFaces = faceIndices.map((faceIdx) => ({
+        ...faces[faceIdx],
+        vertices: faces[faceIdx].vertices.map((vIdx) => oldToNew.get(vIdx))
+      }));
+      return { vertices: groupVertices, faces: groupFaces };
+    });
+  };
   var exportIndexedPolyhedronTo3mf = (polyhedron) => {
-    const objectUuid = createUuid();
     const buildUuid = createUuid();
     const extruderIndexByColorIndex = polyhedron.colors.map(
       (_, idx) => idx % PAINT_COLOR_MAP.length
     );
+    const materialsId = 1;
+    const components = splitByColor(polyhedron.vertices, polyhedron.faces, polyhedron.colors.length);
+    const objectXmls = components.map((comp, compIdx) => {
+      const objectId = compIdx + 2;
+      const objectUuid = createUuid();
+      const colorIndex = comp.faces[0]?.colorIndex ?? 0;
+      const paintColor = PAINT_COLOR_MAP[extruderIndexByColorIndex[colorIndex]];
+      return [
+        `<object id="${objectId}" name="OpenSCAD Model ${compIdx + 1}" type="model" p:UUID="${objectUuid}" pid="${materialsId}" pindex="${colorIndex}">`,
+        "<mesh>",
+        "<vertices>",
+        ...comp.vertices.map(
+          (vertex2) => `<vertex x="${vertex2.x}" y="${vertex2.y}" z="${vertex2.z}" />`
+        ),
+        "</vertices>",
+        "<triangles>",
+        ...comp.faces.map((face) => {
+          const [v1, v2, v3] = face.vertices;
+          const attrs = [`v1="${v1}"`, `v2="${v2}"`, `v3="${v3}"`];
+          if (paintColor) {
+            attrs.push(`paint_color="${paintColor}"`);
+          }
+          return `<triangle ${attrs.join(" ")} />`;
+        }),
+        "</triangles>",
+        "</mesh>",
+        "</object>"
+      ].join("\n");
+    });
+    const buildItems = components.map((_, compIdx) => {
+      const objectId = compIdx + 2;
+      const objectUuid = createUuid();
+      return `<item objectid="${objectId}" p:UUID="${objectUuid}"/>`;
+    });
     const modelXml = [
       '<?xml version="1.0" encoding="utf-8"?>',
       '<model unit="millimeter" xml:lang="en-US" xmlns="http://schemas.microsoft.com/3dmanufacturing/core/2015/02" xmlns:p="http://schemas.microsoft.com/3dmanufacturing/production/2015/06">',
@@ -34449,37 +34505,15 @@ void main() {
       '<meta name="slic3rpe:Version3mf" value="1"/>',
       '<meta name="slic3rpe:MmPaintingVersion" value="1"/>',
       "<resources>",
-      '<basematerials id="2">',
+      `<basematerials id="${materialsId}">`,
       ...polyhedron.colors.map(
         (color, i) => `<base name="color_${i}" displaycolor="${colorToDisplayColor(color)}"/>`
       ),
       "</basematerials>",
-      `<object id="1" name="OpenSCAD Model" type="model" p:UUID="${objectUuid}" pid="2" pindex="0">`,
-      "<mesh>",
-      "<vertices>",
-      ...polyhedron.vertices.map(
-        (vertex2) => `<vertex x="${vertex2.x}" y="${vertex2.y}" z="${vertex2.z}" />`
-      ),
-      "</vertices>",
-      "<triangles>",
-      ...polyhedron.faces.map((face) => {
-        const [v1, v2, v3] = face.vertices;
-        const attrs = [`v1="${v1}"`, `v2="${v2}"`, `v3="${v3}"`];
-        if (face.colorIndex > 0) {
-          attrs.push(`pid="2"`, `p1="${face.colorIndex}"`);
-        }
-        const paintColor = PAINT_COLOR_MAP[extruderIndexByColorIndex[face.colorIndex]];
-        if (paintColor) {
-          attrs.push(`paint_color="${paintColor}"`);
-        }
-        return `<triangle ${attrs.join(" ")} />`;
-      }),
-      "</triangles>",
-      "</mesh>",
-      "</object>",
+      ...objectXmls,
       "</resources>",
       `<build p:UUID="${buildUuid}">`,
-      `<item objectid="1" p:UUID="${objectUuid}"/>`,
+      ...buildItems,
       "</build>",
       "</model>"
     ].join("\n");

package/dist/index.js

@@ -202298,7 +202298,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"application/1d-interleaved-parityfec
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.99.0","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=18"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register --external favicons --external sharp && node postbuild.mjs"},"dependencies":{"favicons":"^7.2.0"},"devDependencies":{"create-hyperbook":"workspace:*","@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"hyperbook","version":"0.99.1","author":"Mike Barkmin","homepage":"https://github.com/openpatch/hyperbook#readme","license":"MIT","bin":{"hyperbook":"./dist/index.js"},"files":["dist"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/openpatch/hyperbook.git","directory":"packages/hyperbook"},"bugs":{"url":"https://github.com/openpatch/hyperbook/issues"},"engines":{"node":">=18"},"scripts":{"version":"pnpm build","lint":"tsc --noEmit","dev":"ncc build ./index.ts -w -o dist/","build":"rimraf dist && ncc build ./index.ts -o ./dist/ --no-cache --no-source-map-register --external favicons --external sharp && node postbuild.mjs"},"dependencies":{"favicons":"^7.2.0"},"devDependencies":{"create-hyperbook":"workspace:*","@hyperbook/fs":"workspace:*","@hyperbook/markdown":"workspace:*","@hyperbook/types":"workspace:*","@pnpm/exportable-manifest":"1000.0.6","@types/archiver":"6.0.3","@types/async-retry":"1.4.9","@types/cross-spawn":"6.0.6","@types/lunr":"^2.3.7","@types/prompts":"2.4.9","@types/tar":"6.1.13","@types/ws":"^8.5.14","@vercel/ncc":"0.38.3","archiver":"7.0.1","async-retry":"1.3.3","chalk":"5.4.1","chokidar":"4.0.3","commander":"12.1.0","cpy":"11.1.0","cross-spawn":"7.0.6","domutils":"^3.2.2","extract-zip":"^2.0.1","got":"12.6.0","htmlparser2":"^10.0.0","lunr":"^2.3.9","lunr-languages":"^1.14.0","mime":"^4.0.6","prompts":"2.4.2","rimraf":"6.0.1","tar":"7.4.3","update-check":"1.5.4","ws":"^8.18.0"}}');
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperbook",
-  "version": "0.99.0",
+  "version": "0.99.1",
   "author": "Mike Barkmin",
   "homepage": "https://github.com/openpatch/hyperbook#readme",
   "license": "MIT",
@@ -58,8 +58,8 @@
     "ws": "^8.18.0",
     "create-hyperbook": "0.3.6",
     "@hyperbook/fs": "0.25.0",
-    "@hyperbook/types": "0.23.0",
-    "@hyperbook/markdown": "0.70.0"
+    "@hyperbook/markdown": "0.70.1",
+    "@hyperbook/types": "0.23.0"
   },
   "scripts": {
     "version": "pnpm build",