@tscircuit/3d-viewer 0.0.234 → 0.0.236

package/dist/index.js

@@ -16985,7 +16985,7 @@ import { Canvas, useFrame as useFrame2 } from "@react-three/fiber";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.233",
+  version: "0.0.235",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -17016,7 +17016,7 @@ var package_default = {
     "@jscad/stl-serializer": "^2.1.20",
     "@react-three/drei": "^9.121.4",
     "@react-three/fiber": "^8.17.14",
-    "@tscircuit/core": "^0.0.417",
+    "@tscircuit/core": "^0.0.424",
     "@tscircuit/props": "^0.0.187",
     "@tscircuit/soup-util": "^0.0.41",
     "jscad-electronics": "^0.0.27",
@@ -18980,12 +18980,12 @@ var CadViewerJscad = forwardRef2(
 
 // src/CadViewerManifold.tsx
 import { useEffect as useEffect6, useState as useState8, useMemo as useMemo7 } from "react";
-import { su as su12 } from "@tscircuit/soup-util";
+import { su as su13 } from "@tscircuit/soup-util";
 import ManifoldModule from "manifold-3d";
 
 // src/hooks/useManifoldBoardBuilder.ts
 import { useState as useState7, useEffect as useEffect5, useMemo as useMemo6, useRef as useRef6 } from "react";
-import { su as su11 } from "@tscircuit/soup-util";
+import { su as su12 } from "@tscircuit/soup-util";
 import * as THREE10 from "three";
 
 // src/utils/manifold-mesh-to-three-geometry.ts
@@ -19537,6 +19537,105 @@ function createManifoldBoard(Manifold, CrossSection, boardData, pcbThickness, ma
   return boardOp;
 }
 
+// src/utils/manifold/process-cutouts.ts
+import { su as su11 } from "@tscircuit/soup-util";
+var arePointsClockwise3 = (points) => {
+  let area = 0;
+  for (let i = 0; i < points.length; i++) {
+    const j = (i + 1) % points.length;
+    if (points[i] && points[j]) {
+      area += points[i][0] * points[j][1];
+      area -= points[j][0] * points[i][1];
+    }
+  }
+  const signedArea = area / 2;
+  return signedArea <= 0;
+};
+function processCutoutsForManifold(Manifold, CrossSection, circuitJson, pcbThickness, manifoldInstancesForCleanup) {
+  const cutoutOps = [];
+  const pcbCutouts = su11(circuitJson).pcb_cutout.list();
+  for (const cutout of pcbCutouts) {
+    let cutoutOp;
+    const cutoutHeight = pcbThickness * 1.5;
+    switch (cutout.shape) {
+      case "rect":
+        cutoutOp = Manifold.cube(
+          [cutout.width, cutout.height, cutoutHeight],
+          true
+          // centered
+        );
+        manifoldInstancesForCleanup.push(cutoutOp);
+        if (cutout.rotation) {
+          const rotationRadians = cutout.rotation * Math.PI / 180;
+          const rotatedOp = cutoutOp.rotate([0, 0, cutout.rotation]);
+          manifoldInstancesForCleanup.push(rotatedOp);
+          cutoutOp = rotatedOp;
+        }
+        cutoutOp = cutoutOp.translate([
+          cutout.center.x,
+          cutout.center.y,
+          0
+          // Centered vertically by Manifold.cube, so Z is 0 for board plane
+        ]);
+        manifoldInstancesForCleanup.push(cutoutOp);
+        break;
+      case "circle":
+        cutoutOp = Manifold.cylinder(
+          cutoutHeight,
+          cutout.radius,
+          -1,
+          // default for radiusHigh
+          SMOOTH_CIRCLE_SEGMENTS,
+          true
+          // centered
+        );
+        manifoldInstancesForCleanup.push(cutoutOp);
+        cutoutOp = cutoutOp.translate([cutout.center.x, cutout.center.y, 0]);
+        manifoldInstancesForCleanup.push(cutoutOp);
+        break;
+      case "polygon":
+        if (cutout.points.length < 3) {
+          console.warn(
+            `PCB Cutout [${cutout.pcb_cutout_id}] polygon has fewer than 3 points, skipping.`
+          );
+          continue;
+        }
+        let pointsVec2 = cutout.points.map((p) => [
+          p.x,
+          p.y
+        ]);
+        if (arePointsClockwise3(pointsVec2)) {
+          pointsVec2 = pointsVec2.reverse();
+        }
+        const crossSection = CrossSection.ofPolygons([pointsVec2]);
+        manifoldInstancesForCleanup.push(crossSection);
+        cutoutOp = Manifold.extrude(
+          crossSection,
+          cutoutHeight,
+          0,
+          // nDivisions
+          0,
+          // twistDegrees
+          [1, 1],
+          // scaleTop
+          true
+          // center extrusion
+        );
+        manifoldInstancesForCleanup.push(cutoutOp);
+        break;
+      default:
+        console.warn(
+          `Unsupported cutout shape: ${cutout.shape} for cutout ${cutout.pcb_cutout_id}`
+        );
+        continue;
+    }
+    if (cutoutOp) {
+      cutoutOps.push(cutoutOp);
+    }
+  }
+  return { cutoutOps };
+}
+
 // src/hooks/useManifoldBoardBuilder.ts
 var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
   const [geoms, setGeoms] = useState7(null);
@@ -19547,7 +19646,7 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
   const manifoldInstancesForCleanup = useRef6([]);
   const boardData = useMemo6(() => {
     if (!circuitJson) return null;
-    const boards = su11(circuitJson).pcb_board.list();
+    const boards = su12(circuitJson).pcb_board.list();
     if (boards.length === 0) {
       return null;
     }
@@ -19558,7 +19657,7 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
       setGeoms(null);
       setTextures(null);
       setPcbThickness(null);
-      if (circuitJson && su11(circuitJson).pcb_board.list().length === 0) {
+      if (circuitJson && su12(circuitJson).pcb_board.list().length === 0) {
         setError("No pcb_board found in circuitJson.");
       }
       setIsLoading(false);
@@ -19610,9 +19709,23 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
       if (allBoardDrills.length > 0) {
         const unionedDrills = Manifold.union(allBoardDrills);
         manifoldInstancesForCleanup.current.push(unionedDrills);
-        const nextBoard = currentBoardOp.subtract(unionedDrills);
-        manifoldInstancesForCleanup.current.push(nextBoard);
-        currentBoardOp = nextBoard;
+        const nextBoardAfterDrills = currentBoardOp.subtract(unionedDrills);
+        manifoldInstancesForCleanup.current.push(nextBoardAfterDrills);
+        currentBoardOp = nextBoardAfterDrills;
+      }
+      const { cutoutOps } = processCutoutsForManifold(
+        Manifold,
+        CrossSection,
+        circuitJson,
+        currentPcbThickness,
+        manifoldInstancesForCleanup.current
+      );
+      if (cutoutOps.length > 0) {
+        const unionedCutouts = Manifold.union(cutoutOps);
+        manifoldInstancesForCleanup.current.push(unionedCutouts);
+        const nextBoardAfterCutouts = currentBoardOp.subtract(unionedCutouts);
+        manifoldInstancesForCleanup.current.push(nextBoardAfterCutouts);
+        currentBoardOp = nextBoardAfterCutouts;
       }
       boardManifold = currentBoardOp;
       if (boardManifold) {
@@ -19825,7 +19938,7 @@ var CadViewerManifold = ({
     [textures, boardData, pcbThickness]
   );
   const cadComponents = useMemo7(
-    () => circuitJson ? su12(circuitJson).cad_component.list() : [],
+    () => circuitJson ? su13(circuitJson).cad_component.list() : [],
     [circuitJson]
   );
   const initialCameraPosition = useMemo7(() => {
@@ -20128,7 +20241,7 @@ var CadViewer = (props) => {
 
 // src/convert-circuit-json-to-3d-svg.ts
 var import_debug = __toESM(require_browser(), 1);
-import { su as su13 } from "@tscircuit/soup-util";
+import { su as su14 } from "@tscircuit/soup-util";
 import * as THREE16 from "three";
 import { SVGRenderer } from "three/examples/jsm/renderers/SVGRenderer.js";
 
@@ -20343,7 +20456,7 @@ async function convertCircuitJsonTo3dSvg(circuitJson, options = {}) {
   const pointLight = new THREE16.PointLight(16777215, Math.PI / 4);
   pointLight.position.set(-10, -10, 10);
   scene.add(pointLight);
-  const components = su13(circuitJson).cad_component.list();
+  const components = su14(circuitJson).cad_component.list();
   for (const component of components) {
     await renderComponent(component, scene);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.234",
+  "version": "0.0.236",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",
@@ -31,7 +31,7 @@
     "@jscad/stl-serializer": "^2.1.20",
     "@react-three/drei": "^9.121.4",
     "@react-three/fiber": "^8.17.14",
-    "@tscircuit/core": "^0.0.417",
+    "@tscircuit/core": "^0.0.424",
     "@tscircuit/props": "^0.0.187",
     "@tscircuit/soup-util": "^0.0.41",
     "jscad-electronics": "^0.0.27",