@tscircuit/3d-viewer 0.0.420 → 0.0.421

package/dist/index.js

@@ -26647,7 +26647,7 @@ import * as THREE14 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.419",
+  version: "0.0.420",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -27719,6 +27719,10 @@ import { su as su2 } from "@tscircuit/circuit-json-util";
 
 // src/geoms/constants.ts
 var M = 0.01;
+var BOARD_SURFACE_OFFSET = {
+  traces: 1e-3,
+  copper: 2e-3
+};
 var colors = {
   copper: [0.9, 0.6, 0.2],
   fr4Green: [0.04, 0.16, 0.08],
@@ -27864,9 +27868,12 @@ var platedHole = (plated_hole, ctx, options = {}) => {
   const { clipGeom } = options;
   if (!plated_hole.shape) plated_hole.shape = "circle";
   const throughDrillHeight = ctx.pcbThickness + 2 * platedHoleLipHeight + 4 * M;
+  const topSurfaceZ = ctx.pcbThickness / 2 + BOARD_SURFACE_OFFSET.copper;
+  const bottomSurfaceZ = -ctx.pcbThickness / 2 - BOARD_SURFACE_OFFSET.copper;
+  const copperSpan = topSurfaceZ - bottomSurfaceZ;
   if (plated_hole.shape === "circle") {
     const outerDiameter = plated_hole.outer_diameter ?? Math.max(plated_hole.hole_diameter, 0);
-    const copperHeight = ctx.pcbThickness + 2 * platedHoleLipHeight;
+    const copperHeight = copperSpan + 0.01;
     const copperBody = (0, import_primitives3.cylinder)({
       center: [plated_hole.x, plated_hole.y, 0],
       radius: outerDiameter / 2,
@@ -27894,12 +27901,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
           height: padHeight,
           thickness: platedHoleLipHeight,
           // Slightly thicker to ensure connection
-          center: [
-            plated_hole.x,
-            plated_hole.y,
-            ctx.pcbThickness / 2 + platedHoleLipHeight / 2 + M - 0.05
-            // Adjusted for thickness
-          ],
+          center: [plated_hole.x, plated_hole.y, topSurfaceZ],
           borderRadius: rectBorderRadius
         }),
         // Bottom rectangular pad (thicker to ensure connection)
@@ -27908,17 +27910,15 @@ var platedHole = (plated_hole, ctx, options = {}) => {
           height: padHeight,
           thickness: platedHoleLipHeight,
           // Slightly thicker to ensure connection
-          center: [
-            plated_hole.x,
-            plated_hole.y,
-            -ctx.pcbThickness / 2 - platedHoleLipHeight / 2 - M + 0.05
-            // Adjusted for thickness
-          ],
+          center: [plated_hole.x, plated_hole.y, bottomSurfaceZ],
           borderRadius: rectBorderRadius
         }),
         // Main copper fill between pads with rounded corners
         (() => {
-          const height10 = ctx.pcbThickness - platedHoleLipHeight * 2 - M * 2 + 0.1;
+          const height10 = Math.max(copperSpan - platedHoleLipHeight * 2, M);
+          const topPadBottom = topSurfaceZ;
+          const bottomPadTop = bottomSurfaceZ;
+          const centerZ = (topPadBottom + bottomPadTop) / 2;
           const rect2d = (0, import_primitives3.roundedRectangle)({
             size: [padWidth, padHeight],
             roundRadius: rectBorderRadius || 0,
@@ -27926,12 +27926,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
           });
           const extruded = (0, import_extrusions2.extrudeLinear)({ height: height10 }, rect2d);
           return (0, import_transforms2.translate)(
-            [
-              plated_hole.x,
-              plated_hole.y,
-              -height10 / 2
-              // Center vertically
-            ],
+            [plated_hole.x, plated_hole.y, centerZ - height10 / 2],
             extruded
           );
         })(),
@@ -27943,7 +27938,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
             0
           ],
           radius: plated_hole.hole_diameter / 2,
-          height: ctx.pcbThickness
+          height: copperSpan
         })
       ),
       clipGeom
@@ -27964,7 +27959,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
         0
       ],
       radius: plated_hole.hole_diameter / 2,
