@tscircuit/3d-viewer 0.0.360 → 0.0.362

package/dist/index.js

@@ -25583,7 +25583,7 @@ import * as THREE10 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.359",
+  version: "0.0.361",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -25630,7 +25630,7 @@ var package_default = {
     "@storybook/blocks": "9.0.0-alpha.17",
     "@storybook/react-vite": "^9.1.2",
     "@tscircuit/circuit-json-util": "^0.0.67",
-    "@tscircuit/core": "^0.0.678",
+    "@tscircuit/core": "^0.0.681",
     "@tscircuit/props": "^0.0.292",
     "@types/jsdom": "^21.1.7",
     "@types/react": "19",
@@ -26973,10 +26973,10 @@ function createSilkscreenPathGeom(sp, ctx) {
 // src/BoardGeomBuilder.ts
 var buildStateOrder = [
   "initializing",
+  "processing_pads",
   "processing_plated_holes",
   "processing_holes",
   "processing_cutouts",
-  "processing_pads",
   "processing_traces",
   "processing_vias",
   "processing_silkscreen_text",
@@ -27054,7 +27054,7 @@ var BoardGeomBuilder = class {
         center: [this.board.center.x, this.board.center.y, 0]
       });
     }
-    this.state = "processing_plated_holes";
+    this.state = "processing_pads";
     this.currentIndex = 0;
   }
   goToNextState() {
@@ -27196,6 +27196,9 @@ var BoardGeomBuilder = class {
       if (!opts.dontCutBoard) {
         this.boardGeom = (0, import_booleans2.subtract)(this.boardGeom, cyGeom);
       }
+      this.padGeoms = this.padGeoms.map(
+        (pg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans2.subtract)(pg, cyGeom))
+      );
       const platedHoleGeom = platedHole(ph, this.ctx);
       this.platedHoleGeoms.push(platedHoleGeom);
     } else if (ph.shape === "pill" || ph.shape === "pill_hole_with_rect_pad") {
@@ -27223,6 +27226,9 @@ var BoardGeomBuilder = class {
       if (!opts.dontCutBoard) {
         this.boardGeom = (0, import_booleans2.subtract)(this.boardGeom, pillHole);
       }
+      this.padGeoms = this.padGeoms.map(
+        (pg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans2.subtract)(pg, pillHole))
+      );
       const platedHoleGeom = platedHole(ph, this.ctx);
       this.platedHoleGeoms.push(platedHoleGeom);
     }
@@ -27238,6 +27244,9 @@ var BoardGeomBuilder = class {
         // Ensure it cuts through
       });
       this.boardGeom = (0, import_booleans2.subtract)(this.boardGeom, cyGeom);
+      this.padGeoms = this.padGeoms.map(
+        (pg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans2.subtract)(pg, cyGeom))
+      );
     }
   }
   processPad(pad2) {
@@ -28411,7 +28420,7 @@ function createPadManifoldOp({
 
 // src/utils/manifold/process-smt-pads.ts
 var COPPER_COLOR3 = new THREE18.Color(...colors.copper);
-function processSmtPadsForManifold(Manifold, circuitJson, pcbThickness, manifoldInstancesForCleanup) {
+function processSmtPadsForManifold(Manifold, circuitJson, pcbThickness, manifoldInstancesForCleanup, holeUnion) {
   const smtPadGeoms = [];
   const smtPads = su10(circuitJson).pcb_smtpad.list();
   smtPads.forEach((pad2, index) => {
@@ -28426,7 +28435,12 @@ function processSmtPadsForManifold(Manifold, circuitJson, pcbThickness, manifold
       manifoldInstancesForCleanup.push(padManifoldOp);
       const translatedPad = padManifoldOp.translate([pad2.x, pad2.y, zPos]);
       manifoldInstancesForCleanup.push(translatedPad);
-      const threeGeom = manifoldMeshToThreeGeometry(translatedPad.getMesh());
+      let finalPadOp = translatedPad;
+      if (holeUnion) {
+        finalPadOp = translatedPad.subtract(holeUnion);
+        manifoldInstancesForCleanup.push(finalPadOp);
+      }
+      const threeGeom = manifoldMeshToThreeGeometry(finalPadOp.getMesh());
       smtPadGeoms.push({
         key: `pad-${pad2.pcb_smtpad_id || index}`,
         geometry: threeGeom,
@@ -28642,6 +28656,7 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
         manifoldInstancesForCleanup.current
       );
       const allBoardDrills = [];
+      let holeUnion = null;
       const { nonPlatedHoleBoardDrills } = processNonPlatedHolesForManifold(
         Manifold,
         circuitJson,
@@ -28666,9 +28681,9 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
       allBoardDrills.push(...viaBoardDrills);
       currentGeoms.vias = viaCopperGeoms;
       if (allBoardDrills.length > 0) {
-        const unionedDrills = Manifold.union(allBoardDrills);
-        manifoldInstancesForCleanup.current.push(unionedDrills);
-        const nextBoardAfterDrills = currentBoardOp.subtract(unionedDrills);
+        holeUnion = Manifold.union(allBoardDrills);
+        manifoldInstancesForCleanup.current.push(holeUnion);
+        const nextBoardAfterDrills = currentBoardOp.subtract(holeUnion);
         manifoldInstancesForCleanup.current.push(nextBoardAfterDrills);
         currentBoardOp = nextBoardAfterDrills;
       }
@@ -28704,7 +28719,8 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
         Manifold,
         circuitJson,
         currentPcbThickness,
-        manifoldInstancesForCleanup.current
+        manifoldInstancesForCleanup.current,
+        holeUnion
       );
       currentGeoms.smtPads = smtPadGeoms;
       setGeoms(currentGeoms);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.360",
+  "version": "0.0.362",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",
@@ -47,7 +47,7 @@
     "@storybook/blocks": "9.0.0-alpha.17",
     "@storybook/react-vite": "^9.1.2",
     "@tscircuit/circuit-json-util": "^0.0.67",
-    "@tscircuit/core": "^0.0.678",
+    "@tscircuit/core": "^0.0.681",
     "@tscircuit/props": "^0.0.292",
     "@types/jsdom": "^21.1.7",
     "@types/react": "19",