circuit-json-to-lbrn 0.0.44 → 0.0.46

package/dist/index.js

@@ -2577,7 +2577,8 @@ var createCopperCutFillForLayer = async ({
     bottomCutNetGeoms,
     topCopperCutFillCutSetting,
     bottomCopperCutFillCutSetting,
-    copperCutFillMargin
+    copperCutFillMargin,
+    boardOutlineContour
   } = ctx;
   const cutSetting = layer === "top" ? topCopperCutFillCutSetting : bottomCopperCutFillCutSetting;
   if (!cutSetting) {
@@ -2615,7 +2616,14 @@ var createCopperCutFillForLayer = async ({
       32
       // circularSegments for round corners
     );
-    const cutFillArea = outerBoundary.subtract(copperInside);
+    let cutFillArea = outerBoundary.subtract(copperInside);
+    if (boardOutlineContour && boardOutlineContour.length >= 3) {
+      const boardOutline = new CrossSection([boardOutlineContour], "Positive");
+      const clippedArea = cutFillArea.intersect(boardOutline);
+      cutFillArea.delete();
+      cutFillArea = clippedArea;
+      boardOutline.delete();
+    }
     const simplifiedArea = cutFillArea.simplify(1e-3);
     const resultContours = simplifiedArea.toPolygons();
     if (resultContours.length === 0) {
@@ -2835,6 +2843,28 @@ var convertCircuitJsonToLbrn = async (circuitJson, options = {}) => {
     ctx.topScanNetGeoms.set(net, []);
     ctx.bottomScanNetGeoms.set(net, []);
   }
+  for (const board of db.pcb_board.list()) {
+    if (board.outline?.length) {
+      ctx.boardOutlineContour = board.outline.map((outlinePoint) => [
+        outlinePoint.x + origin.x,
+        outlinePoint.y + origin.y
+      ]);
+    } else if (typeof board.width === "number" && typeof board.height === "number" && board.center) {
+      const halfWidth = board.width / 2;
+      const halfHeight = board.height / 2;
+      const minX = board.center.x - halfWidth + origin.x;
+      const minY = board.center.y - halfHeight + origin.y;
+      const maxX = board.center.x + halfWidth + origin.x;
+      const maxY = board.center.y + halfHeight + origin.y;
+      ctx.boardOutlineContour = [
+        [minX, minY],
+        [maxX, minY],
+        [maxX, maxY],
+        [minX, maxY]
+      ];
+    }
+    break;
+  }
   for (const smtpad of db.pcb_smtpad.list()) {
     addSmtPad(smtpad, ctx);
   }

package/lib/ConvertContext.ts

@@ -3,6 +3,8 @@ import type { CutSetting, LightBurnProject } from "lbrnts"
 import type { Box, Polygon } from "@flatten-js/core"
 import type { ConnectivityMap } from "circuit-json-to-connectivity-map"
 
+type Contour = Array<[number, number]>
+
 export type ConnectivityMapKey = string
 
 export interface ConvertContext {
@@ -58,4 +60,7 @@ export interface ConvertContext {
   // Key is "x,y" rounded to 6 decimal places
   topTraceEndpoints: Set<string>
   bottomTraceEndpoints: Set<string>
+
+  // Board outline as a contour for clipping copper cut fill
+  boardOutlineContour?: Contour
 }

package/lib/createCopperCutFillForLayer.ts

@@ -6,22 +6,6 @@ import { getManifold } from "./getManifold"
 
 type Contour = Array<[number, number]>
 
-/**
- * Calculates the signed area of a contour.
- * Positive area = counter-clockwise winding (outer boundary)
- * Negative area = clockwise winding (hole)
- */
-const getSignedArea = (contour: Contour): number => {
-  let area = 0
-  const n = contour.length
-  for (let i = 0; i < n; i++) {
-    const j = (i + 1) % n
-    area += contour[i]![0] * contour[j]![1]
-    area -= contour[j]![0] * contour[i]![1]
-  }
-  return area / 2
-}
-
 /**
  * Converts a flatten-js Polygon to an array of contours for manifold CrossSection
  * Each contour is an array of [x, y] coordinates
@@ -100,6 +84,7 @@ export const createCopperCutFillForLayer = async ({
     topCopperCutFillCutSetting,
     bottomCopperCutFillCutSetting,
     copperCutFillMargin,
+    boardOutlineContour,
   } = ctx
 
   // Get the appropriate cut setting for this layer
@@ -157,7 +142,16 @@ export const createCopperCutFillForLayer = async ({
 
     // Subtract the inside (original copper) from the outer boundary (expanded copper)
     // This gives us the ring/band area to laser cut
-    const cutFillArea = outerBoundary.subtract(copperInside)
+    let cutFillArea = outerBoundary.subtract(copperInside)
+
+    // Clip to board outline if available
+    if (boardOutlineContour && boardOutlineContour.length >= 3) {
+      const boardOutline = new CrossSection([boardOutlineContour], "Positive")
+      const clippedArea = cutFillArea.intersect(boardOutline)
+      cutFillArea.delete()
+      cutFillArea = clippedArea
+      boardOutline.delete()
+    }
 
     // Simplify to clean up any spurious tiny segments
     const simplifiedArea = cutFillArea.simplify(0.001)

package/lib/index.ts

@@ -269,6 +269,34 @@ export const convertCircuitJsonToLbrn = async (
     ctx.bottomScanNetGeoms.set(net, [])
   }
 
+  // Extract board outline for clipping copper cut fill
+  for (const board of db.pcb_board.list()) {
+    if (board.outline?.length) {
+      ctx.boardOutlineContour = board.outline.map((outlinePoint) => [
+        outlinePoint.x + origin.x,
+        outlinePoint.y + origin.y,
+      ])
+    } else if (
+      typeof board.width === "number" &&
+      typeof board.height === "number" &&
+      board.center
+    ) {
+      const halfWidth = board.width / 2
+      const halfHeight = board.height / 2
+      const minX = board.center.x - halfWidth + origin.x
+      const minY = board.center.y - halfHeight + origin.y
+      const maxX = board.center.x + halfWidth + origin.x
+      const maxY = board.center.y + halfHeight + origin.y
+      ctx.boardOutlineContour = [
+        [minX, minY],
+        [maxX, minY],
+        [maxX, maxY],
+        [minX, maxY],
+      ]
+    }
+    break // Only use the first board
+  }
+
   // Process all PCB elements
   for (const smtpad of db.pcb_smtpad.list()) {
     addSmtPad(smtpad, ctx)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-lbrn",
   "main": "dist/index.js",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "type": "module",
   "scripts": {
     "start": "bun run site/index.html",
@@ -28,7 +28,7 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "lbrnts": "^0.0.13",
+    "lbrnts": "^0.0.14",
     "manifold-3d": "^3.3.2"
   }
 }