@tscircuit/3d-viewer 0.0.587 → 0.0.589

package/dist/index.js

@@ -31613,8 +31613,7 @@ var JscadModel = ({
 };
 
 // src/hooks/use-global-obj-loader.ts
-import { useState as useState5, useEffect as useEffect9 } from "react";
-import { MTLLoader, OBJLoader } from "three-stdlib";
+import { useEffect as useEffect9, useState as useState5 } from "react";
 
 // src/utils/vrml.ts
 import { VRMLLoader } from "three-stdlib";
@@ -31636,6 +31635,7 @@ async function loadVrml(url) {
 }
 
 // src/hooks/use-global-obj-loader.ts
+import { MTLLoader, OBJLoader } from "three-stdlib";
 if (typeof window !== "undefined" && !window.TSCIRCUIT_OBJ_LOADER_CACHE) {
   window.TSCIRCUIT_OBJ_LOADER_CACHE = /* @__PURE__ */ new Map();
 }
@@ -31661,19 +31661,13 @@ function useGlobalObjLoader(url) {
         const mtlContentArr = text.match(/newmtl[\s\S]*?endmtl/g);
         const objLoader = new OBJLoader();
         if (mtlContentArr?.length) {
-          const mtlContent = mtlContentArr.join("\n").replace(/d 0\./g, "d 1.");
+          const mtlContent = mtlContentArr.join("\n").replace(/^d\s+0\./gm, "d 1.");
           const objContent = text.replace(/newmtl[\s\S]*?endmtl/g, "").replace(/^mtllib.*/gm, "");
           const mtlLoader = new MTLLoader();
           mtlLoader.setMaterialOptions({
             invertTrProperty: true
           });
-          const materials = mtlLoader.parse(
-            mtlContent.replace(
-              /Kd\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)/g,
-              "Kd $2 $2 $2"
-            ),
-            "embedded.mtl"
-          );
+          const materials = mtlLoader.parse(mtlContent, "embedded.mtl");
           objLoader.setMaterials(materials);
           return objLoader.parse(objContent);
         }
@@ -32710,7 +32704,7 @@ import * as THREE23 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.586",
+  version: "0.0.588",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -32740,7 +32734,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",
@@ -37224,6 +37218,7 @@ var drawSilkscreenLayer = ({
   layer,
   bounds,
   elements,
+  apertureElements,
   silkscreenColor
 }) => {
   const renderLayer = layer === "top" ? "top_silkscreen" : "bottom_silkscreen";
@@ -37274,8 +37269,9 @@ var drawSilkscreenLayer = ({
     }
   });
   setDrawerBounds5(drawer, bounds);
-  drawer.drawElements(elements, {
-    layers: [renderLayer]
+  drawer.drawElements([...elements, ...apertureElements], {
+    layers: [renderLayer],
+    clearDrillHoles: true
   });
 };
 
@@ -37285,17 +37281,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);
@@ -37314,6 +37324,7 @@ function createSilkscreenTextureForLayer({
     layer,
     bounds,
     elements,
+    apertureElements,
     silkscreenColor
   });
   const texture = new THREE33.CanvasTexture(canvas);
@@ -37767,7 +37778,8 @@ function createCombinedBoardTextures({
       circuitJson,
       boardData,
       silkscreenColor,
-      traceTextureResolution
+      traceTextureResolution,
+      soldermaskVisible: showMask
     }) : null;
     const fabricationNoteTexture = showSilkscreen ? createFabricationNoteTextureForLayer({
       layer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.587",
+  "version": "0.0.589",
   "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",