@tscircuit/3d-viewer 0.0.633 → 0.0.634

package/dist/index.js

@@ -22051,7 +22051,7 @@ import * as THREE30 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.632",
+  version: "0.0.633",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/3d-viewer"
@@ -22119,8 +22119,8 @@ var package_default = {
     "@tscircuit/alphabet": "^0.0.25",
     "@tscircuit/circuit-json-util": "^0.0.119",
     "@tscircuit/copper-pour-solver": "^0.0.29",
-    "@tscircuit/core": "^0.0.2188",
-    "@tscircuit/props": "^0.0.705",
+    "@tscircuit/core": "^0.0.2195",
+    "@tscircuit/props": "^0.0.707",
     "@tscircuit/solver-utils": "^0.0.4",
     "@types/debug": "^4.1.13",
     "@types/jsdom": "^21.1.7",
@@ -24039,46 +24039,45 @@ var createPillPrism = (width, height, depth) => {
   });
   return (0, import_booleans.union)(rect, firstCap, secondCap);
 };
-var createHoleWithPolygonPadHoleGeom = (hole, height, options = {}) => {
+var createHoleWithPolygonPadHoleGeom = (hole, depth, options = {}) => {
   const holeShape = hole.hole_shape || "circle";
   const sizeDelta = options.sizeDelta ?? 0;
   const offsetX = hole.hole_offset_x || 0;
   const offsetY = hole.hole_offset_y || 0;
-  const center = [
-    hole.x + offsetX,
-    hole.y + offsetY,
-    0
-  ];
+  let drill;
   if (holeShape === "circle") {
     const diameter = Math.max((hole.hole_diameter ?? 0) + sizeDelta, M);
-    const radius = Math.max(diameter / 2, M / 2);
-    return (0, import_primitives3.cylinder)({ center, radius, height });
-  }
-  const baseWidth = hole.hole_width ?? hole.hole_diameter;
-  const baseHeight = hole.hole_height ?? hole.hole_diameter;
-  if (!baseWidth || !baseHeight) {
-    return null;
-  }
-  const width = Math.max(baseWidth + sizeDelta, M);
-  const heightVal = Math.max(baseHeight + sizeDelta, M);
-  if (holeShape === "oval") {
-    const ellipsePrism = createEllipsePrism(width, heightVal, height);
-    return (0, import_transforms2.translate)([center[0], center[1], 0], ellipsePrism);
-  }
-  if (holeShape === "pill" || holeShape === "rotated_pill") {
-    let pill = createPillPrism(width, heightVal, height);
-    if (!pill) return null;
-    const rotation = hole.ccw_rotation || 0;
-    if (rotation) {
-      pill = (0, import_transforms2.rotateZ)(rotation * Math.PI / 180, pill);
+    const radius = diameter / 2;
+    drill = (0, import_primitives3.cylinder)({ center: [0, 0, 0], radius, height: depth });
+  } else {
+    const baseWidth = hole.hole_width ?? hole.hole_diameter;
+    const baseHeight = hole.hole_height ?? hole.hole_diameter;
+    if (!baseWidth || !baseHeight) {
+      return null;
+    }
+    const shapeWidth = Math.max(baseWidth + sizeDelta, M);
+    const shapeHeight = Math.max(baseHeight + sizeDelta, M);
+    if (holeShape === "oval") {
+      drill = createEllipsePrism(shapeWidth, shapeHeight, depth);
+    } else if (holeShape === "pill" || holeShape === "rotated_pill") {
+      drill = createPillPrism(shapeWidth, shapeHeight, depth);
+    } else {
+      const fallbackDiameter = Math.max(
+        (hole.hole_diameter ?? baseWidth) + sizeDelta,
+        M
+      );
+      drill = (0, import_primitives3.cylinder)({
+        center: [0, 0, 0],
+        radius: fallbackDiameter / 2,
+        height: depth
+      });
     }
-    return (0, import_transforms2.translate)(center, pill);
   }
-  const fallbackDiameter = Math.max(
-    (hole.hole_diameter ?? baseWidth ?? baseHeight ?? M) + sizeDelta,
-    M
-  );
-  return (0, import_primitives3.cylinder)({ center, radius: fallbackDiameter / 2, height });
+  drill = (0, import_transforms2.translate)([offsetX, offsetY, 0], drill);
+  if (hole.ccw_rotation) {
+    drill = (0, import_transforms2.rotateZ)(hole.ccw_rotation * Math.PI / 180, drill);
+  }
+  return (0, import_transforms2.translate)([hole.x, hole.y, 0], drill);
 };
 
 // src/geoms/plated-hole.ts
@@ -24567,7 +24566,13 @@ var platedHole = (plated_hole, ctx, options = {}) => {
     const centerZ = 0;
     const createPolygonPad = (thickness, zCenter) => {
       const safeThickness = Math.max(thickness, M);
-      const extruded = (0, import_extrusions3.extrudeLinear)({ height: safeThickness }, polygon2d);
+      let extruded = (0, import_extrusions3.extrudeLinear)({ height: safeThickness }, polygon2d);
+      if (plated_hole.ccw_rotation) {
+        extruded = (0, import_transforms4.rotate)(
+          [0, 0, plated_hole.ccw_rotation * Math.PI / 180],
+          extruded
+        );
+      }
       return (0, import_transforms4.translate)(
         [plated_hole.x, plated_hole.y, zCenter - safeThickness / 2],
         extruded
@@ -25655,6 +25660,7 @@ function clearViaHolesFromSurface({
 }
 
 // src/textures/create-combined-board-textures.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer12 } from "circuit-to-canvas";
 import * as THREE46 from "three";
 
 // src/utils/pad-texture.ts
@@ -27163,7 +27169,8 @@ var createCombinedTexture = ({
   boardData,
   traceTextureResolution,
   layer,
-  openViaHoles
+  openViaHoles,
+  drillElements
 }) => {
   const hasImage = textures.some((texture) => texture?.image);
   if (!hasImage) return null;
@@ -27185,6 +27192,30 @@ var createCombinedTexture = ({
     const image = texture.image;
     ctx.drawImage(image, 0, 0, canvasWidth, canvasHeight);
   }
+  if (drillElements.length > 0) {
+    const apertureMask = document.createElement("canvas");
+    apertureMask.width = canvasWidth;
+    apertureMask.height = canvasHeight;
+    const maskCtx = apertureMask.getContext("2d");
+    if (maskCtx) {
+      maskCtx.fillStyle = "black";
+      maskCtx.fillRect(0, 0, canvasWidth, canvasHeight);
+      if (layer === "bottom") {
+        maskCtx.translate(0, canvasHeight);
+        maskCtx.scale(1, -1);
+      }
+      const drawer = new CircuitToCanvasDrawer12(maskCtx);
+      drawer.setCameraBounds(boardOutlineBounds);
+      drawer.drawElements(drillElements, {
+        layers: [layer === "top" ? "top_copper" : "bottom_copper"],
+        clearDrillHoles: true
+      });
+      ctx.save();
+      ctx.globalCompositeOperation = "destination-in";
+      ctx.drawImage(apertureMask, 0, 0, canvasWidth, canvasHeight);
+      ctx.restore();
+    }
+  }
   clearViaHolesFromSurface({
     ctx,
     vias: openViaHoles,
@@ -27254,6 +27285,9 @@ function createCombinedBoardTextures({
   const silkscreenColor = "rgb(255,255,255)";
   const copperColor = toRgb3(colors.copper);
   const showBoardBody = visibility?.boardBody ?? true;
+  const drillElements = circuitJson.filter(
+    (element) => element.type === "pcb_hole" || element.type === "pcb_plated_hole" || element.type === "pcb_cutout"
+  );
   const openViaHoles = getViaHolesAtExposedPads(
     circuitJson,
     boardData,
@@ -27348,6 +27382,7 @@ function createCombinedBoardTextures({
     }) : null;
     const boardTexture = createCombinedTexture({
       openViaHoles,
+      drillElements,
       textures: [
         copperPourTexture,
         traceTexture,
@@ -30463,12 +30498,17 @@ function processPlatedHolesForManifold(Manifold, CrossSection, circuitJson, pcbT
       if (!Array.isArray(padOutline) || padOutline.length < 3) {
         return;
       }
-      const boardHoleOp = createHoleOpForPolygonPad({
+      let boardHoleOp = createHoleOpForPolygonPad({
         ph,
         depth: pcbThickness * 1.2,
         sizeDelta: 2 * M
       });
       if (!boardHoleOp) return;
+      if (ph.ccw_rotation) {
+        const rotatedOp = boardHoleOp.rotate([0, 0, ph.ccw_rotation]);
+        manifoldInstancesForCleanup.push(rotatedOp);
+        boardHoleOp = rotatedOp;
+      }
       const translatedBoardHole = boardHoleOp.translate([ph.x, ph.y, 0]);
       manifoldInstancesForCleanup.push(translatedBoardHole);
       platedHoleBoardDrills.push(translatedBoardHole);
@@ -30494,8 +30534,13 @@ function processPlatedHolesForManifold(Manifold, CrossSection, circuitJson, pcbT
       }) || barrelOp;
       const copperUnion = Manifold.union([mainFill, barrelOp]);
       manifoldInstancesForCleanup.push(copperUnion);
-      const finalCopper = copperUnion.subtract(holeCutOp);
+      let finalCopper = copperUnion.subtract(holeCutOp);
       manifoldInstancesForCleanup.push(finalCopper);
+      if (ph.ccw_rotation) {
+        const rotatedOp = finalCopper.rotate([0, 0, ph.ccw_rotation]);
+        manifoldInstancesForCleanup.push(rotatedOp);
+        finalCopper = rotatedOp;
+      }
       const translatedCopper = finalCopper.translate([ph.x, ph.y, 0]);
       manifoldInstancesForCleanup.push(translatedCopper);
       let finalCopperOp = translatedCopper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.633",
+  "version": "0.0.634",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/3d-viewer"
@@ -68,8 +68,8 @@
     "@tscircuit/alphabet": "^0.0.25",
     "@tscircuit/circuit-json-util": "^0.0.119",
     "@tscircuit/copper-pour-solver": "^0.0.29",
-    "@tscircuit/core": "^0.0.2188",
-    "@tscircuit/props": "^0.0.705",
+    "@tscircuit/core": "^0.0.2195",
+    "@tscircuit/props": "^0.0.707",
     "@tscircuit/solver-utils": "^0.0.4",
     "@types/debug": "^4.1.13",
     "@types/jsdom": "^21.1.7",