@tscircuit/3d-viewer 0.0.410 → 0.0.412

package/dist/index.js

@@ -26576,7 +26576,7 @@ import * as THREE13 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.409",
+  version: "0.0.411",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -26623,7 +26623,7 @@ var package_default = {
     "@storybook/blocks": "9.0.0-alpha.17",
     "@storybook/react-vite": "^9.1.5",
     "@tscircuit/circuit-json-util": "^0.0.72",
-    "@tscircuit/core": "^0.0.781",
+    "@tscircuit/core": "^0.0.783",
     "@tscircuit/props": "^0.0.360",
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/math-utils": "^0.0.27",
@@ -26646,7 +26646,7 @@ var package_default = {
     "react-use-gesture": "^9.1.3",
     semver: "^7.7.0",
     "strip-ansi": "^7.1.0",
-    tscircuit: "^0.0.742",
+    tscircuit: "^0.0.746",
     tsup: "^8.3.6",
     typescript: "^5.7.3",
     vite: "^7.1.5",
@@ -28486,6 +28486,99 @@ var BoardGeomBuilder = class {
       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 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: [hole.x, hole.y, 0],
+            size: [rectLength, holeHeight, this.ctx.pcbThickness * 1.5]
+          }),
+          (0, import_primitives6.cylinder)({
+            center: [hole.x - rectLength / 2, hole.y, 0],
+            radius: holeRadius,
+            height: this.ctx.pcbThickness * 1.5
+          }),
+          (0, import_primitives6.cylinder)({
+            center: [hole.x + rectLength / 2, hole.y, 0],
+            radius: holeRadius,
+            height: this.ctx.pcbThickness * 1.5
+          })
+        );
+      } else {
+        pillHole = (0, import_booleans3.union)(
+          (0, import_primitives6.cuboid)({
+            center: [hole.x, hole.y, 0],
+            size: [holeWidth, rectLength, this.ctx.pcbThickness * 1.5]
+          }),
+          (0, import_primitives6.cylinder)({
+            center: [hole.x, hole.y - rectLength / 2, 0],
+            radius: holeRadius,
+            height: this.ctx.pcbThickness * 1.5
+          }),
+          (0, import_primitives6.cylinder)({
+            center: [hole.x, hole.y + rectLength / 2, 0],
+            radius: holeRadius,
+            height: this.ctx.pcbThickness * 1.5
+          })
+        );
+      }
+      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
+          })
+        );
+      }
+      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))
+      );
     }
   }
   processPad(pad2) {
@@ -29348,34 +29441,6 @@ function createPlatedHoleDrill({
   return drill.translate([x, y, 0]);
 }
 
-// src/utils/manifold/process-non-plated-holes.ts
-function isCircleHole(hole) {
-  return (hole.shape === "circle" || hole.hole_shape === "circle") && typeof hole.hole_diameter === "number";
-}
-function processNonPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, manifoldInstancesForCleanup) {
-  const nonPlatedHoleBoardDrills = [];
-  const pcbHoles = su7(circuitJson).pcb_hole.list();
-  pcbHoles.forEach((hole) => {
-    if (isCircleHole(hole)) {
-      const translatedDrill = createCircleHoleDrill({
-        Manifold,
-        x: hole.x,
-        y: hole.y,
-        diameter: hole.hole_diameter,
-        thickness: pcbThickness,
-        segments: SMOOTH_CIRCLE_SEGMENTS
-      });
-      manifoldInstancesForCleanup.push(translatedDrill);
-      nonPlatedHoleBoardDrills.push(translatedDrill);
-    }
-  });
-  return { nonPlatedHoleBoardDrills };
-}
-
-// src/utils/manifold/process-plated-holes.ts
-import { su as su8 } from "@tscircuit/circuit-json-util";
-import * as THREE19 from "three";
-
 // src/utils/pad-geoms.ts
 var RECT_PAD_SEGMENTS2 = 64;
 function createRoundedRectPrism({
@@ -29451,7 +29516,69 @@ function createPadManifoldOp({
   return null;
 }
 
+// src/utils/manifold/process-non-plated-holes.ts
+function isCircleHole(hole) {
+  return (hole.shape === "circle" || hole.hole_shape === "circle") && typeof hole.hole_diameter === "number";
+}
+function isPillHole(hole) {
+  return (hole.shape === "pill" || hole.hole_shape === "pill") && typeof hole.hole_width === "number" && typeof hole.hole_height === "number";
+}
+function isRotatedPillHole(hole) {
+  return (hole.shape === "rotated_pill" || hole.hole_shape === "rotated_pill") && typeof hole.hole_width === "number" && typeof hole.hole_height === "number" && typeof hole.ccw_rotation === "number";
+}
+function processNonPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, manifoldInstancesForCleanup) {
+  const nonPlatedHoleBoardDrills = [];
+  const pcbHoles = su7(circuitJson).pcb_hole.list();
+  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;
+  };
+  pcbHoles.forEach((hole) => {
+    if (isCircleHole(hole)) {
+      const translatedDrill = createCircleHoleDrill({
+        Manifold,
+        x: hole.x,
+        y: hole.y,
+        diameter: hole.hole_diameter,
+        thickness: pcbThickness,
+        segments: SMOOTH_CIRCLE_SEGMENTS
+      });
+      manifoldInstancesForCleanup.push(translatedDrill);
+      nonPlatedHoleBoardDrills.push(translatedDrill);
+    } else if (isPillHole(hole)) {
+      const holeW = hole.hole_width;
+      const holeH = hole.hole_height;
+      const drillDepth = pcbThickness * 1.2;
+      const pillDrillOp = createPillOp(holeW, holeH, drillDepth);
+      const translatedPillDrill = pillDrillOp.translate([hole.x, hole.y, 0]);
+      manifoldInstancesForCleanup.push(translatedPillDrill);
+      nonPlatedHoleBoardDrills.push(translatedPillDrill);
+    } else if (isRotatedPillHole(hole)) {
+      const holeW = hole.hole_width;
+      const holeH = hole.hole_height;
+      const drillDepth = pcbThickness * 1.2;
+      let pillDrillOp = createPillOp(holeW, holeH, drillDepth);
+      const rotatedOp = pillDrillOp.rotate([0, 0, hole.ccw_rotation]);
+      manifoldInstancesForCleanup.push(rotatedOp);
+      pillDrillOp = rotatedOp;
+      const translatedPillDrill = pillDrillOp.translate([hole.x, hole.y, 0]);
+      manifoldInstancesForCleanup.push(translatedPillDrill);
+      nonPlatedHoleBoardDrills.push(translatedPillDrill);
+    }
+  });
+  return { nonPlatedHoleBoardDrills };
+}
+
 // src/utils/manifold/process-plated-holes.ts
+import { su as su8 } from "@tscircuit/circuit-json-util";
+import * as THREE19 from "three";
 var COPPER_COLOR = new THREE19.Color(...colors.copper);
 var PLATED_HOLE_LIP_HEIGHT = 0.05;
 function processPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, manifoldInstancesForCleanup, boardClipVolume) {
@@ -31246,7 +31373,7 @@ async function load3DModel(url) {
 
 // src/utils/render-component.tsx
 async function renderComponent(component, scene) {
-  const url = component.model_obj_url ?? component.model_wrl_url ?? component.model_stl_url ?? component.model_gltf_url;
+  const url = component.model_obj_url ?? component.model_wrl_url ?? component.model_stl_url ?? component.model_glb_url ?? component.model_gltf_url;
   if (url) {
     const model = await load3DModel(url);
     if (model) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.410",
+  "version": "0.0.412",
   "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.5",
     "@tscircuit/circuit-json-util": "^0.0.72",
-    "@tscircuit/core": "^0.0.781",
+    "@tscircuit/core": "^0.0.783",
     "@tscircuit/props": "^0.0.360",
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/math-utils": "^0.0.27",
@@ -70,7 +70,7 @@
     "react-use-gesture": "^9.1.3",
     "semver": "^7.7.0",
     "strip-ansi": "^7.1.0",
-    "tscircuit": "^0.0.742",
+    "tscircuit": "^0.0.746",
     "tsup": "^8.3.6",
     "typescript": "^5.7.3",
     "vite": "^7.1.5",