@tscircuit/3d-viewer 0.0.453 → 0.0.455

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.452",
+  version: "0.0.454",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -33651,6 +33651,22 @@ function processViasForManifold(Manifold, circuitJson, pcbThickness, manifoldIns
 var import_text2 = __toESM(require_text(), 1);
 import * as THREE23 from "three";
 import { su as su12 } from "@tscircuit/circuit-json-util";
+function parseFabricationNoteColor(colorString) {
+  let hex = colorString;
+  if (hex.startsWith("#")) {
+    hex = hex.slice(1);
+  }
+  if (hex.length === 6) {
+    const r = parseInt(hex.slice(0, 2), 16);
+    const g = parseInt(hex.slice(2, 4), 16);
+    const b = parseInt(hex.slice(4, 6), 16);
+    return `rgb(${r}, ${g}, ${b})`;
+  }
+  if (colorString.startsWith("rgb")) {
+    return colorString;
+  }
+  return "rgb(255, 243, 204)";
+}
 function createSilkscreenTextureForLayer({
   layer,
   circuitJson,
@@ -33663,12 +33679,16 @@ function createSilkscreenTextureForLayer({
   const pcbSilkscreenLines = su12(circuitJson).pcb_silkscreen_line.list();
   const pcbSilkscreenRects = su12(circuitJson).pcb_silkscreen_rect.list();
   const pcbSilkscreenCircles = su12(circuitJson).pcb_silkscreen_circle.list();
+  const pcbFabricationNoteRects = su12(circuitJson).pcb_fabrication_note_rect.list();
   const textsOnLayer = pcbSilkscreenTexts.filter((t) => t.layer === layer);
   const pathsOnLayer = pcbSilkscreenPaths.filter((p) => p.layer === layer);
   const linesOnLayer = pcbSilkscreenLines.filter((l) => l.layer === layer);
   const rectsOnLayer = pcbSilkscreenRects.filter((r) => r.layer === layer);
   const circlesOnLayer = pcbSilkscreenCircles.filter((c) => c.layer === layer);
-  if (textsOnLayer.length === 0 && pathsOnLayer.length === 0 && linesOnLayer.length === 0 && rectsOnLayer.length === 0 && circlesOnLayer.length === 0) {
+  const fabricationNoteRectsOnLayer = pcbFabricationNoteRects.filter(
+    (r) => r.layer === layer
+  );
+  if (textsOnLayer.length === 0 && pathsOnLayer.length === 0 && linesOnLayer.length === 0 && rectsOnLayer.length === 0 && circlesOnLayer.length === 0 && fabricationNoteRectsOnLayer.length === 0) {
     return null;
   }
   const canvas = document.createElement("canvas");
@@ -33819,6 +33839,89 @@ function createSilkscreenTextureForLayer({
     }
     ctx.restore();
   });
+  fabricationNoteRectsOnLayer.forEach((rect) => {
+    const width10 = coerceDimensionToMm(rect.width, 0);
+    const height10 = coerceDimensionToMm(rect.height, 0);
+    if (width10 <= 0 || height10 <= 0) return;
+    const centerXmm = parseDimensionToMm(rect.center?.x) ?? 0;
+    const centerYmm = parseDimensionToMm(rect.center?.y) ?? 0;
+    const canvasCenterX = canvasXFromPcb(centerXmm);
+    const canvasCenterY = canvasYFromPcb(centerYmm);
+    const rawRadius = extractRectBorderRadius(rect);
+    const borderRadiusInput = typeof rawRadius === "string" ? parseDimensionToMm(rawRadius) : rawRadius;
+    const borderRadiusMm = clampRectBorderRadius(
+      width10,
+      height10,
+      borderRadiusInput
+    );
+    ctx.save();
+    ctx.translate(canvasCenterX, canvasCenterY);
+    const halfWidthPx = width10 / 2 * traceTextureResolution;
+    const halfHeightPx = height10 / 2 * traceTextureResolution;
+    const borderRadiusPx = Math.min(
+      borderRadiusMm * traceTextureResolution,
+      halfWidthPx,
+      halfHeightPx
+    );
+    const hasStroke = rect.has_stroke ?? false;
+    const isFilled = rect.is_filled ?? true;
+    const isDashed = rect.is_stroke_dashed ?? false;
+    const strokeWidthPx = hasStroke ? coerceDimensionToMm(rect.stroke_width, 0.1) * traceTextureResolution : 0;
+    let fillColor = silkscreenColor;
+    let strokeColor = silkscreenColor;
+    if (rect.color) {
+      const parsedColor = parseFabricationNoteColor(rect.color);
+      fillColor = parsedColor;
+      strokeColor = parsedColor;
+    } else {
+      fillColor = "rgb(255, 243, 204)";
+      strokeColor = "rgb(255, 243, 204)";
+    }
+    const drawRoundedRectPath = (x, y, rectWidth, rectHeight, radius) => {
+      ctx.beginPath();
+      if (radius <= 0) {
+        ctx.rect(x, y, rectWidth, rectHeight);
+      } else {
+        const r = radius;
+        const right = x + rectWidth;
+        const bottom = y + rectHeight;
+        ctx.moveTo(x + r, y);
+        ctx.lineTo(right - r, y);
+        ctx.quadraticCurveTo(right, y, right, y + r);
+        ctx.lineTo(right, bottom - r);
+        ctx.quadraticCurveTo(right, bottom, right - r, bottom);
+        ctx.lineTo(x + r, bottom);
+        ctx.quadraticCurveTo(x, bottom, x, bottom - r);
+        ctx.lineTo(x, y + r);
+        ctx.quadraticCurveTo(x, y, x + r, y);
+        ctx.closePath();
+      }
+    };
+    drawRoundedRectPath(
+      -halfWidthPx,
+      -halfHeightPx,
+      halfWidthPx * 2,
+      halfHeightPx * 2,
+      borderRadiusPx
+    );
+    if (isFilled) {
+      ctx.fillStyle = fillColor;
+      ctx.fill();
+    }
+    if (hasStroke && strokeWidthPx > 0) {
+      ctx.strokeStyle = strokeColor;
+      ctx.lineWidth = strokeWidthPx;
+      if (isDashed) {
+        const dashLength = Math.max(strokeWidthPx * 2, 1);
+        ctx.setLineDash([dashLength, dashLength]);
+      }
+      ctx.stroke();
+      if (isDashed) {
+        ctx.setLineDash([]);
+      }
+    }
+    ctx.restore();
+  });
   textsOnLayer.forEach((textS) => {
     const fontSize = textS.font_size || 0.25;
     const textStrokeWidth = Math.min(Math.max(0.01, fontSize * 0.1), fontSize * 0.05) * traceTextureResolution;
@@ -34016,15 +34119,29 @@ function createSoldermaskTextureForLayer({
       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;
-      ctx.beginPath();
-      ctx.roundRect(
-        canvasX - width10 / 2,
-        canvasY - height10 / 2,
-        width10,
-        height10,
-        radius
-      );
-      ctx.fill();
+      let rotation2 = hole.ccw_rotation || 0;
+      if (rotation2) {
+        rotation2 = -rotation2;
+      }
+      if (rotation2) {
+        ctx.save();
+        ctx.translate(canvasX, canvasY);
+        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(
+          canvasX - width10 / 2,
+          canvasY - height10 / 2,
+          width10,
+          height10,
+          radius
+        );
+        ctx.fill();
+      }
     }
   });
   const pcbHoles = su13(circuitJson).pcb_hole.list();

package/package.json

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