@tscircuit/pcb-viewer 1.11.218 → 1.11.219

package/dist/index.js

@@ -13242,31 +13242,47 @@ var convertElementToPrimitives = (element, allElements) => {
       const pour = element;
       switch (pour.shape) {
         case "rect": {
+          const { center, width, height, layer, rotation: rotation2 } = pour;
           return [
             {
               _pcb_drawing_object_id: getNewPcbDrawingObjectId(
                 "pcb_copper_pour_rect"
               ),
               pcb_drawing_type: "rect",
-              x: pour.center.x,
-              y: pour.center.y,
-              w: pour.width,
-              h: pour.height,
-              layer: pour.layer,
+              x: center.x,
+              y: center.y,
+              w: width,
+              h: height,
+              layer,
               _element: element,
-              ccw_rotation: pour.rotation
+              ccw_rotation: rotation2
             }
           ];
         }
         case "polygon": {
+          const { points, layer } = pour;
           return [
             {
               _pcb_drawing_object_id: getNewPcbDrawingObjectId(
                 "pcb_copper_pour_polygon"
               ),
               pcb_drawing_type: "polygon",
-              points: pour.points,
-              layer: pour.layer,
+              points,
+              layer,
+              _element: element
+            }
+          ];
+        }
+        case "brep": {
+          const { brep_shape: brep_shape2, layer } = pour;
+          return [
+            {
+              _pcb_drawing_object_id: getNewPcbDrawingObjectId(
+                "pcb_copper_pour_brep"
+              ),
+              pcb_drawing_type: "polygon_with_arcs",
+              brep_shape: brep_shape2,
+              layer,
               _element: element
             }
           ];
@@ -13912,7 +13928,7 @@ var Drawer = class {
       ctx.lineTo(transformedPoints[i][0], transformedPoints[i][1]);
     }
     ctx.closePath();
-    ctx.fill();
+    ctx.fill("evenodd");
     const lineWidth = scaleOnly(this.transform, this.aperture.size);
     ctx.lineWidth = lineWidth;
     ctx.stroke();
@@ -13976,6 +13992,7 @@ var Drawer = class {
     ctx.lineWidth = scaleOnly(transform, size2);
     ctx.lineCap = "round";
     if (mode === "add") {
+      ctx.globalCompositeOperation = "source-over";
       let colorString = color2?.[0] === "#" || color2?.startsWith("rgb") ? color2 : LAYER_NAME_TO_COLOR[color2?.toLowerCase()] ? LAYER_NAME_TO_COLOR[color2?.toLowerCase()] : null;
       if (colorString === null) {
         console.warn(`Color mapping for "${color2}" not found`);
@@ -14017,6 +14034,75 @@ var Drawer = class {
       ctx.fillRect(x$ - size$ / 2, y$ - size$ / 2, size$, size$);
     this.lastPoint = { x, y };
   }
+  polygonWithArcs(brep) {
+    const ctx = this.getLayerCtx();
+    const processRing = (ring2) => {
+      if (ring2.vertices.length === 0) return;
+      const startPoint = ring2.vertices[0];
+      const t_start_point = applyToPoint3(this.transform, [
+        startPoint.x,
+        startPoint.y
+      ]);
+      ctx.moveTo(t_start_point[0], t_start_point[1]);
+      for (let i = 0; i < ring2.vertices.length; i++) {
+        const p1 = ring2.vertices[i];
+        const p2 = ring2.vertices[(i + 1) % ring2.vertices.length];
+        if (p1.bulge && p1.bulge !== 0) {
+          const bulge = p1.bulge;
+          const dx = p2.x - p1.x;
+          const dy = p2.y - p1.y;
+          const chord = Math.sqrt(dx * dx + dy * dy);
+          if (chord < 1e-9) {
+            const t_p2 = applyToPoint3(this.transform, [p2.x, p2.y]);
+            ctx.lineTo(t_p2[0], t_p2[1]);
+            continue;
+          }
+          const angle = 4 * Math.atan(bulge);
+          const radius = Math.abs(chord / (2 * Math.sin(angle / 2)));
+          const mx = (p1.x + p2.x) / 2;
+          const my = (p1.y + p2.y) / 2;
+          const norm_dx = dx / chord;
+          const norm_dy = dy / chord;
+          const perp_vx = -norm_dy;
+          const perp_vy = norm_dx;
+          const dist_to_center = Math.sqrt(
+            Math.max(0, radius * radius - (chord / 2) ** 2)
+          );
+          const cx = mx + dist_to_center * perp_vx * Math.sign(bulge);
+          const cy = my + dist_to_center * perp_vy * Math.sign(bulge);
+          const startAngle = Math.atan2(p1.y - cy, p1.x - cx);
+          let endAngle = Math.atan2(p2.y - cy, p2.x - cx);
+          if (bulge > 0 && endAngle < startAngle) {
+            endAngle += 2 * Math.PI;
+          } else if (bulge < 0 && endAngle > startAngle) {
+            endAngle -= 2 * Math.PI;
+          }
+          const t_center = applyToPoint3(this.transform, [cx, cy]);
+          const t_radius = scaleOnly(this.transform, radius);
+          ctx.arc(
+            t_center[0],
+            t_center[1],
+            t_radius,
+            -startAngle,
+            -endAngle,
+            bulge > 0
+          );
+        } else {
+          const t_p2 = applyToPoint3(this.transform, [p2.x, p2.y]);
+          ctx.lineTo(t_p2[0], t_p2[1]);
+        }
+      }
+      ctx.closePath();
+    };
+    ctx.beginPath();
+    processRing(brep.outer_ring);
+    if (brep.inner_rings) {
+      for (const inner_ring of brep.inner_rings) {
+        processRing(inner_ring);
+      }
+    }
+    ctx.fill("evenodd");
+  }
 };
 
 // src/lib/util/rotate-text.ts
@@ -14334,17 +14420,25 @@ var drawPolygon = (drawer, polygon) => {
   });
   drawer.polygon(polygon.points);
 };
+var drawPolygonWithArcs = (drawer, p) => {
+  drawer.equip({
+    color: getColor(p),
+    layer: p.layer
+  });
+  drawer.polygonWithArcs(p.brep_shape);
+};
 var drawPrimitive = (drawer, primitive) => {
   switch (primitive.pcb_drawing_type) {
     case "line":
       return drawLine(drawer, primitive);
     case "text":
       return drawText(drawer, primitive);
-    case "rect":
+    case "rect": {
       if (primitive.ccw_rotation) {
         return drawRotatedRect(drawer, primitive);
       }
       return drawRect(drawer, primitive);
+    }
     case "circle":
       return drawCircle(drawer, primitive);
     case "oval":
@@ -14356,6 +14450,8 @@ var drawPrimitive = (drawer, primitive) => {
       return drawPill(drawer, primitive);
     case "polygon":
       return drawPolygon(drawer, primitive);
+    case "polygon_with_arcs":
+      return drawPolygonWithArcs(drawer, primitive);
   }
 };
 var drawPrimitives = (drawer, primitives) => {
@@ -16983,7 +17079,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.217",
+  version: "1.11.218",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",