@tscircuit/3d-viewer 0.0.461 → 0.0.463

package/dist/index.d.ts

@@ -75,6 +75,8 @@ interface ManifoldGeoms {
 interface ManifoldTextures {
     topTrace?: THREE.CanvasTexture | null;
     bottomTrace?: THREE.CanvasTexture | null;
+    topTraceWithMask?: THREE.CanvasTexture | null;
+    bottomTraceWithMask?: THREE.CanvasTexture | null;
     topSilkscreen?: THREE.CanvasTexture | null;
     bottomSilkscreen?: THREE.CanvasTexture | null;
     topSoldermask?: THREE.CanvasTexture | null;

package/dist/index.js

@@ -1129,13 +1129,13 @@ var require_squaredLength = __commonJS({
 var require_subtract = __commonJS({
   "node_modules/@jscad/modeling/src/maths/vec3/subtract.js"(exports, module) {
     "use strict";
-    var subtract6 = (out, a, b) => {
+    var subtract7 = (out, a, b) => {
       out[0] = a[0] - b[0];
       out[1] = a[1] - b[1];
       out[2] = a[2] - b[2];
       return out;
     };
-    module.exports = subtract6;
+    module.exports = subtract7;
   }
 });
 
@@ -1676,7 +1676,7 @@ var require_scale2 = __commonJS({
 var require_subtract2 = __commonJS({
   "node_modules/@jscad/modeling/src/maths/mat4/subtract.js"(exports, module) {
     "use strict";
-    var subtract6 = (out, a, b) => {
+    var subtract7 = (out, a, b) => {
       out[0] = a[0] - b[0];
       out[1] = a[1] - b[1];
       out[2] = a[2] - b[2];
@@ -1695,7 +1695,7 @@ var require_subtract2 = __commonJS({
       out[15] = a[15] - b[15];
       return out;
     };
-    module.exports = subtract6;
+    module.exports = subtract7;
   }
 });
 
@@ -1712,7 +1712,7 @@ var require_toString2 = __commonJS({
 var require_translate = __commonJS({
   "node_modules/@jscad/modeling/src/maths/mat4/translate.js"(exports, module) {
     "use strict";
-    var translate10 = (out, matrix, offsets) => {
+    var translate11 = (out, matrix, offsets) => {
       const x = offsets[0];
       const y = offsets[1];
       const z135 = offsets[2];
@@ -1765,7 +1765,7 @@ var require_translate = __commonJS({
       }
       return out;
     };
-    module.exports = translate10;
+    module.exports = translate11;
   }
 });
 
@@ -2205,12 +2205,12 @@ var require_squaredLength2 = __commonJS({
 var require_subtract3 = __commonJS({
   "node_modules/@jscad/modeling/src/maths/vec2/subtract.js"(exports, module) {
     "use strict";
-    var subtract6 = (out, a, b) => {
+    var subtract7 = (out, a, b) => {
       out[0] = a[0] - b[0];
       out[1] = a[1] - b[1];
       return out;
     };
-    module.exports = subtract6;
+    module.exports = subtract7;
   }
 });
 
@@ -2671,14 +2671,14 @@ var require_point_line_distance = __commonJS({
   "node_modules/@jscad/modeling/src/operations/hulls/quickhull/point-line-distance.js"(exports, module) {
     "use strict";
     var cross = require_cross();
-    var subtract6 = require_subtract();
+    var subtract7 = require_subtract();
     var squaredLength = require_squaredLength();
     var distanceSquared = (p, a, b) => {
       const ab = [];
       const ap = [];
       const cr = [];
-      subtract6(ab, b, a);
-      subtract6(ap, p, a);
+      subtract7(ab, b, a);
+      subtract7(ap, p, a);
       const area = squaredLength(cross(cr, ap, ab));
       const s = squaredLength(ab);
       if (s === 0) {
@@ -2697,11 +2697,11 @@ var require_get_plane_normal = __commonJS({
     "use strict";
     var cross = require_cross();
     var normalize = require_normalize();
-    var subtract6 = require_subtract();
+    var subtract7 = require_subtract();
     var planeNormal = (out, point1, point2, point32) => {
       const tmp = [0, 0, 0];
-      subtract6(out, point1, point2);
-      subtract6(tmp, point2, point32);
+      subtract7(out, point1, point2);
+      subtract7(tmp, point2, point32);
       cross(out, out, tmp);
       return normalize(out, out);
     };
@@ -2915,7 +2915,7 @@ var require_Face = __commonJS({
     var length2 = require_length();
     var normalize = require_normalize();
     var scale3 = require_scale();
-    var subtract6 = require_subtract();
+    var subtract7 = require_subtract();
     var HalfEdge = require_HalfEdge();
     var VISIBLE = 0;
     var NON_CONVEX = 1;
@@ -2949,14 +2949,14 @@ var require_Face = __commonJS({
         const e0 = this.edge;
         const e1 = e0.next;
         let e2 = e1.next;
-        const v2 = subtract6([], e1.head().point, e0.head().point);
+        const v2 = subtract7([], e1.head().point, e0.head().point);
         const t = [];
         const v1 = [];
         this.nVertices = 2;
         this.normal = [0, 0, 0];
         while (e2 !== e0) {
           copy(v1, v2);
-          subtract6(v2, e2.head().point, e0.head().point);
+          subtract7(v2, e2.head().point, e0.head().point);
           add(this.normal, this.normal, cross(t, v1, v2));
           e2 = e2.next;
           this.nVertices += 1;
@@ -2980,7 +2980,7 @@ var require_Face = __commonJS({
           } while (edge !== this.edge);
           const p1 = maxEdge.tail().point;
           const p2 = maxEdge.head().point;
-          const maxVector = subtract6([], p2, p1);
+          const maxVector = subtract7([], p2, p1);
           const maxLength = Math.sqrt(maxSquaredLength);
           scale3(maxVector, maxVector, 1 / maxLength);
           const maxProjection = dot(this.normal, maxVector);
@@ -7745,7 +7745,7 @@ var require_cylinder = __commonJS({
     var geom3 = require_geom3();
     var cylinderElliptic = require_cylinderElliptic();
     var { isGTE } = require_commonChecks();
-    var cylinder4 = (options) => {
+    var cylinder5 = (options) => {
       const defaults = {
         center: [0, 0, 0],
         height: 2,
@@ -7764,7 +7764,7 @@ var require_cylinder = __commonJS({
       };
       return cylinderElliptic(newoptions);
     };
-    module.exports = cylinder4;
+    module.exports = cylinder5;
   }
 });
 
@@ -8285,7 +8285,7 @@ var require_roundedCylinder = __commonJS({
     var poly3 = require_poly3();
     var { sin: sin2, cos: cos2 } = require_trigonometry();
     var { isGTE, isNumberArray } = require_commonChecks();
-    var cylinder4 = require_cylinder();
+    var cylinder5 = require_cylinder();
     var roundedCylinder = (options) => {
       const defaults = {
         center: [0, 0, 0],
@@ -8302,7 +8302,7 @@ var require_roundedCylinder = __commonJS({
       if (roundRadius > radius) throw new Error("roundRadius must be smaller than the radius");
       if (!isGTE(segments, 4)) throw new Error("segments must be four or more");
       if (height10 === 0 || radius === 0) return geom3.create();
-      if (roundRadius === 0) return cylinder4({ center, height: height10, radius });
+      if (roundRadius === 0) return cylinder5({ center, height: height10, radius });
       const start = [0, 0, -(height10 / 2)];
       const end = [0, 0, height10 / 2];
       const direction = vec3.subtract(vec3.create(), end, start);
@@ -9746,7 +9746,7 @@ var require_translate2 = __commonJS({
     var geom2 = require_geom2();
     var geom3 = require_geom3();
     var path2 = require_path2();
-    var translate10 = (offset4, ...objects) => {
+    var translate11 = (offset4, ...objects) => {
       if (!Array.isArray(offset4)) throw new Error("offset must be an array");
       objects = flatten(objects);
       if (objects.length === 0) throw new Error("wrong number of arguments");
@@ -9761,11 +9761,11 @@ var require_translate2 = __commonJS({
       });
       return results.length === 1 ? results[0] : results;
     };
-    var translateX = (offset4, ...objects) => translate10([offset4, 0, 0], objects);
-    var translateY = (offset4, ...objects) => translate10([0, offset4, 0], objects);
-    var translateZ = (offset4, ...objects) => translate10([0, 0, offset4], objects);
+    var translateX = (offset4, ...objects) => translate11([offset4, 0, 0], objects);
+    var translateY = (offset4, ...objects) => translate11([0, offset4, 0], objects);
+    var translateZ = (offset4, ...objects) => translate11([0, 0, offset4], objects);
     module.exports = {
-      translate: translate10,
+      translate: translate11,
       translateX,
       translateY,
       translateZ
@@ -9780,7 +9780,7 @@ var require_torus = __commonJS({
     var { TAU } = require_constants();
     var extrudeRotate = require_extrudeRotate();
     var { rotate: rotate3 } = require_rotate3();
-    var { translate: translate10 } = require_translate2();
+    var { translate: translate11 } = require_translate2();
     var circle2 = require_circle();
     var { isGT, isGTE } = require_commonChecks();
     var torus = (options) => {
@@ -9805,7 +9805,7 @@ var require_torus = __commonJS({
       if (innerRotation !== 0) {
         innerCircle = rotate3([0, 0, innerRotation], innerCircle);
       }
-      innerCircle = translate10([outerRadius, 0], innerCircle);
+      innerCircle = translate11([outerRadius, 0], innerCircle);
       const extrudeOptions = {
         startAngle,
         angle: outerRotation,
@@ -11612,7 +11612,7 @@ var require_subtractGeom3 = __commonJS({
     var flatten = require_flatten();
     var retessellate = require_retessellate();
     var subtractSub = require_subtractGeom3Sub();
-    var subtract6 = (...geometries) => {
+    var subtract7 = (...geometries) => {
       geometries = flatten(geometries);
       let newgeometry = geometries.shift();
       geometries.forEach((geometry) => {
@@ -11621,7 +11621,7 @@ var require_subtractGeom3 = __commonJS({
       newgeometry = retessellate(newgeometry);
       return newgeometry;
     };
-    module.exports = subtract6;
+    module.exports = subtract7;
   }
 });
 
@@ -11635,14 +11635,14 @@ var require_subtractGeom2 = __commonJS({
     var fromFakePolygons = require_fromFakePolygons();
     var to3DWalls = require_to3DWalls();
     var subtractGeom3 = require_subtractGeom3();
-    var subtract6 = (...geometries) => {
+    var subtract7 = (...geometries) => {
       geometries = flatten(geometries);
       const newgeometries = geometries.map((geometry) => to3DWalls({ z0: -1, z1: 1 }, geometry));
       const newgeom3 = subtractGeom3(newgeometries);
       const epsilon = measureEpsilon(newgeom3);
       return fromFakePolygons(epsilon, geom3.toPolygons(newgeom3));
     };
-    module.exports = subtract6;
+    module.exports = subtract7;
   }
 });
 
@@ -11656,7 +11656,7 @@ var require_subtract4 = __commonJS({
     var geom3 = require_geom3();
     var subtractGeom2 = require_subtractGeom2();
     var subtractGeom3 = require_subtractGeom3();
-    var subtract6 = (...geometries) => {
+    var subtract7 = (...geometries) => {
       geometries = flatten(geometries);
       if (geometries.length === 0) throw new Error("wrong number of arguments");
       if (!areAllShapesTheSameType(geometries)) {
@@ -11667,7 +11667,7 @@ var require_subtract4 = __commonJS({
       if (geom3.isA(geometry)) return subtractGeom3(geometries);
       return geometry;
     };
-    module.exports = subtract6;
+    module.exports = subtract7;
   }
 });
 
@@ -11709,7 +11709,7 @@ var require_unionGeom3 = __commonJS({
     var flatten = require_flatten();
     var retessellate = require_retessellate();
     var unionSub = require_unionGeom3Sub();
-    var union5 = (...geometries) => {
+    var union6 = (...geometries) => {
       geometries = flatten(geometries);
       let i;
       for (i = 1; i < geometries.length; i += 2) {
@@ -11719,7 +11719,7 @@ var require_unionGeom3 = __commonJS({
       newgeometry = retessellate(newgeometry);
       return newgeometry;
     };
-    module.exports = union5;
+    module.exports = union6;
   }
 });
 
@@ -11733,14 +11733,14 @@ var require_unionGeom2 = __commonJS({
     var fromFakePolygons = require_fromFakePolygons();
     var to3DWalls = require_to3DWalls();
     var unionGeom3 = require_unionGeom3();
-    var union5 = (...geometries) => {
+    var union6 = (...geometries) => {
       geometries = flatten(geometries);
       const newgeometries = geometries.map((geometry) => to3DWalls({ z0: -1, z1: 1 }, geometry));
       const newgeom3 = unionGeom3(newgeometries);
       const epsilon = measureEpsilon(newgeom3);
       return fromFakePolygons(epsilon, geom3.toPolygons(newgeom3));
     };
-    module.exports = union5;
+    module.exports = union6;
   }
 });
 
@@ -11754,7 +11754,7 @@ var require_union = __commonJS({
     var geom3 = require_geom3();
     var unionGeom2 = require_unionGeom2();
     var unionGeom3 = require_unionGeom3();
-    var union5 = (...geometries) => {
+    var union6 = (...geometries) => {
       geometries = flatten(geometries);
       if (geometries.length === 0) throw new Error("wrong number of arguments");
       if (!areAllShapesTheSameType(geometries)) {
@@ -11765,7 +11765,7 @@ var require_union = __commonJS({
       if (geom3.isA(geometry)) return unionGeom3(geometries);
       return geometry;
     };
-    module.exports = union5;
+    module.exports = union6;
   }
 });
 
@@ -12110,8 +12110,8 @@ var require_expandShell = __commonJS({
         endfacevertices.reverse();
         polygons2.push(poly3.create(startfacevertices));
         polygons2.push(poly3.create(endfacevertices));
-        const cylinder4 = geom3.create(polygons2);
-        result = unionGeom3Sub(result, cylinder4);
+        const cylinder5 = geom3.create(polygons2);
+        result = unionGeom3Sub(result, cylinder5);
       });
       vertices2planes.forEach((item) => {
         const vertex = item[0];
@@ -12155,7 +12155,7 @@ var require_expandGeom3 = __commonJS({
   "node_modules/@jscad/modeling/src/operations/expansions/expandGeom3.js"(exports, module) {
     "use strict";
     var geom3 = require_geom3();
-    var union5 = require_union();
+    var union6 = require_union();
     var expandShell = require_expandShell();
     var expandGeom3 = (options, geometry) => {
       const defaults = {
@@ -12171,7 +12171,7 @@ var require_expandGeom3 = __commonJS({
       if (polygons.length === 0) throw new Error("the given geometry cannot be empty");
       options = { delta, corners, segments };
       const expanded = expandShell(options, geometry);
-      return union5(geometry, expanded);
+      return union6(geometry, expanded);
     };
     module.exports = expandGeom3;
   }
@@ -12886,7 +12886,7 @@ var require_hullChain = __commonJS({
   "node_modules/@jscad/modeling/src/operations/hulls/hullChain.js"(exports, module) {
     "use strict";
     var flatten = require_flatten();
-    var union5 = require_union();
+    var union6 = require_union();
     var hull = require_hull();
     var hullChain = (...geometries) => {
       geometries = flatten(geometries);
@@ -12895,7 +12895,7 @@ var require_hullChain = __commonJS({
       for (let i = 1; i < geometries.length; i++) {
         hulls.push(hull(geometries[i - 1], geometries[i]));
       }
-      return union5(hulls);
+      return union6(hulls);
     };
     module.exports = hullChain;
   }
@@ -13528,7 +13528,7 @@ var require_align = __commonJS({
     var flatten = require_flatten();
     var padArrayToLength = require_padArrayToLength();
     var measureAggregateBoundingBox = require_measureAggregateBoundingBox();
-    var { translate: translate10 } = require_translate2();
+    var { translate: translate11 } = require_translate2();
     var validateOptions = (options) => {
       if (!Array.isArray(options.modes) || options.modes.length > 3) throw new Error("align(): modes must be an array of length <= 3");
       options.modes = padArrayToLength(options.modes, "none", 3);
@@ -13565,7 +13565,7 @@ var require_align = __commonJS({
           translation[i] = relativeTo[i] - bounds[0][i];
         }
       }
-      return translate10(translation, geometry);
+      return translate11(translation, geometry);
     };
     var align = (options, ...geometries) => {
       const defaults = {
@@ -13602,7 +13602,7 @@ var require_center = __commonJS({
     var geom3 = require_geom3();
     var path2 = require_path2();
     var measureBoundingBox = require_measureBoundingBox2();
-    var { translate: translate10 } = require_translate2();
+    var { translate: translate11 } = require_translate2();
     var centerGeometry = (options, object) => {
       const defaults = {
         axes: [true, true, true],
@@ -13614,7 +13614,7 @@ var require_center = __commonJS({
       if (axes[0]) offset4[0] = relativeTo[0] - (bounds[0][0] + (bounds[1][0] - bounds[0][0]) / 2);
       if (axes[1]) offset4[1] = relativeTo[1] - (bounds[0][1] + (bounds[1][1] - bounds[0][1]) / 2);
       if (axes[2]) offset4[2] = relativeTo[2] - (bounds[0][2] + (bounds[1][2] - bounds[0][2]) / 2);
-      return translate10(offset4, object);
+      return translate11(offset4, object);
     };
     var center = (options, ...objects) => {
       const defaults = {
@@ -24526,7 +24526,7 @@ var m2host = (raw_params) => {
   }
   const centerX = (minX + maxX) / 2;
   const centerY = (minY + maxY) / 2;
-  const translate10 = (el) => {
+  const translate11 = (el) => {
     if (typeof el.x === "number") el.x -= centerX;
     if (typeof el.y === "number") el.y -= centerY;
     if (el.center) {
@@ -24540,9 +24540,9 @@ var m2host = (raw_params) => {
       }));
     }
   };
-  for (const pad2 of pads) translate10(pad2);
-  translate10(cutout);
-  translate10(pin1Marker);
+  for (const pad2 of pads) translate11(pad2);
+  translate11(cutout);
+  translate11(pin1Marker);
   return {
     circuitJson: [
       ...pads,
@@ -28509,7 +28509,7 @@ import * as THREE15 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.460",
+  version: "0.0.462",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -29716,22 +29716,29 @@ var BOARD_SURFACE_OFFSET = {
 };
 var colors = {
   copper: [0.9, 0.6, 0.2],
-  fr4Green: [0.04, 0.16, 0.08],
-  fr4GreenSolderWithMask: [0 / 255, 152 / 255, 19 / 255],
-  fr1Copper: [0.8, 0.4, 0.2],
-  fr1CopperSolderWithMask: [0.9, 0.6, 0.2]
+  fr4Tan: [0.6, 0.43, 0.28],
+  fr4SolderMaskGreen: [0.02, 0.1, 0.04],
+  fr4TracesWithMaskGreen: [0, 0.5, 0.25],
+  fr4TracesWithoutMaskTan: [0.6, 0.43, 0.28],
+  fr1Tan: [0.8, 0.4, 0.2],
+  fr1TracesWithMaskCopper: [0.9, 0.6, 0.2],
+  fr1SolderMaskGreen: [0.02, 0.1, 0.04]
 };
 var MANIFOLD_Z_OFFSET = 1e-3;
 var SMOOTH_CIRCLE_SEGMENTS = 32;
 var DEFAULT_SMT_PAD_THICKNESS = 0.035;
 var TRACE_TEXTURE_RESOLUTION = 50;
 var boardMaterialColors = {
-  fr1: colors.fr1Copper,
-  fr4: colors.fr4Green
+  fr1: colors.fr1Tan,
+  fr4: colors.fr4Tan
 };
 var tracesMaterialColors = {
-  fr1: colors.fr1CopperSolderWithMask,
-  fr4: colors.fr4GreenSolderWithMask
+  fr1: colors.fr1TracesWithMaskCopper,
+  fr4: colors.fr4TracesWithoutMaskTan
+};
+var soldermaskColors = {
+  fr1: colors.fr1SolderMaskGreen,
+  fr4: colors.fr4SolderMaskGreen
 };
 
 // src/geoms/create-board-with-outline.ts
@@ -29800,7 +29807,7 @@ var createSimplifiedBoardGeom = (circuitJson) => {
       center: [boardOrPanel.center.x, boardOrPanel.center.y, 0]
     });
   }
-  const material = boardMaterialColors["material" in boardOrPanel ? boardOrPanel.material ?? "fr4" : "fr4"] ?? colors.fr4Green;
+  const material = boardMaterialColors["material" in boardOrPanel ? boardOrPanel.material ?? "fr4" : "fr4"] ?? colors.fr4Tan;
   return [(0, import_colors.colorize)(material, boardGeom)];
 };
 var createBoardGeomFromCircuitJson = (circuitJson, opts = {}) => {
@@ -29814,10 +29821,10 @@ var createBoardGeomFromCircuitJson = (circuitJson, opts = {}) => {
 };
 
 // src/BoardGeomBuilder.ts
-var import_transforms9 = __toESM(require_transforms(), 1);
-var import_primitives10 = __toESM(require_primitives(), 1);
+var import_transforms10 = __toESM(require_transforms(), 1);
+var import_primitives11 = __toESM(require_primitives(), 1);
 var import_colors7 = __toESM(require_colors(), 1);
-var import_booleans6 = __toESM(require_booleans(), 1);
+var import_booleans7 = __toESM(require_booleans(), 1);
 import { su as su3 } from "@tscircuit/circuit-json-util";
 
 // src/geoms/plated-hole.ts
@@ -30974,6 +30981,75 @@ function createGeom2FromBRep(brep, arcSegments = 16) {
   return (0, import_booleans5.subtract)(outerGeom, innerGeoms);
 }
 
+// src/geoms/via-geoms.ts
+var import_booleans6 = __toESM(require_booleans(), 1);
+var import_transforms9 = __toESM(require_transforms(), 1);
+var import_primitives10 = __toESM(require_primitives(), 1);
+function createViaCopper({
+  x,
+  y,
+  outerDiameter,
+  holeDiameter,
+  thickness
+}) {
+  if (outerDiameter <= holeDiameter) {
+    throw new Error(
+      `Invalid via geometry: outerDiameter (${outerDiameter}) must be > holeDiameter (${holeDiameter})`
+    );
+  }
+  const padThickness = M;
+  const platingThickness = M;
+  const barrelRadius = Math.min(
+    outerDiameter / 2,
+    holeDiameter / 2 + platingThickness
+  );
+  const barrel = (0, import_primitives10.cylinder)({
+    center: [0, 0, 0],
+    radius: barrelRadius,
+    height: thickness,
+    segments: SMOOTH_CIRCLE_SEGMENTS
+  });
+  const topPad = (0, import_primitives10.cylinder)({
+    center: [0, 0, thickness / 2],
+    radius: outerDiameter / 2,
+    height: padThickness,
+    segments: SMOOTH_CIRCLE_SEGMENTS
+  });
+  const bottomPad = (0, import_primitives10.cylinder)({
+    center: [0, 0, -thickness / 2],
+    radius: outerDiameter / 2,
+    height: padThickness,
+    segments: SMOOTH_CIRCLE_SEGMENTS
+  });
+  const viaSolid = (0, import_booleans6.union)([barrel, topPad, bottomPad]);
+  const drillHeight = thickness + padThickness * 2;
+  const drill = (0, import_primitives10.cylinder)({
+    center: [0, 0, 0],
+    radius: holeDiameter / 2,
+    height: drillHeight,
+    segments: SMOOTH_CIRCLE_SEGMENTS
+  });
+  const finalViaCopper = (0, import_booleans6.subtract)(viaSolid, drill);
+  const positionedVia = (0, import_transforms9.translate)([x, y, 0], finalViaCopper);
+  return positionedVia;
+}
+function createViaBoardDrill({
+  x,
+  y,
+  holeDiameter,
+  thickness
+}) {
+  const drillHeight = thickness * 1.5;
+  const drillRadius = holeDiameter / 2 + M;
+  const drill = (0, import_primitives10.cylinder)({
+    center: [x, y, 0],
+    radius: drillRadius,
+    height: drillHeight,
+    segments: SMOOTH_CIRCLE_SEGMENTS
+  });
+  return drill;
+}
+
 // src/BoardGeomBuilder.ts
 var PAD_ROUNDED_SEGMENTS = 64;
 var BOARD_CLIP_Z_MARGIN = 1;
@@ -30981,15 +31057,15 @@ var BOARD_CLIP_XY_OUTSET = 0.05;
 var createCenteredRectPadGeom = (width10, height10, thickness, rectBorderRadius) => {
   const clampedRadius = clampRectBorderRadius(width10, height10, rectBorderRadius);
   if (clampedRadius <= 0) {
-    return (0, import_primitives10.cuboid)({ center: [0, 0, 0], size: [width10, height10, thickness] });
+    return (0, import_primitives11.cuboid)({ center: [0, 0, 0], size: [width10, height10, thickness] });
   }
-  const rect2d = (0, import_primitives10.roundedRectangle)({
+  const rect2d = (0, import_primitives11.roundedRectangle)({
     size: [width10, height10],
     roundRadius: clampedRadius,
     segments: PAD_ROUNDED_SEGMENTS
   });
   const extruded = (0, import_extrusions8.extrudeLinear)({ height: thickness }, rect2d);
-  return (0, import_transforms9.translate)([0, 0, -thickness / 2], extruded);
+  return (0, import_transforms10.translate)([0, 0, -thickness / 2], extruded);
 };
 var buildStateOrder = [
   "initializing",
@@ -31025,8 +31101,6 @@ var BoardGeomBuilder = class {
   pcb_copper_pours;
   boardGeom = null;
   platedHoleGeoms = [];
-  holeGeoms = [];
-  // Currently only used for subtraction
   padGeoms = [];
   traceGeoms = [];
   viaGeoms = [];
@@ -31116,11 +31190,11 @@ var BoardGeomBuilder = class {
         { xyOutset: BOARD_CLIP_XY_OUTSET }
       );
     } else {
-      this.boardGeom = (0, import_primitives10.cuboid)({
+      this.boardGeom = (0, import_primitives11.cuboid)({
         size: [this.board.width, this.board.height, this.ctx.pcbThickness],
         center: [this.board.center.x, this.board.center.y, 0]
       });
-      this.boardClipGeom = (0, import_primitives10.cuboid)({
+      this.boardClipGeom = (0, import_primitives11.cuboid)({
         size: [
           this.board.width + 2 * BOARD_CLIP_XY_OUTSET,
           this.board.height + 2 * BOARD_CLIP_XY_OUTSET,
@@ -31255,47 +31329,48 @@ var BoardGeomBuilder = class {
     let cutoutGeom = null;
     const cutoutHeight = this.ctx.pcbThickness * 1.5;
     switch (cutout.shape) {
-      case "rect":
+      case "rect": {
         const rectCornerRadius = clampRectBorderRadius(
           cutout.width,
           cutout.height,
           extractRectBorderRadius(cutout)
         );
         if (rectCornerRadius > 0) {
-          const rect2d = (0, import_primitives10.roundedRectangle)({
+          const rect2d = (0, import_primitives11.roundedRectangle)({
             size: [cutout.width, cutout.height],
             roundRadius: rectCornerRadius,
             segments: PAD_ROUNDED_SEGMENTS
           });
           cutoutGeom = (0, import_extrusions8.extrudeLinear)({ height: cutoutHeight }, rect2d);
-          cutoutGeom = (0, import_transforms9.translate)([0, 0, -cutoutHeight / 2], cutoutGeom);
-          cutoutGeom = (0, import_transforms9.translate)(
+          cutoutGeom = (0, import_transforms10.translate)([0, 0, -cutoutHeight / 2], cutoutGeom);
+          cutoutGeom = (0, import_transforms10.translate)(
             [cutout.center.x, cutout.center.y, 0],
             cutoutGeom
           );
         } else {
-          const baseCutoutGeom = (0, import_primitives10.cuboid)({
+          const baseCutoutGeom = (0, import_primitives11.cuboid)({
             center: [0, 0, 0],
             size: [cutout.width, cutout.height, cutoutHeight]
           });
-          cutoutGeom = (0, import_transforms9.translate)(
+          cutoutGeom = (0, import_transforms10.translate)(
             [cutout.center.x, cutout.center.y, 0],
             baseCutoutGeom
           );
         }
         if (cutout.rotation) {
           const rotationRadians = cutout.rotation * Math.PI / 180;
-          cutoutGeom = (0, import_transforms9.rotateZ)(rotationRadians, cutoutGeom);
+          cutoutGeom = (0, import_transforms10.rotateZ)(rotationRadians, cutoutGeom);
         }
         break;
+      }
       case "circle":
-        cutoutGeom = (0, import_primitives10.cylinder)({
+        cutoutGeom = (0, import_primitives11.cylinder)({
           center: [cutout.center.x, cutout.center.y, 0],
           radius: cutout.radius,
           height: cutoutHeight
         });
         break;
-      case "polygon":
+      case "polygon": {
         let pointsVec2 = cutout.points.map((p) => [p.x, p.y]);
         if (pointsVec2.length < 3) {
           console.warn(
@@ -31306,13 +31381,14 @@ var BoardGeomBuilder = class {
         if (arePointsClockwise(pointsVec2)) {
           pointsVec2 = pointsVec2.reverse();
         }
-        const polygon2d = (0, import_primitives10.polygon)({ points: pointsVec2 });
+        const polygon2d = (0, import_primitives11.polygon)({ points: pointsVec2 });
         cutoutGeom = (0, import_extrusions8.extrudeLinear)({ height: cutoutHeight }, polygon2d);
-        cutoutGeom = (0, import_transforms9.translate)([0, 0, -cutoutHeight / 2], cutoutGeom);
+        cutoutGeom = (0, import_transforms10.translate)([0, 0, -cutoutHeight / 2], cutoutGeom);
         break;
+      }
     }
     if (cutoutGeom) {
-      this.boardGeom = (0, import_booleans6.subtract)(this.boardGeom, cutoutGeom);
+      this.boardGeom = (0, import_booleans7.subtract)(this.boardGeom, cutoutGeom);
     }
   }
   processCopperPour(pour) {
@@ -31320,22 +31396,22 @@ var BoardGeomBuilder = class {
     const zPos = layerSign * this.ctx.pcbThickness / 2 + layerSign * BOARD_SURFACE_OFFSET.copper;
     let pourGeom = null;
     if (pour.shape === "rect") {
-      let baseGeom = (0, import_primitives10.cuboid)({
+      let baseGeom = (0, import_primitives11.cuboid)({
         center: [0, 0, 0],
         // Create at origin for rotation
         size: [pour.width, pour.height, M]
       });
       if ("rotation" in pour && pour.rotation) {
         const rotationRadians = pour.rotation * Math.PI / 180;
-        baseGeom = (0, import_transforms9.rotateZ)(rotationRadians, baseGeom);
+        baseGeom = (0, import_transforms10.rotateZ)(rotationRadians, baseGeom);
       }
-      pourGeom = (0, import_transforms9.translate)([pour.center.x, pour.center.y, zPos], baseGeom);
+      pourGeom = (0, import_transforms10.translate)([pour.center.x, pour.center.y, zPos], baseGeom);
     } else if (pour.shape === "brep") {
       const brepShape = pour.brep_shape;
-      if (brepShape && brepShape.outer_ring) {
+      if (brepShape?.outer_ring) {
         const pourGeom2 = createGeom2FromBRep(brepShape);
         pourGeom = (0, import_extrusions8.extrudeLinear)({ height: M }, pourGeom2);
-        pourGeom = (0, import_transforms9.translate)([0, 0, zPos], pourGeom);
+        pourGeom = (0, import_transforms10.translate)([0, 0, zPos], pourGeom);
       }
     } else if (pour.shape === "polygon") {
       let pointsVec2 = pour.points.map((p) => [p.x, p.y]);
@@ -31348,16 +31424,16 @@ var BoardGeomBuilder = class {
       if (arePointsClockwise(pointsVec2)) {
         pointsVec2 = pointsVec2.reverse();
       }
-      const polygon2d = (0, import_primitives10.polygon)({ points: pointsVec2 });
+      const polygon2d = (0, import_primitives11.polygon)({ points: pointsVec2 });
       pourGeom = (0, import_extrusions8.extrudeLinear)({ height: M }, polygon2d);
-      pourGeom = (0, import_transforms9.translate)([0, 0, zPos], pourGeom);
+      pourGeom = (0, import_transforms10.translate)([0, 0, zPos], pourGeom);
     }
     if (pourGeom) {
       if (this.boardClipGeom) {
-        pourGeom = (0, import_booleans6.intersect)(this.boardClipGeom, pourGeom);
+        pourGeom = (0, import_booleans7.intersect)(this.boardClipGeom, pourGeom);
       }
       const covered = pour.covered_with_solder_mask !== false;
-      const pourMaterialColor = covered ? tracesMaterialColors[this.board.material] ?? colors.fr4GreenSolderWithMask : colors.copper;
+      const pourMaterialColor = covered ? tracesMaterialColors[this.board.material] ?? colors.fr4TracesWithoutMaskTan : colors.copper;
       const coloredPourGeom = (0, import_colors7.colorize)(pourMaterialColor, pourGeom);
       this.copperPourGeoms.push(coloredPourGeom);
     }
@@ -31367,7 +31443,7 @@ var BoardGeomBuilder = class {
     if (ph.shape === "circle" || ph.shape === "circular_hole_with_rect_pad") {
       let cyGeom = null;
       if (ph.shape === "circular_hole_with_rect_pad") {
-        cyGeom = (0, import_primitives10.cylinder)({
+        cyGeom = (0, import_primitives11.cylinder)({
           center: [
             ph.x + (ph.hole_offset_x || 0),
             ph.y + (ph.hole_offset_y || 0),
@@ -31379,7 +31455,7 @@ var BoardGeomBuilder = class {
           // Ensure it cuts through
         });
       } else {
-        cyGeom = (0, import_primitives10.cylinder)({
+        cyGeom = (0, import_primitives11.cylinder)({
           center: [ph.x, ph.y, 0],
           radius: ph.hole_diameter / 2 + M,
           // Add margin for subtraction
@@ -31388,10 +31464,10 @@ var BoardGeomBuilder = class {
         });
       }
       if (!opts.dontCutBoard) {
-        this.boardGeom = (0, import_booleans6.subtract)(this.boardGeom, cyGeom);
+        this.boardGeom = (0, import_booleans7.subtract)(this.boardGeom, cyGeom);
       }
       this.padGeoms = this.padGeoms.map(
-        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(pg, cyGeom))
+        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(pg, cyGeom))
       );
       const platedHoleGeom = platedHole(ph, this.ctx, {
         clipGeom: this.boardClipGeom
@@ -31404,17 +31480,17 @@ var BoardGeomBuilder = class {
       const holeRadius = holeHeight / 2;
       const rectLength = Math.abs(holeWidth - holeHeight);
       let pillHole;
-      pillHole = (0, import_booleans6.union)(
-        (0, import_primitives10.cuboid)({
+      pillHole = (0, import_booleans7.union)(
+        (0, import_primitives11.cuboid)({
           center: [ph.x, ph.y, 0],
           size: shouldRotate ? [holeHeight, rectLength, this.ctx.pcbThickness * 1.5] : [rectLength, holeHeight, this.ctx.pcbThickness * 1.5]
         }),
-        (0, import_primitives10.cylinder)({
+        (0, import_primitives11.cylinder)({
           center: shouldRotate ? [ph.x, ph.y - rectLength / 2, 0] : [ph.x - rectLength / 2, ph.y, 0],
           radius: holeRadius,
           height: this.ctx.pcbThickness * 1.5
         }),
-        (0, import_primitives10.cylinder)({
+        (0, import_primitives11.cylinder)({
           center: shouldRotate ? [ph.x, ph.y + rectLength / 2, 0] : [ph.x + rectLength / 2, ph.y, 0],
           radius: holeRadius,
           height: this.ctx.pcbThickness * 1.5
@@ -31422,16 +31498,16 @@ var BoardGeomBuilder = class {
       );
       if (ph.ccw_rotation) {
         const rotationRadians = ph.ccw_rotation * Math.PI / 180;
-        pillHole = (0, import_transforms9.translate)(
+        pillHole = (0, import_transforms10.translate)(
           [ph.x, ph.y, 0],
-          (0, import_transforms9.rotateZ)(rotationRadians, (0, import_transforms9.translate)([-ph.x, -ph.y, 0], pillHole))
+          (0, import_transforms10.rotateZ)(rotationRadians, (0, import_transforms10.translate)([-ph.x, -ph.y, 0], pillHole))
         );
       }
       if (!opts.dontCutBoard) {
-        this.boardGeom = (0, import_booleans6.subtract)(this.boardGeom, pillHole);
+        this.boardGeom = (0, import_booleans7.subtract)(this.boardGeom, pillHole);
       }
       this.padGeoms = this.padGeoms.map(
-        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(pg, pillHole))
+        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(pg, pillHole))
       );
       const platedHoleGeom = platedHole(ph, this.ctx, {
         clipGeom: this.boardClipGeom
@@ -31444,8 +31520,8 @@ var BoardGeomBuilder = class {
       const holeRadius = holeHeight / 2;
       const rectLength = Math.abs(holeWidth - holeHeight);
       let pillHole;
-      pillHole = (0, import_booleans6.union)(
-        (0, import_primitives10.cuboid)({
+      pillHole = (0, import_booleans7.union)(
+        (0, import_primitives11.cuboid)({
           center: [
             ph.x + (ph.hole_offset_x || 0),
             ph.y + (ph.hole_offset_y || 0),
@@ -31453,7 +31529,7 @@ var BoardGeomBuilder = class {
           ],
           size: shouldRotate ? [holeHeight, rectLength, this.ctx.pcbThickness * 1.5] : [rectLength, holeHeight, this.ctx.pcbThickness * 1.5]
         }),
-        (0, import_primitives10.cylinder)({
+        (0, import_primitives11.cylinder)({
           center: shouldRotate ? [
             ph.x + (ph.hole_offset_x || 0),
             ph.y + (ph.hole_offset_y || 0) - rectLength / 2,
@@ -31466,7 +31542,7 @@ var BoardGeomBuilder = class {
           radius: holeRadius,
           height: this.ctx.pcbThickness * 1.5
         }),
-        (0, import_primitives10.cylinder)({
+        (0, import_primitives11.cylinder)({
           center: shouldRotate ? [
             ph.x + (ph.hole_offset_x || 0),
             ph.y + (ph.hole_offset_y || 0) + rectLength / 2,
@@ -31494,13 +31570,13 @@ var BoardGeomBuilder = class {
       });
       if (!boardHole || !copperHole) return;
       if (!opts.dontCutBoard) {
-        this.boardGeom = (0, import_booleans6.subtract)(this.boardGeom, boardHole);
+        this.boardGeom = (0, import_booleans7.subtract)(this.boardGeom, boardHole);
       }
       this.padGeoms = this.padGeoms.map(
-        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(pg, boardHole))
+        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(pg, boardHole))
       );
       this.platedHoleGeoms = this.platedHoleGeoms.map(
-        (phg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(phg, copperHole))
+        (phg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(phg, copperHole))
       );
       const platedHoleGeom = platedHole(ph, this.ctx, {
         clipGeom: this.boardClipGeom
@@ -31513,22 +31589,22 @@ var BoardGeomBuilder = class {
     const holeDepth = this.ctx.pcbThickness * 1.5;
     const copperInset = 0.02;
     if (hole.hole_shape === "round" || hole.hole_shape === "circle") {
-      const cyGeom = (0, import_primitives10.cylinder)({
+      const cyGeom = (0, import_primitives11.cylinder)({
         center: [hole.x, hole.y, 0],
         radius: hole.hole_diameter / 2 + M,
         height: holeDepth
       });
-      this.boardGeom = (0, import_booleans6.subtract)(this.boardGeom, cyGeom);
+      this.boardGeom = (0, import_booleans7.subtract)(this.boardGeom, cyGeom);
       this.padGeoms = this.padGeoms.map(
-        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(pg, cyGeom))
+        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(pg, cyGeom))
       );
-      const copperCut = (0, import_primitives10.cylinder)({
+      const copperCut = (0, import_primitives11.cylinder)({
         center: [hole.x, hole.y, 0],
         radius: hole.hole_diameter / 2 + M / 2,
         height: holeDepth
       });
       this.platedHoleGeoms = this.platedHoleGeoms.map(
-        (phg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(phg, copperCut))
+        (phg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(phg, copperCut))
       );
     } else if (hole.hole_shape === "pill" || hole.hole_shape === "rotated_pill") {
       const holeWidth = hole.hole_width;
@@ -31538,34 +31614,34 @@ var BoardGeomBuilder = class {
       const isRotated = hole.hole_shape === "rotated_pill";
       let pillHole;
       if (holeWidth > holeHeight) {
-        pillHole = (0, import_booleans6.union)(
-          (0, import_primitives10.cuboid)({
+        pillHole = (0, import_booleans7.union)(
+          (0, import_primitives11.cuboid)({
             center: [hole.x, hole.y, 0],
             size: [rectLength, holeHeight, holeDepth]
           }),
-          (0, import_primitives10.cylinder)({
+          (0, import_primitives11.cylinder)({
             center: [hole.x - rectLength / 2, hole.y, 0],
             radius: holeRadius,
             height: holeDepth
           }),
-          (0, import_primitives10.cylinder)({
+          (0, import_primitives11.cylinder)({
             center: [hole.x + rectLength / 2, hole.y, 0],
             radius: holeRadius,
             height: holeDepth
           })
         );
       } else {
-        pillHole = (0, import_booleans6.union)(
-          (0, import_primitives10.cuboid)({
+        pillHole = (0, import_booleans7.union)(
+          (0, import_primitives11.cuboid)({
             center: [hole.x, hole.y, 0],
             size: [holeWidth, rectLength, holeDepth]
           }),
-          (0, import_primitives10.cylinder)({
+          (0, import_primitives11.cylinder)({
             center: [hole.x, hole.y - rectLength / 2, 0],
             radius: holeRadius,
             height: holeDepth
           }),
-          (0, import_primitives10.cylinder)({
+          (0, import_primitives11.cylinder)({
             center: [hole.x, hole.y + rectLength / 2, 0],
             radius: holeRadius,
             height: holeDepth
@@ -31574,15 +31650,15 @@ var BoardGeomBuilder = class {
       }
       if (isRotated) {
         const rotationRadians = hole.ccw_rotation * Math.PI / 180;
-        pillHole = (0, import_transforms9.rotateZ)(rotationRadians, pillHole);
+        pillHole = (0, import_transforms10.rotateZ)(rotationRadians, pillHole);
       }
-      this.boardGeom = (0, import_booleans6.subtract)(this.boardGeom, pillHole);
+      this.boardGeom = (0, import_booleans7.subtract)(this.boardGeom, pillHole);
       this.padGeoms = this.padGeoms.map(
-        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(pg, pillHole))
+        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(pg, pillHole))
       );
       const copperPill = (0, import_expansions4.expand)({ delta: -copperInset }, pillHole);
       this.platedHoleGeoms = this.platedHoleGeoms.map(
-        (phg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans6.subtract)(phg, copperPill))
+        (phg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(phg, copperPill))
       );
     }
   }
@@ -31597,10 +31673,10 @@ var BoardGeomBuilder = class {
         M,
         rectBorderRadius
       );
-      const positionedPadGeom = (0, import_transforms9.translate)([pad2.x, pad2.y, zPos], basePadGeom);
+      const positionedPadGeom = (0, import_transforms10.translate)([pad2.x, pad2.y, zPos], basePadGeom);
       let finalPadGeom = positionedPadGeom;
       if (this.boardClipGeom) {
-        finalPadGeom = (0, import_booleans6.intersect)(this.boardClipGeom, finalPadGeom);
+        finalPadGeom = (0, import_booleans7.intersect)(this.boardClipGeom, finalPadGeom);
       }
       finalPadGeom = (0, import_colors7.colorize)(colors.copper, finalPadGeom);
       this.padGeoms.push(finalPadGeom);
@@ -31612,22 +31688,22 @@ var BoardGeomBuilder = class {
         rectBorderRadius
       );
       const rotationRadians = pad2.ccw_rotation * Math.PI / 180;
-      basePadGeom = (0, import_transforms9.rotateZ)(rotationRadians, basePadGeom);
-      const positionedPadGeom = (0, import_transforms9.translate)([pad2.x, pad2.y, zPos], basePadGeom);
+      basePadGeom = (0, import_transforms10.rotateZ)(rotationRadians, basePadGeom);
+      const positionedPadGeom = (0, import_transforms10.translate)([pad2.x, pad2.y, zPos], basePadGeom);
       let finalPadGeom = positionedPadGeom;
       if (this.boardClipGeom) {
-        finalPadGeom = (0, import_booleans6.intersect)(this.boardClipGeom, finalPadGeom);
+        finalPadGeom = (0, import_booleans7.intersect)(this.boardClipGeom, finalPadGeom);
       }
       finalPadGeom = (0, import_colors7.colorize)(colors.copper, finalPadGeom);
       this.padGeoms.push(finalPadGeom);
     } else if (pad2.shape === "circle") {
-      let padGeom = (0, import_primitives10.cylinder)({
+      let padGeom = (0, import_primitives11.cylinder)({
         center: [pad2.x, pad2.y, zPos],
         radius: pad2.radius,
         height: M
       });
       if (this.boardClipGeom) {
-        padGeom = (0, import_booleans6.intersect)(this.boardClipGeom, padGeom);
+        padGeom = (0, import_booleans7.intersect)(this.boardClipGeom, padGeom);
       }
       padGeom = (0, import_colors7.colorize)(colors.copper, padGeom);
       this.padGeoms.push(padGeom);
@@ -31643,12 +31719,12 @@ var BoardGeomBuilder = class {
       if (currentSegmentPoints.length >= 2 && currentLayer) {
         const layerSign = currentLayer === "bottom" ? -1 : 1;
         const zCenter = layerSign * this.ctx.pcbThickness / 2 + layerSign * BOARD_SURFACE_OFFSET.traces;
-        const linePath = (0, import_primitives10.line)(currentSegmentPoints);
+        const linePath = (0, import_primitives11.line)(currentSegmentPoints);
         const expandedPath = (0, import_expansions4.expand)(
           { delta: currentWidth / 2, corners: "round" },
           linePath
         );
-        let traceGeom = (0, import_transforms9.translate)(
+        let traceGeom = (0, import_transforms10.translate)(
           [0, 0, zCenter - M / 2],
           (0, import_extrusions8.extrudeLinear)({ height: M }, expandedPath)
         );
@@ -31659,25 +31735,25 @@ var BoardGeomBuilder = class {
           startPointCoords[1]
         );
         if (startHole) {
-          const cuttingCylinder = (0, import_primitives10.cylinder)({
+          const cuttingCylinder = (0, import_primitives11.cylinder)({
             center: [startPointCoords[0], startPointCoords[1], zCenter],
             radius: startHole.diameter / 2 + M,
             height: M
           });
-          traceGeom = (0, import_booleans6.subtract)(traceGeom, cuttingCylinder);
+          traceGeom = (0, import_booleans7.subtract)(traceGeom, cuttingCylinder);
         }
         const endHole = this.getHoleToCut(endPointCoords[0], endPointCoords[1]);
         if (endHole) {
-          const cuttingCylinder = (0, import_primitives10.cylinder)({
+          const cuttingCylinder = (0, import_primitives11.cylinder)({
             center: [endPointCoords[0], endPointCoords[1], zCenter],
             radius: endHole.diameter / 2 + M,
             height: M
           });
-          traceGeom = (0, import_booleans6.subtract)(traceGeom, cuttingCylinder);
+          traceGeom = (0, import_booleans7.subtract)(traceGeom, cuttingCylinder);
         }
-        const tracesMaterialColor = tracesMaterialColors[this.board.material] ?? colors.fr4GreenSolderWithMask;
+        const tracesMaterialColor = tracesMaterialColors[this.board.material] ?? colors.fr4TracesWithoutMaskTan;
         if (this.boardClipGeom) {
-          traceGeom = (0, import_booleans6.intersect)(this.boardClipGeom, traceGeom);
+          traceGeom = (0, import_booleans7.intersect)(this.boardClipGeom, traceGeom);
         }
         traceGeom = (0, import_colors7.colorize)(tracesMaterialColor, traceGeom);
         this.traceGeoms.push(traceGeom);
@@ -31720,24 +31796,34 @@ var BoardGeomBuilder = class {
     finishSegment();
   }
   processVia(via) {
-    this.processPlatedHole(
-      {
+    if (!this.boardGeom) return;
+    if (typeof via.outer_diameter === "number" && typeof via.hole_diameter === "number") {
+      const viaCopperGeom = createViaCopper({
         x: via.x,
         y: via.y,
-        hole_diameter: via.hole_diameter,
-        outer_diameter: via.outer_diameter,
-        shape: "circle",
-        layers: ["top", "bottom"],
-        // Assume through-hole via
-        type: "pcb_plated_hole",
-        pcb_plated_hole_id: `via_${via.pcb_via_id}`
-        // Create a unique-ish ID
-      },
-      {
-        dontCutBoard: true
-        // Board cut should happen via trace logic or dedicated via cut
+        outerDiameter: via.outer_diameter,
+        holeDiameter: via.hole_diameter,
+        thickness: this.ctx.pcbThickness
+      });
+      let finalViaGeom = viaCopperGeom;
+      if (this.boardClipGeom) {
+        finalViaGeom = (0, import_booleans7.intersect)(this.boardClipGeom, viaCopperGeom);
+        finalViaGeom = (0, import_colors7.colorize)(colors.copper, finalViaGeom);
       }
-    );
+      this.viaGeoms.push(finalViaGeom);
+    }
+    if (typeof via.hole_diameter === "number") {
+      const viaDrill = createViaBoardDrill({
+        x: via.x,
+        y: via.y,
+        holeDiameter: via.hole_diameter,
+        thickness: this.ctx.pcbThickness
+      });
+      this.boardGeom = (0, import_booleans7.subtract)(this.boardGeom, viaDrill);
+      this.padGeoms = this.padGeoms.map(
+        (pg) => (0, import_colors7.colorize)(colors.copper, (0, import_booleans7.subtract)(pg, viaDrill))
+      );
+    }
   }
   processSilkscreenText(st) {
     const { textOutlines, xOffset, yOffset } = createSilkscreenTextGeoms(st);
@@ -31746,7 +31832,7 @@ var BoardGeomBuilder = class {
         point2[0] + xOffset + st.anchor_position.x,
         point2[1] + yOffset + st.anchor_position.y
       ]);
-      const textPath = (0, import_primitives10.line)(alignedOutline);
+      const textPath = (0, import_primitives11.line)(alignedOutline);
       const fontSize = st.font_size || 0.25;
       const expansionDelta = Math.min(
         Math.max(0.01, fontSize * 0.1),
@@ -31758,13 +31844,13 @@ var BoardGeomBuilder = class {
       );
       let textGeom;
       if (st.layer === "bottom") {
-        textGeom = (0, import_transforms9.translate)(
+        textGeom = (0, import_transforms10.translate)(
           [0, 0, -this.ctx.pcbThickness / 2 - M],
           // Position above board
           (0, import_extrusions8.extrudeLinear)({ height: 0.012 }, expandedPath)
         );
       } else {
-        textGeom = (0, import_transforms9.translate)(
+        textGeom = (0, import_transforms10.translate)(
           [0, 0, this.ctx.pcbThickness / 2 + M],
           // Position above board
           (0, import_extrusions8.extrudeLinear)({ height: 0.012 }, expandedPath)
@@ -31800,7 +31886,7 @@ var BoardGeomBuilder = class {
   }
   finalize() {
     if (!this.boardGeom) return;
-    const boardMaterialColor = boardMaterialColors[this.board.material] ?? colors.fr4Green;
+    const boardMaterialColor = boardMaterialColors[this.board.material] ?? colors.fr4Tan;
     this.boardGeom = (0, import_colors7.colorize)(boardMaterialColor, this.boardGeom);
     this.finalGeoms = [
       this.boardGeom,
@@ -32605,7 +32691,7 @@ function processCopperPoursForManifold(Manifold, CrossSection, circuitJson, pcbT
         pourOp = clipped;
       }
       const covered = pour.covered_with_solder_mask !== false;
-      const pourColorArr = covered ? tracesMaterialColors[boardMaterial] ?? colors.fr4GreenSolderWithMask : colors.copper;
+      const pourColorArr = covered ? tracesMaterialColors[boardMaterial] ?? colors.fr4TracesWithoutMaskTan : colors.copper;
       const pourColor = new THREE19.Color(...pourColorArr);
       const threeGeom = manifoldMeshToThreeGeometry(pourOp.getMesh());
       copperPourGeoms.push({
@@ -33546,7 +33632,7 @@ import { su as su11 } from "@tscircuit/circuit-json-util";
 import * as THREE22 from "three";
 
 // src/utils/via-geoms.ts
-function createViaCopper({
+function createViaCopper2({
   Manifold,
   x,
   y,
@@ -33616,7 +33702,7 @@ function processViasForManifold(Manifold, circuitJson, pcbThickness, manifoldIns
       viaBoardDrills.push(translatedDrill);
     }
     if (typeof via.outer_diameter === "number" && typeof via.hole_diameter === "number") {
-      const translatedViaCopper = createViaCopper({
+      const translatedViaCopper = createViaCopper2({
         Manifold,
         x: via.x,
         y: via.y,
@@ -34803,7 +34889,7 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
       if (boardManifold) {
         const boardThreeMesh = boardManifold.getMesh();
         const finalBoardGeom = manifoldMeshToThreeGeometry(boardThreeMesh);
-        const matColorArray = boardMaterialColors[boardData.material] ?? colors.fr4Green;
+        const matColorArray = boardMaterialColors[boardData.material] ?? colors.fr4Tan;
         currentGeoms.board = {
           geometry: finalBoardGeom,
           color: new THREE26.Color(
@@ -34836,20 +34922,36 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
       );
       currentGeoms.copperPours = copperPourGeoms;
       setGeoms(currentGeoms);
-      const traceColorArr = tracesMaterialColors[boardData.material] ?? colors.fr4GreenSolderWithMask;
-      const traceColor = `rgb(${Math.round(traceColorArr[0] * 255)}, ${Math.round(traceColorArr[1] * 255)}, ${Math.round(traceColorArr[2] * 255)})`;
+      const traceColorWithoutMaskArr = colors.fr4TracesWithoutMaskTan;
+      const traceColorWithoutMask = `rgb(${Math.round(traceColorWithoutMaskArr[0] * 255)}, ${Math.round(traceColorWithoutMaskArr[1] * 255)}, ${Math.round(traceColorWithoutMaskArr[2] * 255)})`;
       currentTextures.topTrace = createTraceTextureForLayer({
         layer: "top",
         circuitJson,
         boardData,
-        traceColor,
+        traceColor: traceColorWithoutMask,
         traceTextureResolution: TRACE_TEXTURE_RESOLUTION
       });
       currentTextures.bottomTrace = createTraceTextureForLayer({
         layer: "bottom",
         circuitJson,
         boardData,
-        traceColor,
+        traceColor: traceColorWithoutMask,
+        traceTextureResolution: TRACE_TEXTURE_RESOLUTION
+      });
+      const traceColorWithMaskArr = colors.fr4TracesWithMaskGreen;
+      const traceColorWithMask = `rgb(${Math.round(traceColorWithMaskArr[0] * 255)}, ${Math.round(traceColorWithMaskArr[1] * 255)}, ${Math.round(traceColorWithMaskArr[2] * 255)})`;
+      currentTextures.topTraceWithMask = createTraceTextureForLayer({
+        layer: "top",
+        circuitJson,
+        boardData,
+        traceColor: traceColorWithMask,
+        traceTextureResolution: TRACE_TEXTURE_RESOLUTION
+      });
+      currentTextures.bottomTraceWithMask = createTraceTextureForLayer({
+        layer: "bottom",
+        circuitJson,
+        boardData,
+        traceColor: traceColorWithMask,
         traceTextureResolution: TRACE_TEXTURE_RESOLUTION
       });
       const silkscreenColor = "rgb(255,255,255)";
@@ -34867,7 +34969,7 @@ var useManifoldBoardBuilder = (manifoldJSModule, circuitJson) => {
         silkscreenColor,
         traceTextureResolution: TRACE_TEXTURE_RESOLUTION
       });
-      const soldermaskColorArr = tracesMaterialColors[boardData.material] ?? colors.fr4GreenSolderWithMask;
+      const soldermaskColorArr = soldermaskColors[boardData.material] ?? colors.fr4SolderMaskGreen;
       const soldermaskColor = `rgb(${Math.round(soldermaskColorArr[0] * 255)}, ${Math.round(soldermaskColorArr[1] * 255)}, ${Math.round(soldermaskColorArr[2] * 255)})`;
       currentTextures.topSoldermask = createSoldermaskTextureForLayer({
         layer: "top",
@@ -35026,6 +35128,13 @@ function createTextureMeshes(textures, boardData, pcbThickness) {
     "trace"
   );
   if (topTraceMesh) meshes.push(topTraceMesh);
+  const topTraceWithMaskMesh = createTexturePlane(
+    textures.topTraceWithMask,
+    pcbThickness / 2 + BOARD_SURFACE_OFFSET.traces,
+    false,
+    "trace-with-mask"
+  );
+  if (topTraceWithMaskMesh) meshes.push(topTraceWithMaskMesh);
   const topSilkscreenMesh = createTexturePlane(
     textures.topSilkscreen,
     pcbThickness / 2 + 0.017,
@@ -35042,6 +35151,13 @@ function createTextureMeshes(textures, boardData, pcbThickness) {
     "trace"
   );
   if (bottomTraceMesh) meshes.push(bottomTraceMesh);
+  const bottomTraceWithMaskMesh = createTexturePlane(
+    textures.bottomTraceWithMask,
+    -pcbThickness / 2 - BOARD_SURFACE_OFFSET.traces,
+    true,
+    "trace-with-mask"
+  );
+  if (bottomTraceWithMaskMesh) meshes.push(bottomTraceWithMaskMesh);
   const bottomSilkscreenMesh = createTexturePlane(
     textures.bottomSilkscreen,
     -pcbThickness / 2 - 0.017,
@@ -35105,10 +35221,14 @@ var BoardMeshes = ({
     });
     textureMeshes.forEach((mesh) => {
       let shouldShow = true;
-      if (mesh.name.includes("top-trace")) {
-        shouldShow = visibility.topCopper;
-      } else if (mesh.name.includes("bottom-trace")) {
-        shouldShow = visibility.bottomCopper;
+      if (mesh.name.includes("top-trace-texture-plane") && !mesh.name.includes("with-mask")) {
+        shouldShow = visibility.topCopper && !visibility.topMask;
+      } else if (mesh.name.includes("top-trace-with-mask")) {
+        shouldShow = visibility.topCopper && visibility.topMask;
+      } else if (mesh.name.includes("bottom-trace-texture-plane") && !mesh.name.includes("with-mask")) {
+        shouldShow = visibility.bottomCopper && !visibility.bottomMask;
+      } else if (mesh.name.includes("bottom-trace-with-mask")) {
+        shouldShow = visibility.bottomCopper && visibility.bottomMask;
       } else if (mesh.name.includes("top-silkscreen")) {
         shouldShow = visibility.topSilkscreen;
       } else if (mesh.name.includes("bottom-silkscreen")) {

package/package.json

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