@tscircuit/3d-viewer 0.0.415 → 0.0.417

package/dist/index.js

@@ -26651,7 +26651,7 @@ import * as THREE13 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.414",
+  version: "0.0.416",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -27548,11 +27548,11 @@ function clampRectBorderRadius(width10, height10, rawRadius) {
 }
 function extractRectBorderRadius(source) {
   if (!source || typeof source !== "object") return void 0;
-  return source.rect_pad_border_radius ?? source.rectPadBorderRadius ?? source.rect_border_radius ?? source.rectBorderRadius ?? void 0;
+  return source.corner_radius ?? source.cornerRadius ?? source.rect_pad_border_radius ?? source.rectPadBorderRadius ?? source.rect_border_radius ?? source.rectBorderRadius ?? void 0;
 }
 
 // src/geoms/plated-hole.ts
-var platedHoleLipHeight = 0.05;
+var platedHoleLipHeight = 0.02;
 var RECT_PAD_SEGMENTS = 64;
 var maybeClip = (geom, clipGeom) => clipGeom ? (0, import_booleans.intersect)(clipGeom, geom) : geom;
 var createRectPadGeom = ({
@@ -27581,7 +27581,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
   const throughDrillHeight = ctx.pcbThickness + 2 * platedHoleLipHeight + 4 * M;
   if (plated_hole.shape === "circle") {
     const outerDiameter = plated_hole.outer_diameter ?? Math.max(plated_hole.hole_diameter, 0);
-    const copperHeight = ctx.pcbThickness + 2 * (platedHoleLipHeight + M);
+    const copperHeight = ctx.pcbThickness + 2 * platedHoleLipHeight;
     const copperBody = (0, import_primitives3.cylinder)({
       center: [plated_hole.x, plated_hole.y, 0],
       radius: outerDiameter / 2,
@@ -27607,7 +27607,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
         createRectPadGeom({
           width: padWidth,
           height: padHeight,
-          thickness: platedHoleLipHeight + 0.1,
+          thickness: platedHoleLipHeight,
           // Slightly thicker to ensure connection
           center: [
             plated_hole.x,
@@ -27621,7 +27621,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
         createRectPadGeom({
           width: padWidth,
           height: padHeight,
-          thickness: platedHoleLipHeight + 0.1,
+          thickness: platedHoleLipHeight,
           // Slightly thicker to ensure connection
           center: [
             plated_hole.x,
@@ -27773,11 +27773,11 @@ var platedHole = (plated_hole, ctx, options = {}) => {
         size: shouldRotate ? [
           holeHeight + 2 * barrelMargin,
           rectLength + 2 * barrelMargin,
-          ctx.pcbThickness + 0.2
+          ctx.pcbThickness + 0.02
         ] : [
           rectLength + 2 * barrelMargin,
           holeHeight + 2 * barrelMargin,
-          ctx.pcbThickness + 0.2
+          ctx.pcbThickness
         ]
       }),
       (0, import_primitives3.cylinder)({
@@ -27791,8 +27791,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
           0
         ],
         radius: holeRadius + barrelMargin,
-        height: ctx.pcbThickness + 0.2
-        // extend slightly above/below PCB
+        height: ctx.pcbThickness + 0.02
       }),
       (0, import_primitives3.cylinder)({
         center: shouldRotate ? [
@@ -27805,7 +27804,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
           0
         ],
         radius: holeRadius + barrelMargin,
-        height: ctx.pcbThickness + 0.2
+        height: ctx.pcbThickness + 0.02
       })
     );
     const holeCut = (0, import_booleans.union)(
@@ -27840,30 +27839,41 @@ var platedHole = (plated_hole, ctx, options = {}) => {
         height: throughDrillHeight * 1.1
       })
     );
-    const mainFill = createRectPadGeom({
+    const copperTopPad = createRectPadGeom({
       width: padWidth,
       height: padHeight,
-      thickness: ctx.pcbThickness - 2 * platedHoleLipHeight - M * 2 + 0.1,
-      center: [plated_hole.x, plated_hole.y, 0],
+      thickness: platedHoleLipHeight,
+      center: [
+        plated_hole.x,
+        plated_hole.y,
+        ctx.pcbThickness / 2 + platedHoleLipHeight / 2 + M - 0.05
+      ],
       borderRadius: rectBorderRadius
     });
-    const createPadWithHole = (zOffset) => {
-      const pad2 = createRectPadGeom({
-        width: padWidth,
-        height: padHeight,
-        thickness: platedHoleLipHeight + 0.1,
-        center: [plated_hole.x, plated_hole.y, zOffset],
-        borderRadius: rectBorderRadius
+    const copperBottomPad = createRectPadGeom({
+      width: padWidth,
+      height: padHeight,
+      thickness: platedHoleLipHeight,
+      center: [
+        plated_hole.x,
+        plated_hole.y,
+        -ctx.pcbThickness / 2 - platedHoleLipHeight / 2 - M + 0.05
+      ],
+      borderRadius: rectBorderRadius
+    });
+    const copperFill = (() => {
+      const height10 = ctx.pcbThickness - platedHoleLipHeight * 2 - M * 2 + 0.1;
+      const rect2d = (0, import_primitives3.roundedRectangle)({
+        size: [padWidth, padHeight],
+        roundRadius: rectBorderRadius || 0,
+        segments: RECT_PAD_SEGMENTS
       });
-      return (0, import_booleans.subtract)(pad2, holeCut);
-    };
-    const topPad = createPadWithHole(
-      ctx.pcbThickness / 2 - platedHoleLipHeight / 2 + 0.05
-    );
-    const bottomPad = createPadWithHole(
-      -ctx.pcbThickness / 2 + platedHoleLipHeight / 2 - 0.05
-    );
-    const filledArea = (0, import_booleans.subtract)(mainFill, holeCut);
+      const extruded = (0, import_extrusions2.extrudeLinear)({ height: height10 }, rect2d);
+      return (0, import_transforms2.translate)([plated_hole.x, plated_hole.y, -height10 / 2], extruded);
+    })();
+    const copperTopPadCut = (0, import_booleans.subtract)(copperTopPad, holeCut);
+    const copperBottomPadCut = (0, import_booleans.subtract)(copperBottomPad, holeCut);
+    const copperFillCut = (0, import_booleans.subtract)(copperFill, holeCut);
     const barrelHoleCut = (0, import_booleans.union)(
       (0, import_primitives3.cuboid)({
         center: [plated_hole.x + holeOffsetX, plated_hole.y + holeOffsetY, 0],
@@ -27897,9 +27907,11 @@ var platedHole = (plated_hole, ctx, options = {}) => {
       })
     );
     const barrelWithHole = (0, import_booleans.subtract)(barrel, barrelHoleCut);
-    const finalCopper = (0, import_booleans.union)(filledArea, barrelWithHole, topPad, bottomPad);
-    let result = maybeClip(finalCopper, clipGeom);
-    return (0, import_colors2.colorize)(colors.copper, result);
+    const finalCopper = maybeClip(
+      (0, import_booleans.union)(copperTopPadCut, copperBottomPadCut, copperFillCut, barrelWithHole),
+      clipGeom
+    );
+    return (0, import_colors2.colorize)(colors.copper, finalCopper);
   } else {
     throw new Error(`Unsupported plated hole shape: ${plated_hole.shape}`);
   }
@@ -28737,111 +28749,80 @@ var BoardGeomBuilder = class {
   }
   processHole(hole) {
     if (!this.boardGeom) return;
+    const holeDepth = this.ctx.pcbThickness * 1.5;
+    const copperInset = 0.02;
     if (hole.hole_shape === "round" || hole.hole_shape === "circle") {
       const cyGeom = (0, import_primitives6.cylinder)({
         center: [hole.x, hole.y, 0],
         radius: hole.hole_diameter / 2 + M,
-        // Add margin for subtraction
-        height: this.ctx.pcbThickness * 1.5
-        // Ensure it cuts through
+        height: holeDepth
       });
       this.boardGeom = (0, import_booleans3.subtract)(this.boardGeom, cyGeom);
       this.padGeoms = this.padGeoms.map(
         (pg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans3.subtract)(pg, cyGeom))
       );
-    } else if (hole.hole_shape === "pill") {
+      const copperCut = (0, import_primitives6.cylinder)({
+        center: [hole.x, hole.y, 0],
+        radius: hole.hole_diameter / 2 + M / 2,
+        height: holeDepth
+      });
+      this.platedHoleGeoms = this.platedHoleGeoms.map(
+        (phg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans3.subtract)(phg, copperCut))
+      );
+    } else if (hole.hole_shape === "pill" || hole.hole_shape === "rotated_pill") {
       const holeWidth = hole.hole_width;
       const holeHeight = hole.hole_height;
       const holeRadius = Math.min(holeWidth, holeHeight) / 2;
       const rectLength = Math.abs(holeWidth - holeHeight);
+      const isRotated = hole.hole_shape === "rotated_pill";
       let pillHole;
       if (holeWidth > holeHeight) {
         pillHole = (0, import_booleans3.union)(
           (0, import_primitives6.cuboid)({
             center: [hole.x, hole.y, 0],
-            size: [rectLength, holeHeight, this.ctx.pcbThickness * 1.5]
+            size: [rectLength, holeHeight, holeDepth]
           }),
           (0, import_primitives6.cylinder)({
             center: [hole.x - rectLength / 2, hole.y, 0],
             radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
+            height: holeDepth
           }),
           (0, import_primitives6.cylinder)({
             center: [hole.x + rectLength / 2, hole.y, 0],
             radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
+            height: holeDepth
           })
         );
       } else {
         pillHole = (0, import_booleans3.union)(
           (0, import_primitives6.cuboid)({
             center: [hole.x, hole.y, 0],
-            size: [holeWidth, rectLength, this.ctx.pcbThickness * 1.5]
+            size: [holeWidth, rectLength, holeDepth]
           }),
           (0, import_primitives6.cylinder)({
             center: [hole.x, hole.y - rectLength / 2, 0],
             radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
+            height: holeDepth
           }),
           (0, import_primitives6.cylinder)({
             center: [hole.x, hole.y + rectLength / 2, 0],
             radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
+            height: holeDepth
           })
         );
       }
-      this.boardGeom = (0, import_booleans3.subtract)(this.boardGeom, pillHole);
-      this.padGeoms = this.padGeoms.map(
-        (pg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans3.subtract)(pg, pillHole))
-      );
-    } else if (hole.hole_shape === "rotated_pill") {
-      const holeWidth = hole.hole_width;
-      const holeHeight = hole.hole_height;
-      const holeRadius = Math.min(holeWidth, holeHeight) / 2;
-      const rectLength = Math.abs(holeWidth - holeHeight);
-      let pillHole;
-      if (holeWidth > holeHeight) {
-        pillHole = (0, import_booleans3.union)(
-          (0, import_primitives6.cuboid)({
-            center: [0, 0, 0],
-            size: [rectLength, holeHeight, this.ctx.pcbThickness * 1.5]
-          }),
-          (0, import_primitives6.cylinder)({
-            center: [-rectLength / 2, 0, 0],
-            radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
-          }),
-          (0, import_primitives6.cylinder)({
-            center: [rectLength / 2, 0, 0],
-            radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
-          })
-        );
-      } else {
-        pillHole = (0, import_booleans3.union)(
-          (0, import_primitives6.cuboid)({
-            center: [0, 0, 0],
-            size: [holeWidth, rectLength, this.ctx.pcbThickness * 1.5]
-          }),
-          (0, import_primitives6.cylinder)({
-            center: [0, -rectLength / 2, 0],
-            radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
-          }),
-          (0, import_primitives6.cylinder)({
-            center: [0, rectLength / 2, 0],
-            radius: holeRadius,
-            height: this.ctx.pcbThickness * 1.5
-          })
-        );
+      if (isRotated) {
+        const rotationRadians = hole.ccw_rotation * Math.PI / 180;
+        pillHole = (0, import_transforms4.rotateZ)(rotationRadians, pillHole);
       }
-      const rotationRadians = hole.ccw_rotation * Math.PI / 180;
-      pillHole = (0, import_transforms4.rotateZ)(rotationRadians, pillHole);
-      pillHole = (0, import_transforms4.translate)([hole.x, hole.y, 0], pillHole);
       this.boardGeom = (0, import_booleans3.subtract)(this.boardGeom, pillHole);
       this.padGeoms = this.padGeoms.map(
         (pg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans3.subtract)(pg, pillHole))
       );
+      const copperPill = (0, import_expansions3.expand)({ delta: -copperInset }, pillHole);
+      this.platedHoleGeoms = this.platedHoleGeoms.map(
+        (phg) => (0, import_colors4.colorize)(colors.copper, (0, import_booleans3.subtract)(phg, copperPill))
+      );
     }
   }
   processPad(pad2) {
@@ -29876,6 +29857,7 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
   const platedHoleBoardDrills = [];
   const pcbPlatedHoles = su8(circuitJson).pcb_plated_hole.list();
   const platedHoleCopperGeoms = [];
+  const platedHoleCopperOpsForSubtract = [];
   const createPillOp = (width10, height10, depth) => {
     const pillOp = createRoundedRectPrism({
       Manifold,
@@ -29932,6 +29914,7 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         manifoldInstancesForCleanup.push(clipped);
         finalCopperOp = clipped;
       }
+      platedHoleCopperOpsForSubtract.push(finalCopperOp);
       const threeGeom = manifoldMeshToThreeGeometry(finalCopperOp.getMesh());
       platedHoleCopperGeoms.push({
         key: `ph-${ph.pcb_plated_hole_id || index}`,
@@ -29983,9 +29966,17 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
       }
       const translatedPlatedPart = finalPlatedPartOp.translate([ph.x, ph.y, 0]);
       manifoldInstancesForCleanup.push(translatedPlatedPart);
-      const threeGeom = manifoldMeshToThreeGeometry(
-        translatedPlatedPart.getMesh()
-      );
+      let finalCopperOp = translatedPlatedPart;
+      if (boardClipVolume) {
+        const clipped = Manifold.intersection([
+          translatedPlatedPart,
+          boardClipVolume
+        ]);
+        manifoldInstancesForCleanup.push(clipped);
+        finalCopperOp = clipped;
+      }
+      platedHoleCopperOpsForSubtract.push(finalCopperOp);
+      const threeGeom = manifoldMeshToThreeGeometry(finalCopperOp.getMesh());
       platedHoleCopperGeoms.push({
         key: `ph-${ph.pcb_plated_hole_id || index}`,
         geometry: threeGeom,
@@ -30026,14 +30017,14 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         Manifold,
         width: padWidth,
         height: padHeight,
-        thickness: padThickness + 0.1,
+        thickness: padThickness,
         borderRadius: rectBorderRadius
       }).translate([0, 0, pcbThickness / 2 - padThickness / 2 + 0.05]);
       const bottomPad = createRoundedRectPrism({
         Manifold,
         width: padWidth,
         height: padHeight,
-        thickness: padThickness + 0.1,
+        thickness: padThickness,
         borderRadius: rectBorderRadius
       }).translate([0, 0, -pcbThickness / 2 + padThickness / 2 - 0.05]);
       manifoldInstancesForCleanup.push(topPad, bottomPad);
@@ -30071,6 +30062,7 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         manifoldInstancesForCleanup.push(clipped);
         finalCopperOp = clipped;
       }
+      platedHoleCopperOpsForSubtract.push(finalCopperOp);
       const threeGeom = manifoldMeshToThreeGeometry(finalCopperOp.getMesh());
       platedHoleCopperGeoms.push({
         key: `ph-${ph.pcb_plated_hole_id || index}`,
@@ -30110,14 +30102,14 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         Manifold,
         width: padWidth,
         height: padHeight,
-        thickness: padThickness + 0.1,
+        thickness: padThickness,
         borderRadius: rectBorderRadius
       }).translate([0, 0, pcbThickness / 2 - padThickness / 2 + 0.05]);
       const bottomPad = createRoundedRectPrism({
         Manifold,
         width: padWidth,
         height: padHeight,
-        thickness: padThickness + 0.1,
+        thickness: padThickness,
         borderRadius: rectBorderRadius
       }).translate([0, 0, -pcbThickness / 2 + padThickness / 2 - 0.05]);
       manifoldInstancesForCleanup.push(topPad, bottomPad);
@@ -30159,6 +30151,7 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         manifoldInstancesForCleanup.push(clipped);
         finalCopperOp = clipped;
       }
+      platedHoleCopperOpsForSubtract.push(finalCopperOp);
       const threeGeom = manifoldMeshToThreeGeometry(finalCopperOp.getMesh());
       platedHoleCopperGeoms.push({
         key: `ph-${ph.pcb_plated_hole_id || index}`,
@@ -30167,7 +30160,12 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
       });
     }
   });
-  return { platedHoleBoardDrills, platedHoleCopperGeoms };
+  let platedHoleSubtractOp = void 0;
+  if (platedHoleCopperOpsForSubtract.length > 0) {
+    platedHoleSubtractOp = Manifold.union(platedHoleCopperOpsForSubtract);
+    manifoldInstancesForCleanup.push(platedHoleSubtractOp);
+  }
+  return { platedHoleBoardDrills, platedHoleCopperGeoms, platedHoleSubtractOp };
 }
 
 // src/utils/manifold/process-vias.ts
@@ -30720,7 +30718,12 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
         manifoldInstancesForCleanup.current
       );
       allBoardDrills.push(...nonPlatedHoleBoardDrills);
-      const { platedHoleBoardDrills, platedHoleCopperGeoms } = processPlatedHolesForManifold(
+      const {
+        platedHoleBoardDrills,
+        platedHoleCopperGeoms,
+        // NEW: bring in platedHoleSubtractOp
+        platedHoleSubtractOp
+      } = processPlatedHolesForManifold(
         Manifold,
         circuitJson,
         currentPcbThickness,
@@ -30741,9 +30744,28 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
       if (allBoardDrills.length > 0) {
         holeUnion = Manifold.union(allBoardDrills);
         manifoldInstancesForCleanup.current.push(holeUnion);
-        const nextBoardAfterDrills = currentBoardOp.subtract(holeUnion);
+        const totalSubtractionOps = platedHoleSubtractOp ? Manifold.union([holeUnion, platedHoleSubtractOp]) : holeUnion;
+        manifoldInstancesForCleanup.current.push(totalSubtractionOps);
+        const nextBoardAfterDrills = currentBoardOp.subtract(totalSubtractionOps);
         manifoldInstancesForCleanup.current.push(nextBoardAfterDrills);
         currentBoardOp = nextBoardAfterDrills;
+        if (platedHoleSubtractOp) {
+          const cutPlatedCopper = platedHoleSubtractOp.subtract(holeUnion);
+          manifoldInstancesForCleanup.current.push(cutPlatedCopper);
+          const cutPlatedMesh = cutPlatedCopper.getMesh();
+          const cutPlatedGeom = manifoldMeshToThreeGeometry(cutPlatedMesh);
+          currentGeoms.platedHoles = [
+            {
+              key: "plated-holes-union",
+              geometry: cutPlatedGeom,
+              color: new THREE23.Color(
+                colors.copper[0],
+                colors.copper[1],
+                colors.copper[2]
+              )
+            }
+          ];
+        }
       }
       const { cutoutOps } = processCutoutsForManifold(
         Manifold,

package/package.json

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