@tscircuit/3d-viewer 0.0.407 → 0.0.408

package/dist/index.js

@@ -26100,7 +26100,7 @@ import * as THREE13 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.406",
+  version: "0.0.407",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -28930,6 +28930,20 @@ function createPadManifoldOp({
       thickness: padBaseThickness,
       borderRadius: rectBorderRadius
     });
+  } else if (pad2.shape === "rotated_rect") {
+    const rectBorderRadius = extractRectBorderRadius(pad2);
+    let padOp = createRoundedRectPrism({
+      Manifold,
+      width: pad2.width,
+      height: pad2.height,
+      thickness: padBaseThickness,
+      borderRadius: rectBorderRadius
+    });
+    const rotation2 = pad2.ccw_rotation ?? 0;
+    if (rotation2) {
+      padOp = padOp.rotate([0, 0, rotation2]);
+    }
+    return padOp;
   } else if (pad2.shape === "circle" && pad2.radius) {
     return Manifold.cylinder(padBaseThickness, pad2.radius, -1, 32, true);
   }
@@ -28938,10 +28952,22 @@ function createPadManifoldOp({
 
 // src/utils/manifold/process-plated-holes.ts
 var COPPER_COLOR = new THREE19.Color(...colors.copper);
+var PLATED_HOLE_LIP_HEIGHT = 0.05;
 function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, manifoldInstancesForCleanup) {
   const platedHoleBoardDrills = [];
   const pcbPlatedHoles = su8(circuitJson).pcb_plated_hole.list();
   const platedHoleCopperGeoms = [];
+  const createPillOp = (width10, height10, depth) => {
+    const pillOp = createRoundedRectPrism({
+      Manifold,
+      width: width10,
+      height: height10,
+      thickness: depth,
+      borderRadius: Math.min(width10, height10) / 2
+    });
+    manifoldInstancesForCleanup.push(pillOp);
+    return pillOp;
+  };
   pcbPlatedHoles.forEach((ph, index) => {
     if (ph.shape === "circle") {
       const translatedDrill = createPlatedHoleDrill({
@@ -28987,60 +29013,15 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         color: COPPER_COLOR
       });
     } else if (ph.shape === "pill") {
-      const holeWidthRaw = ph.hole_width;
-      const holeHeightRaw = ph.hole_height;
-      const shouldRotate = holeHeightRaw > holeWidthRaw;
-      const holeW = shouldRotate ? holeHeightRaw : holeWidthRaw;
-      const holeH = shouldRotate ? holeWidthRaw : holeHeightRaw;
+      const holeW = ph.hole_width;
+      const holeH = ph.hole_height;
       const defaultPadExtension = 0.4;
-      const outerW = shouldRotate ? ph.outer_height ?? holeH + defaultPadExtension / 2 : ph.outer_width ?? holeW + defaultPadExtension / 2;
-      const outerH = shouldRotate ? ph.outer_width ?? holeW + defaultPadExtension / 2 : ph.outer_height ?? holeH + defaultPadExtension / 2;
-      const createPill = (width10, height10, depth) => {
-        const radius = height10 / 2;
-        const rectLength = width10 - height10;
-        let pillOp;
-        if (rectLength < 1e-9) {
-          pillOp = Manifold.cylinder(
-            depth,
-            radius,
-            radius,
-            SMOOTH_CIRCLE_SEGMENTS,
-            true
-          );
-        } else {
-          const rect = Manifold.cube(
-            [Math.max(0, rectLength), height10, depth],
-            true
-          );
-          const cap1 = Manifold.cylinder(
-            depth,
-            radius,
-            radius,
-            SMOOTH_CIRCLE_SEGMENTS,
-            true
-          ).translate([-rectLength / 2, 0, 0]);
-          const cap2 = Manifold.cylinder(
-            depth,
-            radius,
-            radius,
-            SMOOTH_CIRCLE_SEGMENTS,
-            true
-          ).translate([rectLength / 2, 0, 0]);
-          pillOp = Manifold.union([rect, cap1, cap2]);
-          manifoldInstancesForCleanup.push(rect, cap1, cap2);
-        }
-        manifoldInstancesForCleanup.push(pillOp);
-        return pillOp;
-      };
+      const outerW = ph.outer_width ?? holeW + defaultPadExtension;
+      const outerH = ph.outer_height ?? holeH + defaultPadExtension;
       const drillW = holeW + 2 * MANIFOLD_Z_OFFSET;
       const drillH = holeH + 2 * MANIFOLD_Z_OFFSET;
       const drillDepth = pcbThickness * 1.2;
-      let boardPillDrillOp = createPill(drillW, drillH, drillDepth);
-      if (shouldRotate) {
-        const rotatedOp = boardPillDrillOp.rotate([0, 0, 90]);
-        manifoldInstancesForCleanup.push(rotatedOp);
-        boardPillDrillOp = rotatedOp;
-      }
+      let boardPillDrillOp = createPillOp(drillW, drillH, drillDepth);
       if (ph.ccw_rotation) {
         const rotatedOp = boardPillDrillOp.rotate([0, 0, ph.ccw_rotation]);
         manifoldInstancesForCleanup.push(rotatedOp);
@@ -29054,12 +29035,12 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
       manifoldInstancesForCleanup.push(translatedBoardPillDrill);
       platedHoleBoardDrills.push(translatedBoardPillDrill);
       const copperPartThickness = pcbThickness + 2 * MANIFOLD_Z_OFFSET;
-      const outerCopperOpUnrotated = createPill(
+      const outerCopperOpUnrotated = createPillOp(
         outerW,
         outerH,
         copperPartThickness
       );
-      const innerDrillOpUnrotated = createPill(
+      const innerDrillOpUnrotated = createPillOp(
         holeW,
         holeH,
         copperPartThickness * 1.05
@@ -29069,11 +29050,6 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         innerDrillOpUnrotated
       );
       manifoldInstancesForCleanup.push(finalPlatedPartOp);
-      if (shouldRotate) {
-        const rotatedOp = finalPlatedPartOp.rotate([0, 0, 90]);
-        manifoldInstancesForCleanup.push(rotatedOp);
-        finalPlatedPartOp = rotatedOp;
-      }
       if (ph.ccw_rotation) {
         const rotatedOp = finalPlatedPartOp.rotate([0, 0, ph.ccw_rotation]);
         manifoldInstancesForCleanup.push(rotatedOp);
@@ -29089,6 +29065,73 @@ function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, mani
         geometry: threeGeom,
         color: COPPER_COLOR
       });
+    } else if (ph.shape === "pill_hole_with_rect_pad") {
+      const holeW = ph.hole_width;
+      const holeH = ph.hole_height;
+      const padWidth = ph.rect_pad_width;
+      const padHeight = ph.rect_pad_height;
+      const rectBorderRadius = extractRectBorderRadius(ph);
+      const padThickness = DEFAULT_SMT_PAD_THICKNESS;
+      const drillW = holeW + 2 * MANIFOLD_Z_OFFSET;
+      const drillH = holeH + 2 * MANIFOLD_Z_OFFSET;
+      const drillDepth = pcbThickness * 1.2;
+      let boardPillDrillOp = createPillOp(drillW, drillH, drillDepth);
+      const translatedBoardPillDrill = boardPillDrillOp.translate([
+        ph.x,
+        ph.y,
+        0
+      ]);
+      manifoldInstancesForCleanup.push(translatedBoardPillDrill);
+      platedHoleBoardDrills.push(translatedBoardPillDrill);
+      let copperBarrelOp = createPillOp(
+        holeW,
+        holeH,
+        pcbThickness + 2 * MANIFOLD_Z_OFFSET
+      );
+      let topPadOp = createRoundedRectPrism({
+        Manifold,
+        width: padWidth,
+        height: padHeight,
+        thickness: padThickness,
+        borderRadius: rectBorderRadius
+      });
+      manifoldInstancesForCleanup.push(topPadOp);
+      let bottomPadOp = createRoundedRectPrism({
+        Manifold,
+        width: padWidth,
+        height: padHeight,
+        thickness: padThickness,
+        borderRadius: rectBorderRadius
+      });
+      manifoldInstancesForCleanup.push(bottomPadOp);
+      const topPadZ = pcbThickness / 2 + padThickness / 2 + MANIFOLD_Z_OFFSET;
+      const bottomPadZ = -pcbThickness / 2 - padThickness / 2 - MANIFOLD_Z_OFFSET;
+      topPadOp = topPadOp.translate([0, 0, topPadZ]);
+      manifoldInstancesForCleanup.push(topPadOp);
+      bottomPadOp = bottomPadOp.translate([0, 0, bottomPadZ]);
+      manifoldInstancesForCleanup.push(bottomPadOp);
+      const copperUnionBeforeCut = Manifold.union([
+        copperBarrelOp,
+        topPadOp,
+        bottomPadOp
+      ]);
+      manifoldInstancesForCleanup.push(copperUnionBeforeCut);
+      const holeCutWidth = Math.max(holeW - 2 * PLATED_HOLE_LIP_HEIGHT, 0.01);
+      const holeCutHeight = Math.max(holeH - 2 * PLATED_HOLE_LIP_HEIGHT, 0.01);
+      const holeCutDepth = pcbThickness + 2 * padThickness + 4 * MANIFOLD_Z_OFFSET;
+      let holeCutOp = createPillOp(holeCutWidth, holeCutHeight, holeCutDepth);
+      const finalPlatedPartOp = copperUnionBeforeCut.subtract(holeCutOp);
+      manifoldInstancesForCleanup.push(finalPlatedPartOp);
+      const translatedPlatedPart = finalPlatedPartOp.translate([ph.x, ph.y, 0]);
+      manifoldInstancesForCleanup.push(translatedPlatedPart);
+      const threeGeom = manifoldMeshToThreeGeometry(
+        translatedPlatedPart.getMesh()
+      );
+      platedHoleCopperGeoms.push({
+        key: `ph-${ph.pcb_plated_hole_id || index}`,
+        geometry: threeGeom,
+        color: COPPER_COLOR
+      });
     } else if (ph.shape === "circular_hole_with_rect_pad") {
       const translatedDrill = createCircleHoleDrill({
         Manifold,

package/package.json

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