@tscircuit/3d-viewer 0.0.344 → 0.0.346

package/dist/index.js

@@ -25291,6 +25291,9 @@ var JscadModel = ({
   const { rootObject } = useThree();
   const { threeGeom, material } = useMemo3(() => {
     const jscadObject = (0, import_jscad_planner.executeJscadOperations)(import_modeling2.default, jscadPlan);
+    if (!jscadObject || !jscadObject.polygons && !jscadObject.sides) {
+      return { threeGeom: null, material: null };
+    }
     const threeGeom2 = convertCSGToThreeGeom(jscadObject);
     const material2 = new THREE3.MeshStandardMaterial({
       vertexColors: true,
@@ -25363,8 +25366,15 @@ var FootprinterModel = ({
     if (!footprint) return null;
     const { geometries: geometries2 } = getJscadModelForFootprint(footprint);
     const group2 = new THREE4.Group();
-    for (const geom of geometries2) {
-      const threeGeom = convertCSGToThreeGeom(geom);
+    for (const geomInfo of geometries2.flat(Infinity)) {
+      const geom = geomInfo.geom;
+      if (!geom || !geom.polygons && !geom.sides) {
+        continue;
+      }
+      const color = new THREE4.Color(geomInfo.color);
+      color.convertLinearToSRGB();
+      const geomWithColor = { ...geom, color: [color.r, color.g, color.b] };
+      const threeGeom = convertCSGToThreeGeom(geomWithColor);
       const material = new THREE4.MeshStandardMaterial({
         vertexColors: true,
         side: THREE4.DoubleSide
@@ -25572,7 +25582,7 @@ import * as THREE10 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.343",
+  version: "0.0.345",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -28853,7 +28863,7 @@ var BoardMeshes = ({
   }, [rootObject, geometryMeshes, textureMeshes]);
   return null;
 };
-var MANIFOLD_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm/manifold-3d@3.1.1";
+var MANIFOLD_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm/manifold-3d@3.2.1";
 var CadViewerManifold = ({
   circuitJson: circuitJsonProp,
   autoRotateDisabled,
@@ -28868,32 +28878,57 @@ var CadViewerManifold = ({
   const [manifoldJSModule, setManifoldJSModule] = useState13(null);
   const [manifoldLoadingError, setManifoldLoadingError] = useState13(null);
   useEffect20(() => {
-    const loadManifoldFromCDN = async () => {
+    const initManifold = async (ManifoldModule) => {
       try {
-        const manifoldURL = `${MANIFOLD_CDN_BASE_URL}/manifold.js`;
-        const { default: ManifoldModule } = await import(
-          /* @vite-ignore */
-          manifoldURL
-        );
-        if (ManifoldModule) {
-          const loadedModule = await ManifoldModule({
-            locateFile: () => `${MANIFOLD_CDN_BASE_URL}/manifold.wasm`
-          });
-          loadedModule.setup();
-          setManifoldJSModule(loadedModule);
-        } else {
-          throw new Error(
-            "ManifoldModule not found in dynamically imported module"
-          );
-        }
+        const loadedModule = await ManifoldModule();
+        loadedModule.setup();
+        setManifoldJSModule(loadedModule);
       } catch (error) {
-        console.error("Failed to load Manifold from CDN:", error);
+        console.error("Failed to initialize Manifold:", error);
         setManifoldLoadingError(
-          `Failed to load Manifold module: ${error instanceof Error ? error.message : "Unknown error"}`
+          `Failed to initialize Manifold: ${error instanceof Error ? error.message : "Unknown error"}`
         );
       }
     };
-    loadManifoldFromCDN();
+    if (window.ManifoldModule) {
+      initManifold(window.ManifoldModule);
+      return;
+    }
+    const eventName = "manifoldLoaded";
+    const handleLoad = () => {
+      if (window.ManifoldModule) {
+        initManifold(window.ManifoldModule);
+      } else {
+        const errText = "ManifoldModule not found on window after script load.";
+        console.error(errText);
+        setManifoldLoadingError(errText);
+      }
+    };
+    window.addEventListener(eventName, handleLoad, { once: true });
+    const script = document.createElement("script");
+    script.type = "module";
+    script.innerHTML = `
+try {
+  const { default: ManifoldModule } = await import('${MANIFOLD_CDN_BASE_URL}/manifold.js');
+  window.ManifoldModule = ManifoldModule;
+} catch (e) {
+  console.error('Error importing manifold in dynamic script:', e);
+} finally {
+  window.dispatchEvent(new CustomEvent('${eventName}'));
+}
+    `.trim();
+    const scriptError = (err) => {
+      const errText = "Failed to load Manifold loader script.";
+      console.error(errText, err);
+      setManifoldLoadingError(errText);
+      window.removeEventListener(eventName, handleLoad);
+    };
+    script.addEventListener("error", scriptError);
+    document.body.appendChild(script);
+    return () => {
+      window.removeEventListener(eventName, handleLoad);
+      script.removeEventListener("error", scriptError);
+    };
   }, []);
   const {
     geoms,
@@ -29407,39 +29442,48 @@ async function renderComponent(component, scene) {
       import_modeling3.default,
       component.model_jscad
     );
-    const threeGeom = convertCSGToThreeGeom(jscadObject);
-    const material2 = new THREE24.MeshStandardMaterial({
-      color: 8947848,
-      metalness: 0.5,
-      roughness: 0.5,
-      side: THREE24.DoubleSide
-    });
-    const mesh2 = new THREE24.Mesh(threeGeom, material2);
-    if (component.position) {
-      mesh2.position.set(
-        component.position.x ?? 0,
-        component.position.y ?? 0,
-        (component.position.z ?? 0) + 0.5
-      );
-    }
-    if (component.rotation) {
-      mesh2.rotation.set(
-        THREE24.MathUtils.degToRad(component.rotation.x ?? 0),
-        THREE24.MathUtils.degToRad(component.rotation.y ?? 0),
-        THREE24.MathUtils.degToRad(component.rotation.z ?? 0)
-      );
+    if (jscadObject && (jscadObject.polygons || jscadObject.sides)) {
+      const threeGeom = convertCSGToThreeGeom(jscadObject);
+      const material2 = new THREE24.MeshStandardMaterial({
+        color: 8947848,
+        metalness: 0.5,
+        roughness: 0.5,
+        side: THREE24.DoubleSide
+      });
+      const mesh2 = new THREE24.Mesh(threeGeom, material2);
+      if (component.position) {
+        mesh2.position.set(
+          component.position.x ?? 0,
+          component.position.y ?? 0,
+          (component.position.z ?? 0) + 0.5
+        );
+      }
+      if (component.rotation) {
+        mesh2.rotation.set(
+          THREE24.MathUtils.degToRad(component.rotation.x ?? 0),
+          THREE24.MathUtils.degToRad(component.rotation.y ?? 0),
+          THREE24.MathUtils.degToRad(component.rotation.z ?? 0)
+        );
+      }
+      scene.add(mesh2);
     }
-    scene.add(mesh2);
     return;
   }
   if (component.footprinter_string) {
     const { geometries: geometries2 } = getJscadModelForFootprint(
       component.footprinter_string
     );
-    for (const geom of geometries2) {
-      const threeGeom = convertCSGToThreeGeom(geom);
+    for (const geomInfo of geometries2.flat(Infinity)) {
+      const geom = geomInfo.geom;
+      if (!geom || !geom.polygons && !geom.sides) {
+        continue;
+      }
+      const color = new THREE24.Color(geomInfo.color);
+      color.convertLinearToSRGB();
+      const geomWithColor = { ...geom, color: [color.r, color.g, color.b] };
+      const threeGeom = convertCSGToThreeGeom(geomWithColor);
       const material2 = new THREE24.MeshStandardMaterial({
-        color: 4473924,
+        vertexColors: true,
         metalness: 0.2,
         roughness: 0.8,
         side: THREE24.DoubleSide
@@ -29522,12 +29566,14 @@ async function convertCircuitJsonTo3dSvg(circuitJson, options = {}) {
   const boardGeom = createBoardGeomFromCircuitJson(circuitJson);
   if (boardGeom) {
     for (const geom of boardGeom) {
-      const geometry = createGeometryFromPolygons(geom.polygons);
+      const g = geom;
+      if (!g.polygons || g.polygons.length === 0) continue;
+      const geometry = createGeometryFromPolygons(g.polygons);
       const material = new THREE25.MeshStandardMaterial({
         color: new THREE25.Color(
-          geom.color?.[0] ?? 0,
-          geom.color?.[1] ?? 0,
-          geom.color?.[2] ?? 0
+          g.color?.[0] ?? 0,
+          g.color?.[1] ?? 0,
+          g.color?.[2] ?? 0
         ),
         metalness: 0.1,
         roughness: 0.8,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.344",
+  "version": "0.0.346",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",