@tscircuit/3d-viewer 0.0.488 → 0.0.490

package/dist/index.js

@@ -7502,7 +7502,7 @@ var require_ellipse = __commonJS({
     var geom2 = require_geom2();
     var { sin: sin2, cos: cos2 } = require_trigonometry();
     var { isGTE, isNumberArray } = require_commonChecks();
-    var ellipse2 = (options) => {
+    var ellipse3 = (options) => {
       const defaults = {
         center: [0, 0],
         radius: [1, 1],
@@ -7544,7 +7544,7 @@ var require_ellipse = __commonJS({
       if (rotation2 < TAU) points.push(centerv);
       return geom2.fromPoints(points);
     };
-    module.exports = ellipse2;
+    module.exports = ellipse3;
   }
 });
 
@@ -7553,7 +7553,7 @@ var require_circle = __commonJS({
   "node_modules/@jscad/modeling/src/primitives/circle.js"(exports, module) {
     "use strict";
     var { TAU } = require_constants();
-    var ellipse2 = require_ellipse();
+    var ellipse3 = require_ellipse();
     var { isGTE } = require_commonChecks();
     var circle = (options) => {
       const defaults = {
@@ -7566,7 +7566,7 @@ var require_circle = __commonJS({
       let { center, radius, startAngle, endAngle, segments } = Object.assign({}, defaults, options);
       if (!isGTE(radius, 0)) throw new Error("radius must be positive");
       radius = [radius, radius];
-      return ellipse2({ center, radius, startAngle, endAngle, segments });
+      return ellipse3({ center, radius, startAngle, endAngle, segments });
     };
     module.exports = circle;
   }
@@ -30825,7 +30825,7 @@ import * as THREE16 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.487",
+  version: "0.0.489",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -30854,7 +30854,7 @@ var package_default = {
   dependencies: {
     "@jscad/regl-renderer": "^2.6.12",
     "@jscad/stl-serializer": "^2.1.20",
-    "circuit-to-canvas": "^0.0.26",
+    "circuit-to-canvas": "^0.0.49",
     "react-hot-toast": "^2.6.0",
     three: "^0.165.0",
     "three-stdlib": "^2.36.0",
@@ -30891,7 +30891,7 @@ var package_default = {
     "react-use-gesture": "^9.1.3",
     semver: "^7.7.0",
     "strip-ansi": "^7.1.0",
-    tscircuit: "^0.0.1123",
+    tscircuit: "^0.0.1141",
     tsup: "^8.3.6",
     typescript: "^5.7.3",
     vite: "^7.1.5",
@@ -33407,6 +33407,41 @@ var BoardGeomBuilder = class {
       this.platedHoleGeoms = this.platedHoleGeoms.map(
         (phg) => (0, import_colors3.colorize)(colors.copper, (0, import_booleans5.subtract)(phg, copperPill))
       );
+    } else if (hole.hole_shape === "oval") {
+      const holeWidth = hole.hole_width;
+      const holeHeight = hole.hole_height;
+      const ellipseGeom = (0, import_transforms6.translate)(
+        [hole.x, hole.y, 0],
+        (0, import_transforms6.translate)(
+          [0, 0, -holeDepth / 2],
+          (0, import_extrusions4.extrudeLinear)(
+            { height: holeDepth },
+            (0, import_primitives7.ellipse)({ radius: [holeWidth / 2, holeHeight / 2] })
+          )
+        )
+      );
+      this.boardGeom = (0, import_booleans5.subtract)(this.boardGeom, ellipseGeom);
+      this.padGeoms = this.padGeoms.map(
+        (pg) => (0, import_colors3.colorize)(colors.copper, (0, import_booleans5.subtract)(pg, ellipseGeom))
+      );
+      const copperEllipseGeom = (0, import_transforms6.translate)(
+        [hole.x, hole.y, 0],
+        (0, import_transforms6.translate)(
+          [0, 0, -holeDepth / 2],
+          (0, import_extrusions4.extrudeLinear)(
+            { height: holeDepth },
+            (0, import_primitives7.ellipse)({
+              radius: [
+                holeWidth / 2 - copperInset,
+                holeHeight / 2 - copperInset
+              ]
+            })
+          )
+        )
+      );
+      this.platedHoleGeoms = this.platedHoleGeoms.map(
+        (phg) => (0, import_colors3.colorize)(colors.copper, (0, import_booleans5.subtract)(phg, copperEllipseGeom))
+      );
     }
   }
   processPad(pad2) {
@@ -34244,13 +34279,26 @@ function createSoldermaskTextureForLayer({
     const y = hole.y;
     const canvasX = canvasXFromPcb(x);
     const canvasY = canvasYFromPcb(y);
-    const holeShape = hole.hole_shape || hole.shape;
+    const holeShape = hole.hole_shape;
     if (holeShape === "circle" && typeof hole.hole_diameter === "number") {
       const canvasRadius = hole.hole_diameter / 2 * traceTextureResolution;
       ctx.beginPath();
       ctx.arc(canvasX, canvasY, canvasRadius, 0, 2 * Math.PI);
       ctx.fill();
-    } else if ((holeShape === "pill" || holeShape === "rotated_pill") && typeof hole.hole_width === "number" && typeof hole.hole_height === "number") {
+    } else if (holeShape === "pill" && typeof hole.hole_width === "number" && typeof hole.hole_height === "number") {
+      const width10 = hole.hole_width * traceTextureResolution;
+      const height10 = hole.hole_height * traceTextureResolution;
+      const radius = Math.min(width10, height10) / 2;
+      ctx.beginPath();
+      ctx.roundRect(
+        canvasX - width10 / 2,
+        canvasY - height10 / 2,
+        width10,
+        height10,
+        radius
+      );
+      ctx.fill();
+    } else if (holeShape === "rotated_pill" && typeof hole.hole_width === "number" && typeof hole.hole_height === "number") {
       const width10 = hole.hole_width * traceTextureResolution;
       const height10 = hole.hole_height * traceTextureResolution;
       const radius = Math.min(width10, height10) / 2;
@@ -34275,6 +34323,14 @@ function createSoldermaskTextureForLayer({
         );
         ctx.fill();
       }
+    } else if (holeShape === "oval" && typeof hole.hole_width === "number" && typeof hole.hole_height === "number") {
+      const width10 = hole.hole_width * traceTextureResolution;
+      const height10 = hole.hole_height * traceTextureResolution;
+      const radiusX = width10 / 2;
+      const radiusY = height10 / 2;
+      ctx.beginPath();
+      ctx.ellipse(canvasX, canvasY, radiusX, radiusY, 0, 0, 2 * Math.PI);
+      ctx.fill();
     }
   });
   const pcbCopperPours = su5(circuitJson).pcb_copper_pour.list();
@@ -36342,6 +36398,21 @@ function processNonPlatedHolesForManifold(Manifold, circuitJson, pcbThickness, m
       const translatedPillDrill = pillDrillOp.translate([hole.x, hole.y, 0]);
       manifoldInstancesForCleanup.push(translatedPillDrill);
       nonPlatedHoleBoardDrills.push(translatedPillDrill);
+    } else if (hole.hole_shape === "oval") {
+      const holeW = hole.hole_width;
+      const holeH = hole.hole_height;
+      const drillDepth = pcbThickness * 1.2;
+      const ovalDrillOp = Manifold.cylinder(
+        drillDepth,
+        1,
+        1,
+        SMOOTH_CIRCLE_SEGMENTS,
+        true
+      ).scale([holeW / 2, holeH / 2, 1]);
+      manifoldInstancesForCleanup.push(ovalDrillOp);
+      const translatedOvalDrill = ovalDrillOp.translate([hole.x, hole.y, 0]);
+      manifoldInstancesForCleanup.push(translatedOvalDrill);
+      nonPlatedHoleBoardDrills.push(translatedOvalDrill);
     }
   });
   return { nonPlatedHoleBoardDrills };
@@ -37176,6 +37247,7 @@ function createCopperPourTextureForLayer({
   const copperPours = circuitJson.filter(
     (e) => e.type === "pcb_copper_pour"
   );
+  const pcbRenderLayer2 = layer === "top" ? "top_copper" : "bottom_copper";
   const poursOnLayer = copperPours.filter((p) => p.layer === layer);
   if (poursOnLayer.length === 0) return null;
   const boardOutlineBounds = calculateOutlineBounds(boardData);
@@ -37231,7 +37303,7 @@ function createCopperPourTextureForLayer({
           }
         }
       });
-      drawer.drawElements(coveredPours, { layers: [layer] });
+      drawer.drawElements(coveredPours, { layers: [pcbRenderLayer2] });
     }
     if (uncoveredPours.length > 0) {
       drawer.configure({
@@ -37248,7 +37320,7 @@ function createCopperPourTextureForLayer({
           }
         }
       });
-      drawer.drawElements(uncoveredPours, { layers: [layer] });
+      drawer.drawElements(uncoveredPours, { layers: [pcbRenderLayer2] });
     }
   }
   for (const pour of brepPours) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.488",
+  "version": "0.0.490",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@jscad/regl-renderer": "^2.6.12",
     "@jscad/stl-serializer": "^2.1.20",
-    "circuit-to-canvas": "^0.0.26",
+    "circuit-to-canvas": "^0.0.49",
     "react-hot-toast": "^2.6.0",
     "three": "^0.165.0",
     "three-stdlib": "^2.36.0",
@@ -66,7 +66,7 @@
     "react-use-gesture": "^9.1.3",
     "semver": "^7.7.0",
     "strip-ansi": "^7.1.0",
-    "tscircuit": "^0.0.1123",
+    "tscircuit": "^0.0.1141",
     "tsup": "^8.3.6",
     "typescript": "^5.7.3",
     "vite": "^7.1.5",