@tscircuit/3d-viewer 0.0.457 → 0.0.459

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.456",
+  version: "0.0.458",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -34072,25 +34072,67 @@ function createSoldermaskTextureForLayer({
     if (pad2.shape === "rect") {
       const width10 = pad2.width * traceTextureResolution;
       const height10 = pad2.height * traceTextureResolution;
-      ctx.fillRect(canvasX - width10 / 2, canvasY - height10 / 2, width10, height10);
+      const rawRadius = extractRectBorderRadius(pad2);
+      const borderRadius = clampRectBorderRadius(
+        pad2.width,
+        pad2.height,
+        rawRadius
+      ) * traceTextureResolution;
+      if (borderRadius > 0) {
+        ctx.beginPath();
+        ctx.roundRect(
+          canvasX - width10 / 2,
+          canvasY - height10 / 2,
+          width10,
+          height10,
+          borderRadius
+        );
+        ctx.fill();
+      } else {
+        ctx.fillRect(canvasX - width10 / 2, canvasY - height10 / 2, width10, height10);
+      }
     } else if (pad2.shape === "circle") {
       const radius = (pad2.radius ?? pad2.width / 2) * traceTextureResolution;
       ctx.beginPath();
       ctx.arc(canvasX, canvasY, radius, 0, 2 * Math.PI);
       ctx.fill();
-    } else if (pad2.shape === "pill" || pad2.shape === "rotated_rect") {
+    } else if (pad2.shape === "pill") {
       const width10 = pad2.width * traceTextureResolution;
       const height10 = pad2.height * traceTextureResolution;
-      const radius = Math.min(width10, height10) / 2;
+      const rawRadius = extractRectBorderRadius(pad2);
+      const borderRadius = clampRectBorderRadius(
+        pad2.width,
+        pad2.height,
+        rawRadius
+      ) * traceTextureResolution;
       ctx.beginPath();
       ctx.roundRect(
         canvasX - width10 / 2,
         canvasY - height10 / 2,
         width10,
         height10,
-        radius
+        borderRadius
       );
       ctx.fill();
+    } else if (pad2.shape === "rotated_rect") {
+      const width10 = pad2.width * traceTextureResolution;
+      const height10 = pad2.height * traceTextureResolution;
+      const rawRadius = extractRectBorderRadius(pad2);
+      const borderRadius = clampRectBorderRadius(
+        pad2.width,
+        pad2.height,
+        rawRadius
+      ) * traceTextureResolution;
+      const ccwRotation = pad2.ccw_rotation || 0;
+      const rotationRadians = ccwRotation * (Math.PI / 180);
+      const rotation2 = layer === "bottom" ? -rotationRadians : rotationRadians;
+      ctx.save();
+      ctx.translate(canvasX, canvasY);
+      ctx.rotate(rotation2);
+      ctx.beginPath();
+      ctx.roundRect(-width10 / 2, -height10 / 2, width10, height10, borderRadius);
+      ctx.fill();
+      ctx.restore();
     }
   });
   const pcbVias = su13(circuitJson).pcb_via.list();
@@ -34234,6 +34276,71 @@ function createSoldermaskTextureForLayer({
         ctx.arc(adjustedCanvasX, adjustedCanvasY, canvasRadius, 0, 2 * Math.PI);
         ctx.fill();
       }
+    } else if (hole.shape === "circular_hole_with_rect_pad") {
+      const padWidth = (hole.rect_pad_width ?? hole.hole_diameter ?? 0) * traceTextureResolution;
+      const padHeight = (hole.rect_pad_height ?? hole.hole_diameter ?? 0) * traceTextureResolution;
+      const rawRadius = extractRectBorderRadius(hole);
+      const borderRadius = clampRectBorderRadius(
+        hole.rect_pad_width ?? hole.hole_diameter ?? 0,
+        hole.rect_pad_height ?? hole.hole_diameter ?? 0,
+        rawRadius
+      ) * traceTextureResolution;
+      if (borderRadius > 0) {
+        ctx.beginPath();
+        ctx.roundRect(
+          canvasX - padWidth / 2,
+          canvasY - padHeight / 2,
+          padWidth,
+          padHeight,
+          borderRadius
+        );
+        ctx.fill();
+      } else {
+        ctx.fillRect(
+          canvasX - padWidth / 2,
+          canvasY - padHeight / 2,
+          padWidth,
+          padHeight
+        );
+      }
+    } else if (hole.shape === "pill_hole_with_rect_pad") {
+      const padWidth = (hole.rect_pad_width ?? hole.hole_width ?? 0) * traceTextureResolution;
+      const padHeight = (hole.rect_pad_height ?? hole.hole_height ?? 0) * traceTextureResolution;
+      const rawRadius = extractRectBorderRadius(hole);
+      const borderRadius = clampRectBorderRadius(
+        hole.rect_pad_width ?? hole.hole_width ?? 0,
+        hole.rect_pad_height ?? hole.hole_height ?? 0,
+        rawRadius
+      ) * traceTextureResolution;
+      let rotation2 = hole.ccw_rotation || 0;
+      if (layer === "bottom") {
+        rotation2 = -rotation2;
+      }
+      if (rotation2) {
+        ctx.save();
+        ctx.translate(canvasX, canvasY);
+        ctx.rotate(rotation2 * Math.PI / 180);
+        ctx.beginPath();
+        ctx.roundRect(
+          -padWidth / 2,
+          -padHeight / 2,
+          padWidth,
+          padHeight,
+          borderRadius
+        );
+        ctx.fill();
+        ctx.restore();
+      } else {
+        ctx.beginPath();
+        ctx.roundRect(
+          canvasX - padWidth / 2,
+          canvasY - padHeight / 2,
+          padWidth,
+          padHeight,
+          borderRadius
+        );
+        ctx.fill();
+      }
     }
   });
   const pcbHoles = su13(circuitJson).pcb_hole.list();
@@ -34248,35 +34355,33 @@ function createSoldermaskTextureForLayer({
       ctx.beginPath();
       ctx.arc(canvasX, canvasY, canvasRadius, 0, 2 * Math.PI);
       ctx.fill();
-    } 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") {
+    } else if ((holeShape === "pill" || 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;
-      const rotation2 = (hole.ccw_rotation || 0) * (Math.PI / 180);
-      ctx.save();
-      ctx.translate(canvasX, canvasY);
+      let rotation2 = (hole.ccw_rotation || 0) * (Math.PI / 180);
       if (layer === "bottom") {
-        ctx.rotate(-rotation2);
-      } else {
+        rotation2 = -rotation2;
+      }
+      if (rotation2) {
+        ctx.save();
+        ctx.translate(canvasX, canvasY);
         ctx.rotate(rotation2);
+        ctx.beginPath();
+        ctx.roundRect(-width10 / 2, -height10 / 2, width10, height10, radius);
+        ctx.fill();
+        ctx.restore();
+      } else {
+        ctx.beginPath();
+        ctx.roundRect(
+          canvasX - width10 / 2,
+          canvasY - height10 / 2,
+          width10,
+          height10,
+          radius
+        );
+        ctx.fill();
       }
-      ctx.beginPath();
-      ctx.roundRect(-width10 / 2, -height10 / 2, width10, height10, radius);
-      ctx.fill();
-      ctx.restore();
     }
   });
   const pcbCopperPours = su13(circuitJson).pcb_copper_pour.list();
@@ -34304,6 +34409,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.457",
+  "version": "0.0.459",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",