@tscircuit/3d-viewer 0.0.586 → 0.0.588

package/dist/index.js

@@ -32710,7 +32710,7 @@ import * as THREE23 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.585",
+  version: "0.0.587",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -32740,7 +32740,7 @@ var package_default = {
     "@jscad/regl-renderer": "^2.6.12",
     "@jscad/stl-serializer": "^2.1.20",
     "circuit-json": "^0.0.465",
-    "circuit-to-canvas": "^0.0.118",
+    "circuit-to-canvas": "^0.0.119",
     "react-hot-toast": "^2.6.0",
     three: "^0.165.0",
     "three-stdlib": "^2.36.0",
@@ -33725,6 +33725,7 @@ var REFERENCE_OBJECT_SPECS = {
   }
 };
 var REFERENCE_OBJECT_OPTIONS = Object.values(REFERENCE_OBJECT_SPECS);
+var REFERENCE_OBJECT_MENU_OPTIONS = [{ type: null, label: "None" }, ...REFERENCE_OBJECT_OPTIONS];
 var toggleReferenceObject = (current, selected) => current === selected ? null : selected;
 var safeDimension = (dimension) => Number.isFinite(dimension) ? Math.max(dimension ?? 0, 0) : 0;
 var safeCoordinate = (coordinate) => Number.isFinite(coordinate) ? coordinate ?? 0 : 0;
@@ -37223,6 +37224,7 @@ var drawSilkscreenLayer = ({
   layer,
   bounds,
   elements,
+  apertureElements,
   silkscreenColor
 }) => {
   const renderLayer = layer === "top" ? "top_silkscreen" : "bottom_silkscreen";
@@ -37273,8 +37275,9 @@ var drawSilkscreenLayer = ({
     }
   });
   setDrawerBounds5(drawer, bounds);
-  drawer.drawElements(elements, {
-    layers: [renderLayer]
+  drawer.drawElements([...elements, ...apertureElements], {
+    layers: [renderLayer],
+    clearDrillHoles: true
   });
 };
 
@@ -37284,17 +37287,31 @@ var isSilkscreenElement = (element, layer) => {
   const elementType = element.type;
   return elementType.startsWith("pcb_silkscreen_");
 };
+var isOpenSurfaceAperture = (element, soldermaskVisible) => {
+  if (element.type === "pcb_cutout") return true;
+  if (element.type === "pcb_via") {
+    return !soldermaskVisible || element.is_tented !== true;
+  }
+  if (element.type === "pcb_hole" || element.type === "pcb_plated_hole") {
+    return !soldermaskVisible || element.is_covered_with_solder_mask !== true;
+  }
+  return false;
+};
 function createSilkscreenTextureForLayer({
   layer,
   circuitJson,
   boardData,
   traceTextureResolution = TRACE_TEXTURE_RESOLUTION,
-  silkscreenColor = "rgb(255,255,255)"
+  silkscreenColor = "rgb(255,255,255)",
+  soldermaskVisible = true
 }) {
   const elements = circuitJson.filter(
     (element) => isSilkscreenElement(element, layer)
   );
   if (elements.length === 0) return null;
+  const apertureElements = circuitJson.filter(
+    (element) => isOpenSurfaceAperture(element, soldermaskVisible)
+  );
   const bounds = getSoldermaskRenderBounds(circuitJson, boardData);
   const canvasWidth = Math.floor(bounds.width * traceTextureResolution);
   const canvasHeight = Math.floor(bounds.height * traceTextureResolution);
@@ -37313,6 +37330,7 @@ function createSilkscreenTextureForLayer({
     layer,
     bounds,
     elements,
+    apertureElements,
     silkscreenColor
   });
   const texture = new THREE33.CanvasTexture(canvas);
@@ -37766,7 +37784,8 @@ function createCombinedBoardTextures({
       circuitJson,
       boardData,
       silkscreenColor,
-      traceTextureResolution
+      traceTextureResolution,
+      soldermaskVisible: showMask
     }) : null;
     const fabricationNoteTexture = showSilkscreen ? createFabricationNoteTextureForLayer({
       layer,
@@ -47321,28 +47340,31 @@ var ContextMenu = ({
                     style: { ...contentStyles2, marginLeft: -2 },
                     collisionPadding: 10,
                     avoidCollisions: true,
-                    children: REFERENCE_OBJECT_OPTIONS.map((option) => /* @__PURE__ */ jsxs8(
-                      Item22,
-                      {
-                        style: {
-                          ...itemStyles2,
-                          backgroundColor: hoveredItem === option.type ? "#404040" : "transparent"
-                        },
-                        onSelect: (event) => event.preventDefault(),
-                        onPointerDown: (event) => {
-                          event.preventDefault();
-                          onReferenceObjectSelect(option.type);
+                    children: REFERENCE_OBJECT_MENU_OPTIONS.map((option) => {
+                      const optionKey = option.type ?? "none";
+                      return /* @__PURE__ */ jsxs8(
+                        Item22,
+                        {
+                          style: {
+                            ...itemStyles2,
+                            backgroundColor: hoveredItem === optionKey ? "#404040" : "transparent"
+                          },
+                          onSelect: (event) => event.preventDefault(),
+                          onPointerDown: (event) => {
+                            event.preventDefault();
+                            onReferenceObjectSelect(option.type);
+                          },
+                          onMouseEnter: () => setHoveredItem(optionKey),
+                          onMouseLeave: () => setHoveredItem(null),
+                          onTouchStart: () => setHoveredItem(optionKey),
+                          children: [
+                            /* @__PURE__ */ jsx34("span", { style: iconContainerStyles2, children: referenceObject === option.type && /* @__PURE__ */ jsx34(DotIcon, {}) }),
+                            /* @__PURE__ */ jsx34("span", { style: { display: "flex", alignItems: "center" }, children: option.label })
+                          ]
                         },
-                        onMouseEnter: () => setHoveredItem(option.type),
-                        onMouseLeave: () => setHoveredItem(null),
-                        onTouchStart: () => setHoveredItem(option.type),
-                        children: [
-                          /* @__PURE__ */ jsx34("span", { style: iconContainerStyles2, children: referenceObject === option.type && /* @__PURE__ */ jsx34(DotIcon, {}) }),
-                          /* @__PURE__ */ jsx34("span", { style: { display: "flex", alignItems: "center" }, children: option.label })
-                        ]
-                      },
-                      option.type
-                    ))
+                        optionKey
+                      );
+                    })
                   }
                 ) })
               ] }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.586",
+  "version": "0.0.588",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",
@@ -30,7 +30,7 @@
     "@jscad/regl-renderer": "^2.6.12",
     "@jscad/stl-serializer": "^2.1.20",
     "circuit-json": "^0.0.465",
-    "circuit-to-canvas": "^0.0.118",
+    "circuit-to-canvas": "^0.0.119",
     "react-hot-toast": "^2.6.0",
     "three": "^0.165.0",
     "three-stdlib": "^2.36.0",