@tscircuit/3d-viewer 0.0.533 → 0.0.535

package/dist/index.js

@@ -28674,9 +28674,13 @@ var AnyCadComponent = ({
   }, [cad_component.rotation, layer]);
   const adjustedPosition = useMemo8(() => {
     if (!cad_component.position) return void 0;
-    let z18 = cad_component.position.z + pcbThickness / 2;
-    if (layer === "bottom") {
-      z18 = -cad_component.position.z - pcbThickness / 2;
+    let z18;
+    if (layer === "top") {
+      z18 = cad_component.position.z;
+    } else if (layer === "bottom") {
+      z18 = -(cad_component.position.z + pcbThickness);
+    } else {
+      z18 = cad_component.position.z;
     }
     return [cad_component.position.x, cad_component.position.y, z18];
   }, [cad_component.position, layer, pcbThickness]);
@@ -28852,7 +28856,7 @@ import * as THREE16 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.532",
+  version: "0.0.534",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -31767,6 +31771,7 @@ function calculateOutlineBounds(boardData) {
 
 // src/utils/pad-texture.ts
 import { su as su5 } from "@tscircuit/circuit-json-util";
+import { CircuitToCanvasDrawer } from "circuit-to-canvas";
 import * as THREE19 from "three";
 function createPadTextureForLayer({
   layer,
@@ -31778,6 +31783,7 @@ function createPadTextureForLayer({
   const pcbSmtPads = su5(circuitJson).pcb_smtpad.list();
   const smtPadsOnLayer = pcbSmtPads.filter((pad2) => pad2.layer === layer);
   if (smtPadsOnLayer.length === 0) return null;
+  const pcbRenderLayer = layer === "top" ? "top_copper" : "bottom_copper";
   const boardOutlineBounds = calculateOutlineBounds(boardData);
   const canvas = document.createElement("canvas");
   const canvasWidth = Math.floor(
@@ -31794,102 +31800,51 @@ function createPadTextureForLayer({
     ctx.translate(0, canvasHeight);
     ctx.scale(1, -1);
   }
-  const canvasXFromPcb = (pcbX) => (pcbX - boardOutlineBounds.minX) * traceTextureResolution;
-  const canvasYFromPcb = (pcbY) => (boardOutlineBounds.maxY - pcbY) * traceTextureResolution;
-  ctx.fillStyle = copperColor;
-  smtPadsOnLayer.forEach((pad2) => {
-    if (pad2.shape === "polygon" && pad2.points) {
-      ctx.beginPath();
-      pad2.points.forEach((point, index2) => {
-        const px = canvasXFromPcb(point.x);
-        const py = canvasYFromPcb(point.y);
-        if (index2 === 0) {
-          ctx.moveTo(px, py);
-        } else {
-          ctx.lineTo(px, py);
-        }
-      });
-      ctx.closePath();
-      ctx.fill();
-      return;
-    }
-    if (pad2.x === void 0 || pad2.y === void 0) return;
-    const x = pad2.x;
-    const y = pad2.y;
-    const canvasX = canvasXFromPcb(x);
-    const canvasY = canvasYFromPcb(y);
-    if (pad2.shape === "rect") {
-      const width10 = pad2.width * traceTextureResolution;
-      const height10 = pad2.height * traceTextureResolution;
-      const rawRadius = extractRectBorderRadius(pad2);
-      const borderRadius = clampRectBorderRadius(
-        pad2.width,
-        pad2.height,
-        rawRadius
-      ) * traceTextureResolution;
-      if (borderRadius > 0) {
-        ctx.beginPath();
-        ctx.roundRect(
-          canvasX - width10 / 2,
-          canvasY - height10 / 2,
-          width10,
-          height10,
-          borderRadius
-        );
-        ctx.fill();
-      } else {
-        ctx.fillRect(canvasX - width10 / 2, canvasY - height10 / 2, width10, height10);
+  const transparent = "rgba(0,0,0,0)";
+  const drawer = new CircuitToCanvasDrawer(ctx);
+  drawer.configure({
+    colorOverrides: {
+      copper: {
+        top: copperColor,
+        bottom: copperColor,
+        inner1: copperColor,
+        inner2: copperColor,
+        inner3: copperColor,
+        inner4: copperColor,
+        inner5: copperColor,
+        inner6: copperColor
+      },
+      copperPour: { top: transparent, bottom: transparent },
+      drill: transparent,
+      boardOutline: transparent,
+      substrate: transparent,
+      keepout: transparent,
+      fabricationNote: transparent,
+      courtyard: { top: transparent, bottom: transparent },
+      silkscreen: { top: transparent, bottom: transparent },
+      soldermask: { top: transparent, bottom: transparent },
+      soldermaskWithCopperUnderneath: {
+        top: transparent,
+        bottom: transparent
+      },
+      soldermaskOverCopper: {
+        top: transparent,
+        bottom: transparent
       }
-    } else if (pad2.shape === "circle") {
-      const radius = (pad2.radius ?? pad2.width / 2) * traceTextureResolution;
-      ctx.beginPath();
-      ctx.arc(canvasX, canvasY, radius, 0, 2 * Math.PI);
-      ctx.fill();
-    } else if (pad2.shape === "pill" || pad2.shape === "rotated_pill") {
-      const width10 = pad2.width * traceTextureResolution;
-      const height10 = pad2.height * traceTextureResolution;
-      const borderRadius = Math.min(width10, height10) / 2;
-      const ccwRotation = pad2.ccw_rotation || 0;
-      const rotation = -ccwRotation * (Math.PI / 180);
-      if (rotation) {
-        ctx.save();
-        ctx.translate(canvasX, canvasY);
-        ctx.rotate(rotation);
-        ctx.beginPath();
-        ctx.roundRect(-width10 / 2, -height10 / 2, width10, height10, borderRadius);
-        ctx.fill();
-        ctx.restore();
-      } else {
-        ctx.beginPath();
-        ctx.roundRect(
-          canvasX - width10 / 2,
-          canvasY - height10 / 2,
-          width10,
-          height10,
-          borderRadius
-        );
-        ctx.fill();
-      }
-    } else if (pad2.shape === "rotated_rect") {
-      const width10 = pad2.width * traceTextureResolution;
-      const height10 = pad2.height * traceTextureResolution;
-      const rawRadius = extractRectBorderRadius(pad2);
-      const borderRadius = clampRectBorderRadius(
-        pad2.width,
-        pad2.height,
-        rawRadius
-      ) * traceTextureResolution;
-      const ccwRotation = pad2.ccw_rotation || 0;
-      const rotation = -ccwRotation * (Math.PI / 180);
-      ctx.save();
-      ctx.translate(canvasX, canvasY);
-      ctx.rotate(rotation);
-      ctx.beginPath();
-      ctx.roundRect(-width10 / 2, -height10 / 2, width10, height10, borderRadius);
-      ctx.fill();
-      ctx.restore();
     }
   });
+  drawer.setCameraBounds({
+    minX: boardOutlineBounds.minX,
+    maxX: boardOutlineBounds.maxX,
+    minY: boardOutlineBounds.minY,
+    maxY: boardOutlineBounds.maxY
+  });
+  drawer.drawElements(smtPadsOnLayer, {
+    layers: [pcbRenderLayer],
+    drawSoldermask: false,
+    drawSoldermaskTop: false,
+    drawSoldermaskBottom: false
+  });
   const texture = new THREE19.CanvasTexture(canvas);
   texture.generateMipmaps = true;
   texture.minFilter = THREE19.LinearMipmapLinearFilter;
@@ -31980,7 +31935,7 @@ function createPanelOutlineTextureForLayer({
 
 // src/utils/trace-texture.ts
 import * as THREE21 from "three";
-import { CircuitToCanvasDrawer } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer2 } from "circuit-to-canvas";
 import { getElementRenderLayers, su as su7 } from "@tscircuit/circuit-json-util";
 
 // src/utils/trace-layer-segments.ts
@@ -32052,7 +32007,7 @@ function createTraceTextureForLayer({
     ctx.scale(1, -1);
   }
   const transparent = "rgba(0,0,0,0)";
-  const drawer = new CircuitToCanvasDrawer(ctx);
+  const drawer = new CircuitToCanvasDrawer2(ctx);
   drawer.configure({
     colorOverrides: {
       copper: {
@@ -32109,7 +32064,7 @@ function createTraceTextureForLayer({
 import * as THREE22 from "three";
 
 // src/textures/copper-text/copper-text-drawing.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer2 } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer3 } from "circuit-to-canvas";
 var setDrawerBounds = (drawer, bounds) => {
   drawer.setCameraBounds({
     minX: bounds.minX,
@@ -32126,7 +32081,7 @@ var drawCopperTextLayer = ({
   copperColor
 }) => {
   const renderLayer = layer === "top" ? "top_copper" : "bottom_copper";
-  const drawer = new CircuitToCanvasDrawer2(ctx);
+  const drawer = new CircuitToCanvasDrawer3(ctx);
   drawer.configure({
     colorOverrides: {
       copper: {
@@ -32154,7 +32109,7 @@ var drawCopperTextLayer = ({
   maskCanvas.height = ctx.canvas.height;
   const maskCtx = maskCanvas.getContext("2d");
   if (!maskCtx) return;
-  const knockoutCutoutDrawer = new CircuitToCanvasDrawer2(maskCtx);
+  const knockoutCutoutDrawer = new CircuitToCanvasDrawer3(maskCtx);
   knockoutCutoutDrawer.configure({
     colorOverrides: {
       copper: {
@@ -32230,7 +32185,7 @@ function createCopperTextTextureForLayer({
 import * as THREE23 from "three";
 
 // src/textures/fabrication-note/fabrication-note-drawing.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer3 } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer4 } from "circuit-to-canvas";
 
 // src/utils/units.ts
 var MM_PER_INCH = 25.4;
@@ -32328,7 +32283,7 @@ var drawFabricationNoteLayer = ({
 }) => {
   const renderLayer = `${layer}_fabrication_note`;
   const normalizedElements = elements.map(normalizeFabricationElement);
-  const drawer = new CircuitToCanvasDrawer3(ctx);
+  const drawer = new CircuitToCanvasDrawer4(ctx);
   drawer.configure({
     colorOverrides: {
       copper: {
@@ -32467,7 +32422,7 @@ function createFabricationNoteTextureForLayer({
 import * as THREE24 from "three";
 
 // src/textures/pcb-note/pcb-note-drawing.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer4 } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer5 } from "circuit-to-canvas";
 var TRANSPARENT2 = "rgba(0,0,0,0)";
 var setDrawerBounds3 = (drawer, bounds) => {
   drawer.setCameraBounds({
@@ -32546,7 +32501,7 @@ var drawPcbNoteLayer = ({
   elements
 }) => {
   const normalizedElements = elements.map(normalizePcbNoteElement);
-  const drawer = new CircuitToCanvasDrawer4(ctx);
+  const drawer = new CircuitToCanvasDrawer5(ctx);
   drawer.configure({
     colorOverrides: {
       copper: {
@@ -32628,7 +32583,7 @@ function createPcbNoteTextureForLayer({
 import * as THREE25 from "three";
 
 // src/textures/silkscreen/silkscreen-drawing.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer5 } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer6 } from "circuit-to-canvas";
 var FABRICATION_NOTE_COLOR2 = "rgb(255,243,204)";
 var TRANSPARENT3 = "rgba(0,0,0,0)";
 var setDrawerBounds4 = (drawer, bounds) => {
@@ -32647,7 +32602,7 @@ var drawSilkscreenLayer = ({
   silkscreenColor
 }) => {
   const renderLayer = layer === "top" ? "top_silkscreen" : "bottom_silkscreen";
-  const drawer = new CircuitToCanvasDrawer5(ctx);
+  const drawer = new CircuitToCanvasDrawer6(ctx);
   drawer.configure({
     colorOverrides: {
       copper: {
@@ -32747,7 +32702,7 @@ function createSilkscreenTextureForLayer({
 import * as THREE26 from "three";
 
 // src/textures/soldermask/soldermask-drawing.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer6 } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer7 } from "circuit-to-canvas";
 var toRgb = (colorArr) => {
   const [r = 0, g = 0, b = 0] = colorArr;
   return `rgb(${Math.round(r * 255)}, ${Math.round(g * 255)}, ${Math.round(
@@ -32783,7 +32738,7 @@ var drawSoldermaskLayer = ({
 }) => {
   const palette = getSoldermaskPalette(boardMaterial);
   const copperRenderLayer = layer === "top" ? "top_copper" : "bottom_copper";
-  const drawer = new CircuitToCanvasDrawer6(ctx);
+  const drawer = new CircuitToCanvasDrawer7(ctx);
   drawer.configure({
     colorOverrides: {
       copper: {
@@ -32827,7 +32782,7 @@ var drawSoldermaskLayer = ({
   if (uncoveredPours.length > 0) {
     ctx.save();
     ctx.globalCompositeOperation = "destination-out";
-    const cutoutDrawer = new CircuitToCanvasDrawer6(ctx);
+    const cutoutDrawer = new CircuitToCanvasDrawer7(ctx);
     cutoutDrawer.configure({
       colorOverrides: {
         copper: {
@@ -32889,7 +32844,7 @@ function createSoldermaskTextureForLayer({
 import * as THREE27 from "three";
 
 // src/textures/through-hole/through-hole-drawing.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer7 } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer8 } from "circuit-to-canvas";
 var setDrawerBounds6 = (drawer, bounds) => {
   drawer.setCameraBounds({
     minX: bounds.minX,
@@ -32907,7 +32862,7 @@ var drawThroughHoleLayer = ({
 }) => {
   const renderLayer = layer === "top" ? "top_copper" : "bottom_copper";
   const transparent = "rgba(0,0,0,0)";
-  const drawer = new CircuitToCanvasDrawer7(ctx);
+  const drawer = new CircuitToCanvasDrawer8(ctx);
   drawer.configure({
     colorOverrides: {
       copper: {
@@ -33128,7 +33083,7 @@ function createCombinedBoardTextures({
 
 // src/textures/create-copper-pour-texture-for-layer.ts
 import * as THREE29 from "three";
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer8 } from "circuit-to-canvas";
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer9 } from "circuit-to-canvas";
 
 // src/geoms/brep-converter.ts
 var import_primitives7 = __toESM(require_primitives(), 1);

package/package.json

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