circuit-json-to-gltf 0.0.72 → 0.0.73

package/dist/index.js

@@ -11459,7 +11459,7 @@ var require_unionGeom3 = __commonJS({
     var flatten = require_flatten();
     var retessellate = require_retessellate();
     var unionSub = require_unionGeom3Sub();
-    var union = (...geometries) => {
+    var union3 = (...geometries) => {
       geometries = flatten(geometries);
       let i;
       for (i = 1; i < geometries.length; i += 2) {
@@ -11469,7 +11469,7 @@ var require_unionGeom3 = __commonJS({
       newgeometry = retessellate(newgeometry);
       return newgeometry;
     };
-    module.exports = union;
+    module.exports = union3;
   }
 });
 
@@ -11483,14 +11483,14 @@ var require_unionGeom2 = __commonJS({
     var fromFakePolygons = require_fromFakePolygons();
     var to3DWalls = require_to3DWalls();
     var unionGeom3 = require_unionGeom3();
-    var union = (...geometries) => {
+    var union3 = (...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, geom33.toPolygons(newgeom3));
     };
-    module.exports = union;
+    module.exports = union3;
   }
 });
 
@@ -11504,7 +11504,7 @@ var require_union = __commonJS({
     var geom33 = require_geom3();
     var unionGeom2 = require_unionGeom2();
     var unionGeom3 = require_unionGeom3();
-    var union = (...geometries) => {
+    var union3 = (...geometries) => {
       geometries = flatten(geometries);
       if (geometries.length === 0) throw new Error("wrong number of arguments");
       if (!areAllShapesTheSameType(geometries)) {
@@ -11515,7 +11515,7 @@ var require_union = __commonJS({
       if (geom33.isA(geometry)) return unionGeom3(geometries);
       return geometry;
     };
-    module.exports = union;
+    module.exports = union3;
   }
 });
 
@@ -11905,7 +11905,7 @@ var require_expandGeom3 = __commonJS({
   "node_modules/@jscad/modeling/src/operations/expansions/expandGeom3.js"(exports, module) {
     "use strict";
     var geom33 = require_geom3();
-    var union = require_union();
+    var union3 = require_union();
     var expandShell = require_expandShell();
     var expandGeom3 = (options, geometry) => {
       const defaults = {
@@ -11921,7 +11921,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 union(geometry, expanded);
+      return union3(geometry, expanded);
     };
     module.exports = expandGeom3;
   }
@@ -12633,7 +12633,7 @@ var require_hullChain = __commonJS({
   "node_modules/@jscad/modeling/src/operations/hulls/hullChain.js"(exports, module) {
     "use strict";
     var flatten = require_flatten();
-    var union = require_union();
+    var union3 = require_union();
     var hull = require_hull();
     var hullChain = (...geometries) => {
       geometries = flatten(geometries);
@@ -12642,7 +12642,7 @@ var require_hullChain = __commonJS({
       for (let i = 1; i < geometries.length; i++) {
         hulls.push(hull(geometries[i - 1], geometries[i]));
       }
-      return union(hulls);
+      return union3(hulls);
     };
     module.exports = hullChain;
   }
@@ -15001,6 +15001,8 @@ var import_extrusions = __toESM(require_extrusions(), 1);
 var import_primitives = __toESM(require_primitives(), 1);
 var import_transforms = __toESM(require_transforms(), 1);
 var DEFAULT_SEGMENTS = 64;
+var REDUCED_SEGMENTS = 16;
+var HOLE_COUNT_THRESHOLD = 50;
 var toBoardSpaceVec2 = (point, center) => [point.x - center.x, -(point.y - center.y)];
 var isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
 var arePointsClockwise = (points) => {
@@ -15013,11 +15015,11 @@ var arePointsClockwise = (points) => {
   const signedArea = area / 2;
   return signedArea <= 0;
 };
-var createCircularHole = (x, y, radius, thickness) => (0, import_primitives.cylinder)({
+var createCircularHole = (x, y, radius, thickness, segments = DEFAULT_SEGMENTS) => (0, import_primitives.cylinder)({
   center: [x, y, 0],
   height: thickness + 1,
   radius,
-  segments: DEFAULT_SEGMENTS
+  segments
 });
 var createCutoutGeoms = (boardCenter, thickness, cutouts = []) => {
   const geoms = [];
@@ -15129,9 +15131,36 @@ var filterCutoutsForBoard = (cutouts, board) => {
 var import_extrusions2 = __toESM(require_extrusions(), 1);
 var import_primitives2 = __toESM(require_primitives(), 1);
 var import_transforms2 = __toESM(require_transforms(), 1);
-var import_booleans = __toESM(require_booleans(), 1);
+var import_booleans2 = __toESM(require_booleans(), 1);
 var geom3 = __toESM(require_geom3(), 1);
 var import_measureBoundingBox = __toESM(require_measureBoundingBox2(), 1);
+
+// lib/utils/batched-union.ts
+var import_booleans = __toESM(require_booleans(), 1);
+var batchedUnion = (geoms, batchSize = 50) => {
+  if (geoms.length === 0) {
+    throw new Error("Cannot union empty array");
+  }
+  if (geoms.length === 1) {
+    return geoms[0];
+  }
+  let results = [...geoms];
+  while (results.length > 1) {
+    const newResults = [];
+    for (let i = 0; i < results.length; i += batchSize) {
+      const batch = results.slice(i, i + batchSize);
+      if (batch.length === 1) {
+        newResults.push(batch[0]);
+      } else {
+        newResults.push((0, import_booleans.union)(...batch));
+      }
+    }
+    results = newResults;
+  }
+  return results[0];
+};
+
+// lib/utils/pcb-board-geometry.ts
 var RADIUS_EPSILON = 1e-4;
 var getNumberProperty = (obj, key) => {
   const value = obj[key];
@@ -15157,14 +15186,14 @@ var createBoardOutlineGeom = (board, center, thickness) => {
   geom = (0, import_transforms2.translate)([0, 0, -thickness / 2], geom);
   return geom;
 };
-var createPillHole = (x, y, width, height, thickness, rotate) => {
+var createPillHoleWithSegments = (x, y, width, height, thickness, rotate, segments = DEFAULT_SEGMENTS) => {
   const minDimension = Math.min(width, height);
   const maxAllowedRadius = Math.max(0, minDimension / 2 - RADIUS_EPSILON);
   const roundRadius = maxAllowedRadius <= 0 ? 0 : Math.min(height / 2, maxAllowedRadius);
   const hole2d = (0, import_primitives2.roundedRectangle)({
     size: [width, height],
     roundRadius,
-    segments: DEFAULT_SEGMENTS
+    segments
   });
   let hole3d = (0, import_extrusions2.extrudeLinear)({ height: thickness + 1 }, hole2d);
   hole3d = (0, import_transforms2.translate)([0, 0, -(thickness + 1) / 2], hole3d);
@@ -15173,7 +15202,7 @@ var createPillHole = (x, y, width, height, thickness, rotate) => {
   }
   return (0, import_transforms2.translate)([x, y, 0], hole3d);
 };
-var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = []) => {
+var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = [], segments = DEFAULT_SEGMENTS) => {
   const holeGeoms = [];
   for (const hole of holes) {
     const holeRecord = hole;
@@ -15187,13 +15216,14 @@ var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = []) =>
       const rotate = holeHeight > holeWidth;
       const width = rotate ? holeHeight : holeWidth;
       const height = rotate ? holeWidth : holeHeight;
-      const pillHole = createPillHole(
+      const pillHole = createPillHoleWithSegments(
         relX,
         relY,
         width,
         height,
         thickness,
-        rotate
+        rotate,
+        segments
       );
       holeGeoms.push(pillHole);
       continue;
@@ -15210,7 +15240,7 @@ var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = []) =>
       const hole2d = (0, import_primitives2.roundedRectangle)({
         size: [holeWidth, holeHeight],
         roundRadius,
-        segments: DEFAULT_SEGMENTS
+        segments
       });
       let hole3d = (0, import_extrusions2.extrudeLinear)({ height: thickness + 1 }, hole2d);
       hole3d = (0, import_transforms2.translate)([0, 0, -(thickness + 1) / 2], hole3d);
@@ -15224,7 +15254,7 @@ var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = []) =>
     const diameter = getNumberProperty(holeRecord, "hole_diameter") ?? getNumberProperty(holeRecord, "diameter");
     if (!diameter) continue;
     const radius = diameter / 2;
-    holeGeoms.push(createCircularHole(relX, relY, radius, thickness));
+    holeGeoms.push(createCircularHole(relX, relY, radius, thickness, segments));
   }
   for (const plated of platedHoles) {
     const platedRecord = plated;
@@ -15240,13 +15270,23 @@ var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = []) =>
       const width = rotate ? holeHeight : holeWidth;
       const height = rotate ? holeWidth : holeHeight;
       holeGeoms.push(
-        createPillHole(relX, relY, width, height, thickness, rotate)
+        createPillHoleWithSegments(
+          relX,
+          relY,
+          width,
+          height,
+          thickness,
+          rotate,
+          segments
+        )
       );
       continue;
     }
     const diameter = getNumberProperty(platedRecord, "hole_diameter") ?? getNumberProperty(platedRecord, "outer_diameter");
     if (!diameter) continue;
-    holeGeoms.push(createCircularHole(relX, relY, diameter / 2, thickness));
+    holeGeoms.push(
+      createCircularHole(relX, relY, diameter / 2, thickness, segments)
+    );
   }
   return holeGeoms;
 };
@@ -15302,11 +15342,21 @@ var createBoardMesh = (board, options) => {
   const { thickness, holes = [], platedHoles = [], cutouts = [] } = options;
   const center = board.center ?? { x: 0, y: 0 };
   let boardGeom = createBoardOutlineGeom(board, center, thickness);
-  const holeGeoms = createHoleGeoms(center, thickness, holes, platedHoles);
+  const totalHoleCount = holes.length + platedHoles.length;
+  const useReducedSegments = totalHoleCount > HOLE_COUNT_THRESHOLD;
+  const segments = useReducedSegments ? REDUCED_SEGMENTS : DEFAULT_SEGMENTS;
+  const holeGeoms = createHoleGeoms(
+    center,
+    thickness,
+    holes,
+    platedHoles,
+    segments
+  );
   const cutoutGeoms = createCutoutGeoms(center, thickness, cutouts);
   const subtractGeoms = [...holeGeoms, ...cutoutGeoms];
   if (subtractGeoms.length > 0) {
-    boardGeom = (0, import_booleans.subtract)(boardGeom, ...subtractGeoms);
+    const unifiedHoles = batchedUnion(subtractGeoms);
+    boardGeom = (0, import_booleans2.subtract)(boardGeom, unifiedHoles);
   }
   boardGeom = (0, import_transforms2.rotateX)(-Math.PI / 2, boardGeom);
   const polygons = geom3.toPolygons(boardGeom);
@@ -15321,7 +15371,7 @@ var createBoardMesh = (board, options) => {
 
 // lib/utils/pcb-panel-geometry.ts
 var import_transforms3 = __toESM(require_transforms(), 1);
-var import_booleans2 = __toESM(require_booleans(), 1);
+var import_booleans3 = __toESM(require_booleans(), 1);
 var geom32 = __toESM(require_geom3(), 1);
 var import_measureBoundingBox2 = __toESM(require_measureBoundingBox2(), 1);
 var createPanelMesh = (panel, options) => {
@@ -15332,7 +15382,7 @@ var createPanelMesh = (panel, options) => {
   const cutoutGeoms = createCutoutGeoms(center, thickness, cutouts);
   const subtractGeoms = [...holeGeoms, ...cutoutGeoms];
   if (subtractGeoms.length > 0) {
-    panelGeom = (0, import_booleans2.subtract)(panelGeom, ...subtractGeoms);
+    panelGeom = (0, import_booleans3.subtract)(panelGeom, ...subtractGeoms);
   }
   panelGeom = (0, import_transforms3.rotateX)(-Math.PI / 2, panelGeom);
   const polygons = geom32.toPolygons(panelGeom);

package/package.json

@@ -2,7 +2,7 @@
   "name": "circuit-json-to-gltf",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "scripts": {
     "test": "bun test tests/",
     "format": "biome format --write .",