-      height: ctx.pcbThickness
+      height: copperSpan
     });
     let finalCopper = (0, import_booleans.union)(
       (0, import_booleans.subtract)(copperSolid, barrel),
@@ -27989,7 +27984,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
     const outerRadius = outerPillHeight / 2;
     const rectLength = Math.abs(holeWidth - holeHeight);
     const outerRectLength = Math.abs(outerPillWidth - outerPillHeight);
-    const copperHeight = ctx.pcbThickness + 2 * (platedHoleLipHeight + M);
+    const copperHeight = copperSpan + 0.01;
     const createPillSection = (width10, height10, thickness) => {
       const radius = height10 / 2;
       const length2 = Math.abs(width10 - height10);
@@ -28058,11 +28053,11 @@ var platedHole = (plated_hole, ctx, options = {}) => {
         size: shouldRotate ? [
           holeHeight + 2 * barrelMargin,
           rectLength + 2 * barrelMargin,
-          ctx.pcbThickness + 0.02
+          copperSpan
         ] : [
           rectLength + 2 * barrelMargin,
           holeHeight + 2 * barrelMargin,
-          ctx.pcbThickness
+          copperSpan
         ]
       }),
       (0, import_primitives3.cylinder)({
@@ -28076,7 +28071,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
           0
         ],
         radius: holeRadius + barrelMargin,
-        height: ctx.pcbThickness + 0.02
+        height: copperSpan
       }),
       (0, import_primitives3.cylinder)({
         center: shouldRotate ? [
@@ -28089,7 +28084,7 @@ var platedHole = (plated_hole, ctx, options = {}) => {
           0
         ],
         radius: holeRadius + barrelMargin,
-        height: ctx.pcbThickness + 0.02
+        height: copperSpan
       })
     );
     const holeCut = (0, import_booleans.union)(
@@ -28128,33 +28123,31 @@ var platedHole = (plated_hole, ctx, options = {}) => {
       width: padWidth,
       height: padHeight,
       thickness: platedHoleLipHeight,
-      center: [
-        plated_hole.x,
-        plated_hole.y,
-        ctx.pcbThickness / 2 + platedHoleLipHeight / 2 + M - 0.05
-      ],
+      center: [plated_hole.x, plated_hole.y, topSurfaceZ],
       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
-      ],
+      center: [plated_hole.x, plated_hole.y, bottomSurfaceZ],
       borderRadius: rectBorderRadius
     });
     const copperFill = (() => {
-      const height10 = ctx.pcbThickness - platedHoleLipHeight * 2 - M * 2 + 0.1;
+      const height10 = Math.max(copperSpan - platedHoleLipHeight * 2, M);
+      const topPadBottom = topSurfaceZ;
+      const bottomPadTop = bottomSurfaceZ;
+      const centerZ = (topPadBottom + bottomPadTop) / 2;
       const rect2d = (0, import_primitives3.roundedRectangle)({
         size: [padWidth, padHeight],
         roundRadius: rectBorderRadius || 0,
         segments: RECT_PAD_SEGMENTS
       });
       const extruded = (0, import_extrusions2.extrudeLinear)({ height: height10 }, rect2d);
-      return (0, import_transforms2.translate)([plated_hole.x, plated_hole.y, -height10 / 2], extruded);
+      return (0, import_transforms2.translate)(
+        [plated_hole.x, plated_hole.y, centerZ - height10 / 2],
+        extruded
+      );
     })();
     const copperTopPadCut = (0, import_booleans.subtract)(copperTopPad, holeCut);
     const copperBottomPadCut = (0, import_booleans.subtract)(copperBottomPad, holeCut);
