@tscircuit/3d-viewer 0.0.554 → 0.0.556

package/dist/index.js

@@ -31985,7 +31985,7 @@ import * as THREE20 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.553",
+  version: "0.0.555",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -32015,7 +32015,7 @@ var package_default = {
     "@jscad/regl-renderer": "^2.6.12",
     "@jscad/stl-serializer": "^2.1.20",
     "circuit-json": "^0.0.407",
-    "circuit-to-canvas": "^0.0.97",
+    "circuit-to-canvas": "^0.0.100",
     "react-hot-toast": "^2.6.0",
     three: "^0.165.0",
     "three-stdlib": "^2.36.0",
@@ -33975,7 +33975,6 @@ var BOARD_CLIP_Z_MARGIN = 1;
 var BOARD_CLIP_XY_OUTSET = 0.05;
 var buildStateOrder = [
   "initializing",
-  "processing_copper_pours",
   "processing_plated_holes",
   "processing_holes",
   "processing_cutouts",
@@ -33993,7 +33992,6 @@ var BoardGeomBuilder = class {
   platedHoleGeoms = [];
   viaGeoms = [];
   // Combined with platedHoleGeoms
-  copperPourGeoms = [];
   boardClipGeom = null;
   state = "initializing";
   currentIndex = 0;
@@ -34062,7 +34060,7 @@ var BoardGeomBuilder = class {
         center: [this.board.center.x, this.board.center.y, 0]
       });
     }
-    this.state = "processing_copper_pours";
+    this.state = "processing_plated_holes";
     this.currentIndex = 0;
   }
   goToNextState() {
@@ -34093,9 +34091,6 @@ var BoardGeomBuilder = class {
             this.goToNextState();
           }
           break;
-        case "processing_copper_pours":
-          this.goToNextState();
-          break;
         case "processing_vias":
           if (this.currentIndex < this.pcb_vias.length) {
             this.processVia(this.pcb_vias[this.currentIndex]);
@@ -34490,8 +34485,7 @@ var BoardGeomBuilder = class {
     this.finalGeoms = [
       this.boardGeom,
       ...this.platedHoleGeoms,
-      ...this.viaGeoms,
-      ...this.copperPourGeoms
+      ...this.viaGeoms
     ];
     if (this.onCompleteCallback) {
       this.onCompleteCallback(this.finalGeoms);
@@ -35292,8 +35286,8 @@ function createCopperTextTextureForLayer({
 }
 
 // src/textures/create-copper-pour-texture-for-layer.ts
-import * as THREE27 from "three";
 import { CircuitToCanvasDrawer as CircuitToCanvasDrawer4 } from "circuit-to-canvas";
+import * as THREE27 from "three";
 var toRgb = (colorArr) => {
   const [r = 0, g = 0, b = 0] = colorArr;
   return `rgb(${Math.round(r * 255)}, ${Math.round(g * 255)}, ${Math.round(
@@ -35314,6 +35308,16 @@ function createCopperPourTextureForLayer({
   const pcbRenderLayer = layer === "top" ? "top_copper" : "bottom_copper";
   const poursOnLayer = copperPours.filter((p) => p.layer === layer);
   if (poursOnLayer.length === 0) return null;
+  const holes = circuitJson.filter((e) => e.type === "pcb_hole");
+  const platedHolesOnLayer = circuitJson.filter((e) => {
+    if (e.type !== "pcb_plated_hole") return false;
+    return !Array.isArray(e.layers) || e.layers.includes(layer);
+  });
+  const viasOnLayer = circuitJson.filter((e) => {
+    if (e.type !== "pcb_via") return false;
+    return !Array.isArray(e.layers) || e.layers.includes(layer);
+  });
+  const drillElements = [...holes, ...platedHolesOnLayer, ...viasOnLayer];
   const boardOutlineBounds = calculateOutlineBounds(boardData);
   const canvas = document.createElement("canvas");
   const canvasWidth = Math.floor(
@@ -35335,6 +35339,7 @@ function createCopperPourTextureForLayer({
   const uncoveredColor = copperColor;
   const setColorAndDraw = (pours, copperPourColor) => {
     if (pours.length === 0) return;
+    const elementsToDraw = [...pours, ...drillElements];
     const drawer = new CircuitToCanvasDrawer4(ctx);
     drawer.configure({
       colorOverrides: {
@@ -35376,14 +35381,14 @@ function createCopperPourTextureForLayer({
       minY: boardOutlineBounds.minY,
       maxY: boardOutlineBounds.maxY
     });
-    drawer.drawElements(pours, {
+    drawer.drawElements(elementsToDraw, {
       layers: [pcbRenderLayer],
       drawSoldermask: false,
       drawSoldermaskTop: false,
       drawSoldermaskBottom: false
     });
     for (let i = 1; i < COPPER_POUR_OPACITY_COMPENSATION_PASSES; i += 1) {
-      drawer.drawElements(pours, {
+      drawer.drawElements(elementsToDraw, {
         layers: [pcbRenderLayer],
         drawSoldermask: false,
         drawSoldermaskTop: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.554",
+  "version": "0.0.556",
   "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.407",
-    "circuit-to-canvas": "^0.0.97",
+    "circuit-to-canvas": "^0.0.100",
     "react-hot-toast": "^2.6.0",
     "three": "^0.165.0",
     "three-stdlib": "^2.36.0",