@tscircuit/3d-viewer 0.0.456 → 0.0.458

package/dist/index.js

@@ -28509,7 +28509,7 @@ import * as THREE15 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.455",
+  version: "0.0.457",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -34164,6 +34164,76 @@ function createSoldermaskTextureForLayer({
         ctx.ellipse(canvasX, canvasY, radiusX, radiusY, 0, 0, 2 * Math.PI);
         ctx.fill();
       }
+    } else if (hole.shape === "hole_with_polygon_pad") {
+      const holeShape = hole.hole_shape || "circle";
+      const holeOffsetX = hole.hole_offset_x || 0;
+      const holeOffsetY = hole.hole_offset_y || 0;
+      const adjustedCanvasX = canvasXFromPcb(hole.x + holeOffsetX);
+      const adjustedCanvasY = canvasYFromPcb(hole.y + holeOffsetY);
+      if (holeShape === "pill" || holeShape === "rotated_pill") {
+        const width10 = (hole.outer_width ?? hole.outer_diameter ?? hole.hole_width) * traceTextureResolution;
+        const height10 = (hole.outer_height ?? hole.outer_diameter ?? hole.hole_height) * traceTextureResolution;
+        const radius = Math.min(width10, height10) / 2;
+        let rotation2 = hole.ccw_rotation || 0;
+        if (layer === "bottom") {
+          rotation2 = -rotation2;
+        }
+        if (rotation2) {
+          ctx.save();
+          ctx.translate(adjustedCanvasX, adjustedCanvasY);
+          ctx.rotate(rotation2 * Math.PI / 180);
+          ctx.beginPath();
+          ctx.roundRect(-width10 / 2, -height10 / 2, width10, height10, radius);
+          ctx.fill();
+          ctx.restore();
+        } else {
+          ctx.beginPath();
+          ctx.roundRect(
+            adjustedCanvasX - width10 / 2,
+            adjustedCanvasY - height10 / 2,
+            width10,
+            height10,
+            radius
+          );
+          ctx.fill();
+        }
+      } else if (holeShape === "oval") {
+        const width10 = (hole.outer_width ?? hole.outer_diameter ?? hole.hole_width) * traceTextureResolution;
+        const height10 = (hole.outer_height ?? hole.outer_diameter ?? hole.hole_height) * traceTextureResolution;
+        const radiusX = width10 / 2;
+        const radiusY = height10 / 2;
+        let rotation2 = hole.ccw_rotation || 0;
+        if (rotation2) {
+          rotation2 = -rotation2;
+        }
+        if (rotation2) {
+          ctx.save();
+          ctx.translate(adjustedCanvasX, adjustedCanvasY);
+          ctx.rotate(rotation2 * Math.PI / 180);
+          ctx.beginPath();
+          ctx.ellipse(0, 0, radiusX, radiusY, 0, 0, 2 * Math.PI);
+          ctx.fill();
+          ctx.restore();
+        } else {
+          ctx.beginPath();
+          ctx.ellipse(
+            adjustedCanvasX,
+            adjustedCanvasY,
+            radiusX,
+            radiusY,
+            0,
+            0,
+            2 * Math.PI
+          );
+          ctx.fill();
+        }
+      } else if (holeShape === "circle") {
+        const outerDiameter = (hole.outer_diameter ?? hole.hole_diameter ?? 0) * traceTextureResolution;
+        const canvasRadius = outerDiameter / 2;
+        ctx.beginPath();
+        ctx.arc(adjustedCanvasX, adjustedCanvasY, canvasRadius, 0, 2 * Math.PI);
+        ctx.fill();
+      }
     }
   });
   const pcbHoles = su13(circuitJson).pcb_hole.list();
@@ -34234,6 +34304,99 @@ function createSoldermaskTextureForLayer({
       ctx.fill();
     }
   });
+  const pcbCutouts = su13(circuitJson).pcb_cutout.list();
+  pcbCutouts.forEach((cutout) => {
+    switch (cutout.shape) {
+      case "rect": {
+        const canvasX = canvasXFromPcb(cutout.center.x);
+        const canvasY = canvasYFromPcb(cutout.center.y);
+        const width10 = cutout.width * traceTextureResolution;
+        const height10 = cutout.height * traceTextureResolution;
+        const rectCornerRadius = extractRectBorderRadius(cutout);
+        const borderRadius = clampRectBorderRadius(
+          cutout.width,
+          cutout.height,
+          rectCornerRadius
+        );
+        if (cutout.rotation) {
+          ctx.save();
+          ctx.translate(canvasX, canvasY);
+          const rotation2 = layer === "bottom" ? -cutout.rotation * (Math.PI / 180) : cutout.rotation * (Math.PI / 180);
+          ctx.rotate(rotation2);
+          if (borderRadius > 0) {
+            ctx.beginPath();
+            ctx.roundRect(
+              -width10 / 2,
+              -height10 / 2,
+              width10,
+              height10,
+              borderRadius * traceTextureResolution
+            );
+            ctx.fill();
+          } else {
+            ctx.fillRect(-width10 / 2, -height10 / 2, width10, height10);
+          }
+          ctx.restore();
+        } else {
+          if (borderRadius > 0) {
+            ctx.beginPath();
+            ctx.roundRect(
+              canvasX - width10 / 2,
+              canvasY - height10 / 2,
+              width10,
+              height10,
+              borderRadius * traceTextureResolution
+            );
+            ctx.fill();
+          } else {
+            ctx.fillRect(
+              canvasX - width10 / 2,
+              canvasY - height10 / 2,
+              width10,
+              height10
+            );
+          }
+        }
+        break;
+      }
+      case "circle": {
+        const canvasX = canvasXFromPcb(cutout.center.x);
+        const canvasY = canvasYFromPcb(cutout.center.y);
+        const canvasRadius = cutout.radius * traceTextureResolution;
+        ctx.beginPath();
+        ctx.arc(canvasX, canvasY, canvasRadius, 0, 2 * Math.PI);
+        ctx.fill();
+        break;
+      }
+      case "polygon": {
+        if (!cutout.points || cutout.points.length < 3) {
+          console.warn(
+            `PCB Cutout [${cutout.pcb_cutout_id}] polygon has fewer than 3 points, skipping in soldermask texture.`
+          );
+          break;
+        }
+        ctx.beginPath();
+        cutout.points.forEach(
+          (point2, index2) => {
+            const px = canvasXFromPcb(point2.x);
+            const py = canvasYFromPcb(point2.y);
+            if (index2 === 0) {
+              ctx.moveTo(px, py);
+            } else {
+              ctx.lineTo(px, py);
+            }
+          }
+        );
+        ctx.closePath();
+        ctx.fill();
+        break;
+      }
+      default:
+        console.warn(
+          `Unsupported cutout shape: ${cutout.shape} for cutout ${cutout.pcb_cutout_id} in soldermask texture.`
+        );
+    }
+  });
   ctx.globalCompositeOperation = "source-over";
   const texture = new THREE24.CanvasTexture(canvas);
   texture.generateMipmaps = true;

package/package.json

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