@@ -28880,7 +28873,7 @@ var BoardGeomBuilder = class {
   }
   processCopperPour(pour) {
     const layerSign = pour.layer === "bottom" ? -1 : 1;
-    const zPos = layerSign * this.ctx.pcbThickness / 2 + layerSign * M;
+    const zPos = layerSign * this.ctx.pcbThickness / 2 + layerSign * BOARD_SURFACE_OFFSET.copper;
     let pourGeom = null;
     if (pour.shape === "rect") {
       let baseGeom = (0, import_primitives6.cuboid)({
@@ -29112,7 +29105,7 @@ var BoardGeomBuilder = class {
   }
   processPad(pad2) {
     const layerSign = pad2.layer === "bottom" ? -1 : 1;
-    const zPos = layerSign * this.ctx.pcbThickness / 2 + layerSign * M * 2;
+    const zPos = layerSign * this.ctx.pcbThickness / 2 + layerSign * BOARD_SURFACE_OFFSET.copper;
     const rectBorderRadius = extractRectBorderRadius(pad2);
     if (pad2.shape === "rect") {
       const basePadGeom = createCenteredRectPadGeom(
@@ -29166,14 +29159,14 @@ var BoardGeomBuilder = class {
     const finishSegment = () => {
       if (currentSegmentPoints.length >= 2 && currentLayer) {
         const layerSign = currentLayer === "bottom" ? -1 : 1;
-        const zPos = layerSign * this.ctx.pcbThickness / 2 + layerSign * M;
+        const zCenter = layerSign * this.ctx.pcbThickness / 2 + layerSign * BOARD_SURFACE_OFFSET.traces;
         const linePath = (0, import_primitives6.line)(currentSegmentPoints);
         const expandedPath = (0, import_expansions3.expand)(
           { delta: currentWidth / 2, corners: "round" },
           linePath
         );
         let traceGeom = (0, import_transforms4.translate)(
-          [0, 0, zPos],
+          [0, 0, zCenter - M / 2],
           (0, import_extrusions4.extrudeLinear)({ height: M }, expandedPath)
         );
         const startPointCoords = currentSegmentPoints[0];
@@ -29184,7 +29177,7 @@ var BoardGeomBuilder = class {
         );
         if (startHole) {
           const cuttingCylinder = (0, import_primitives6.cylinder)({
-            center: [startPointCoords[0], startPointCoords[1], zPos + M / 2],
+            center: [startPointCoords[0], startPointCoords[1], zCenter],
             radius: startHole.diameter / 2 + M,
             height: M
           });
@@ -29193,7 +29186,7 @@ var BoardGeomBuilder = class {
         const endHole = this.getHoleToCut(endPointCoords[0], endPointCoords[1]);
         if (endHole) {
           const cuttingCylinder = (0, import_primitives6.cylinder)({
-            center: [endPointCoords[0], endPointCoords[1], zPos + M / 2],
+            center: [endPointCoords[0], endPointCoords[1], zCenter],
             radius: endHole.diameter / 2 + M,
             height: M
           });
@@ -30294,7 +30287,7 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         Manifold,
         width: padWidth,
         height: padHeight,
-        thickness: pcbThickness - 2 * padThickness + 0.1,
+        thickness: pcbThickness - 2 * padThickness - 2 * BOARD_SURFACE_OFFSET.copper + 0.1,
         // Fill between pads
         borderRadius: rectBorderRadius
       });
@@ -30305,14 +30298,14 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         height: padHeight,
         thickness: padThickness,
         borderRadius: rectBorderRadius
-      }).translate([0, 0, pcbThickness / 2 - padThickness / 2 + 0.05]);
+      }).translate([0, 0, pcbThickness / 2 / 2 + BOARD_SURFACE_OFFSET.copper]);
       const bottomPad = createRoundedRectPrism({
         Manifold,
         width: padWidth,
         height: padHeight,
         thickness: padThickness,
         borderRadius: rectBorderRadius
-      }).translate([0, 0, -pcbThickness / 2 + padThickness / 2 - 0.05]);
+      }).translate([0, 0, -pcbThickness / 2 / 2 - BOARD_SURFACE_OFFSET.copper]);
       manifoldInstancesForCleanup.push(topPad, bottomPad);
       const barrelPill = createPillOp(
         holeW,
@@ -30379,7 +30372,7 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         Manifold,
         width: padWidth,
         height: padHeight,
-        thickness: pcbThickness - 2 * padThickness + 0.1,
+        thickness: pcbThickness - 2 * padThickness - 2 * BOARD_SURFACE_OFFSET.copper + 0.1,
         // Fill between pads
         borderRadius: rectBorderRadius
       });
@@ -30390,14 +30383,14 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         height: padHeight,
         thickness: padThickness,
         borderRadius: rectBorderRadius
-      }).translate([0, 0, pcbThickness / 2 - padThickness / 2 + 0.05]);
+      }).translate([0, 0, pcbThickness / 2 / 2 + BOARD_SURFACE_OFFSET.copper]);
       const bottomPad = createRoundedRectPrism({
         Manifold,
         width: padWidth,
         height: padHeight,
         thickness: padThickness,
         borderRadius: rectBorderRadius
-      }).translate([0, 0, -pcbThickness / 2 + padThickness / 2 - 0.05]);
+      }).translate([0, 0, -pcbThickness / 2 / 2 - BOARD_SURFACE_OFFSET.copper]);
       manifoldInstancesForCleanup.push(topPad, bottomPad);
       const barrelCylinder = Manifold.cylinder(
         pcbThickness * 1.02,
@@ -30549,7 +30542,7 @@ function processSmtPadsForManifold(Manifold, circuitJson, pcbThickness, manifold
   const smtPads = su10(circuitJson).pcb_smtpad.list();
   smtPads.forEach((pad2, index2) => {
     const padBaseThickness = DEFAULT_SMT_PAD_THICKNESS;
-    const zPos = pad2.layer === "bottom" ? -pcbThickness / 2 - padBaseThickness / 2 - MANIFOLD_Z_OFFSET : pcbThickness / 2 + padBaseThickness / 2 + MANIFOLD_Z_OFFSET;
+    const zPos = pad2.layer === "bottom" ? -pcbThickness / 2 - BOARD_SURFACE_OFFSET.copper : pcbThickness / 2 + BOARD_SURFACE_OFFSET.copper;
     let padManifoldOp = createPadManifoldOp({
       Manifold,
       pad: pad2,
@@ -31261,8 +31254,8 @@ function createTextureMeshes(textures, boardData, pcbThickness) {
   };
   const topTraceMesh = createTexturePlane(
     textures.topTrace,
-    pcbThickness / 2 + 0.015,
-    // Offset similar to CadViewerManifold
+    pcbThickness / 2 + BOARD_SURFACE_OFFSET.traces,
+    // Use consistent copper offset
     false,
     "trace"
   );
@@ -31277,7 +31270,8 @@ function createTextureMeshes(textures, boardData, pcbThickness) {
   if (topSilkscreenMesh) meshes.push(topSilkscreenMesh);
   const bottomTraceMesh = createTexturePlane(
     textures.bottomTrace,
-    -pcbThickness / 2 - 0.015,
+    -pcbThickness / 2 - BOARD_SURFACE_OFFSET.traces,
+    // Use consistent copper offset
     true,
     "trace"
   );

package/package.json

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