circuit-json-to-gltf 0.0.74 → 0.0.76

package/README.md

@@ -65,6 +65,7 @@ convertCircuitJsonToGltf(circuitJson: CircuitJson, options?: ConversionOptions):
 
 - `format`: "gltf" (JSON) or "glb" (binary) - default: "gltf"
 - `boardTextureResolution`: Resolution for board texture rendering - default: 1024
+- `boardDrillQuality`: Drill geometry detail level, "high" or "fast" - default: "fast"
 - `drawFauxBoard`: Draw a fallback board if no `pcb_board` or `pcb_panel` is present - default: false
 - `includeModels`: Whether to load external 3D models - default: true
 - `modelCache`: Map for caching loaded models

package/dist/index.d.ts

@@ -6,6 +6,7 @@ interface AuthHeaders extends Record<string, string> {
 interface ConversionOptions {
     format?: "gltf" | "glb";
     boardTextureResolution?: number;
+    boardDrillQuality?: "high" | "fast";
     drawFauxBoard?: boolean;
     includeModels?: boolean;
     modelCache?: Map<string, STLMesh | OBJMesh>;
@@ -122,6 +123,7 @@ interface CircuitTo3DOptions {
     componentColor?: Color;
     copperColor?: Color;
     boardThickness?: number;
+    boardDrillQuality?: "high" | "fast";
     drawFauxBoard?: boolean;
     defaultComponentHeight?: number;
     renderBoardTextures?: boolean;
@@ -175,27 +177,6 @@ declare function loadSTL({ url, transform, projectBaseUrl, authHeaders, }: {
 }): Promise<STLMesh>;
 declare function clearSTLCache(): void;
 
-declare function applyCoordinateTransform(point: Point3, config: CoordinateTransformConfig): Point3;
-declare function transformTriangles(triangles: Triangle[], config: CoordinateTransformConfig): Triangle[];
-declare const COORDINATE_TRANSFORMS: {
-    readonly Z_UP_TO_Y_UP: CoordinateTransformConfig;
-    readonly Z_OUT_OF_TOP: CoordinateTransformConfig;
-    readonly STEP_INVERTED: CoordinateTransformConfig;
-    readonly USB_PORT_FIX: CoordinateTransformConfig;
-    readonly Z_UP_TO_Y_UP_USB_FIX: CoordinateTransformConfig;
-    readonly IDENTITY: CoordinateTransformConfig;
-    readonly TEST_ROTATE_X_90: CoordinateTransformConfig;
-    readonly TEST_ROTATE_X_270: CoordinateTransformConfig;
-    readonly TEST_ROTATE_Y_90: CoordinateTransformConfig;
-    readonly TEST_ROTATE_Y_270: CoordinateTransformConfig;
-    readonly TEST_ROTATE_Z_90: CoordinateTransformConfig;
-    readonly TEST_ROTATE_Z_270: CoordinateTransformConfig;
-    readonly TEST_FLIP_X: CoordinateTransformConfig;
-    readonly TEST_FLIP_Z: CoordinateTransformConfig;
-    readonly FOOTPRINTER_MODEL_TRANSFORM: CoordinateTransformConfig;
-    readonly OBJ_Z_UP_TO_Y_UP: CoordinateTransformConfig;
-};
-
 interface CameraFitOptions {
     /**
      * Target-to-camera direction vector used for solved camera position.
@@ -228,6 +209,27 @@ declare function getBestCameraPosition(circuitJson: CircuitJson): {
     fov: number;
 };
 
+declare function applyCoordinateTransform(point: Point3, config: CoordinateTransformConfig): Point3;
+declare function transformTriangles(triangles: Triangle[], config: CoordinateTransformConfig): Triangle[];
+declare const COORDINATE_TRANSFORMS: {
+    readonly Z_UP_TO_Y_UP: CoordinateTransformConfig;
+    readonly Z_OUT_OF_TOP: CoordinateTransformConfig;
+    readonly STEP_INVERTED: CoordinateTransformConfig;
+    readonly USB_PORT_FIX: CoordinateTransformConfig;
+    readonly Z_UP_TO_Y_UP_USB_FIX: CoordinateTransformConfig;
+    readonly IDENTITY: CoordinateTransformConfig;
+    readonly TEST_ROTATE_X_90: CoordinateTransformConfig;
+    readonly TEST_ROTATE_X_270: CoordinateTransformConfig;
+    readonly TEST_ROTATE_Y_90: CoordinateTransformConfig;
+    readonly TEST_ROTATE_Y_270: CoordinateTransformConfig;
+    readonly TEST_ROTATE_Z_90: CoordinateTransformConfig;
+    readonly TEST_ROTATE_Z_270: CoordinateTransformConfig;
+    readonly TEST_FLIP_X: CoordinateTransformConfig;
+    readonly TEST_FLIP_Z: CoordinateTransformConfig;
+    readonly FOOTPRINTER_MODEL_TRANSFORM: CoordinateTransformConfig;
+    readonly OBJ_Z_UP_TO_Y_UP: CoordinateTransformConfig;
+};
+
 declare function convertCircuitJsonToGltf(circuitJson: CircuitJson, options?: ConversionOptions): Promise<ArrayBuffer | object>;
 
 interface Point {

package/dist/index.js

@@ -14855,8 +14855,10 @@ function convertOcctResultToMesh(result, transform) {
     const normals = mesh.attributes?.normal?.array;
     const indices = mesh.index.array;
     const brepFaces = mesh.brep_faces ?? [];
+    const sortedBrepFaces = brepFaces.length > 1 ? [...brepFaces].sort((a, b) => a.first - b.first) : brepFaces;
     const meshColor = mesh.color ? [mesh.color[0], mesh.color[1], mesh.color[2]] : void 0;
     const numTriangles = indices.length / 3;
+    let brepFaceIndex = 0;
     for (let t = 0; t < numTriangles; t++) {
       const i0 = indices[t * 3];
       const i1 = indices[t * 3 + 1];
@@ -14888,17 +14890,18 @@ function convertOcctResultToMesh(result, transform) {
       }
       let triangleColor;
       let foundFaceColor = false;
-      for (const face of brepFaces) {
-        if (t >= face.first && t <= face.last && face.color) {
-          triangleColor = [
-            Math.round(face.color[0] * 255),
-            Math.round(face.color[1] * 255),
-            Math.round(face.color[2] * 255),
-            1
-          ];
-          foundFaceColor = true;
-          break;
-        }
+      while (brepFaceIndex < sortedBrepFaces.length && t > sortedBrepFaces[brepFaceIndex].last) {
+        brepFaceIndex++;
+      }
+      const currentBrepFace = sortedBrepFaces[brepFaceIndex];
+      if (currentBrepFace && t >= currentBrepFace.first && t <= currentBrepFace.last && currentBrepFace.color) {
+        triangleColor = [
+          Math.round(currentBrepFace.color[0] * 255),
+          Math.round(currentBrepFace.color[1] * 255),
+          Math.round(currentBrepFace.color[2] * 255),
+          1
+        ];
+        foundFaceColor = true;
       }
       if (!foundFaceColor && meshColor) {
         triangleColor = [
@@ -15199,10 +15202,12 @@ function scaleMesh(mesh, scale) {
 
 // lib/utils/pcb-board-cutouts.ts
 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 import_primitives = __toESM(require_primitives(), 1);
+var DEFAULT_QUALITY_MODE_SEGMENTS = 24;
+var REDUCED_QUALITY_MODE_SEGMENTS = 8;
+var HIGH_QUALITY_MODE_SEGMENTS = 64;
+var HIGH_QUALITY_MODE_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);
@@ -15216,13 +15221,13 @@ var arePointsClockwise = (points) => {
   const signedArea = area / 2;
   return signedArea <= 0;
 };
-var createCircularHole = (x, y, radius, thickness, segments = DEFAULT_SEGMENTS) => (0, import_primitives.cylinder)({
+var createCircularHole = (x, y, radius, thickness, segments = DEFAULT_QUALITY_MODE_SEGMENTS) => (0, import_primitives.cylinder)({
   center: [x, y, 0],
   height: thickness + 1,
   radius,
   segments
 });
-var createCutoutGeoms = (boardCenter, thickness, cutouts = []) => {
+var createCutoutGeoms = (boardCenter, thickness, cutouts = [], segments = DEFAULT_QUALITY_MODE_SEGMENTS) => {
   const geoms = [];
   for (const cutout of cutouts) {
     if (!cutout) continue;
@@ -15297,7 +15302,7 @@ var createCutoutGeoms = (boardCenter, thickness, cutouts = []) => {
         if (!radius) continue;
         const relX = center.x - boardCenter.x;
         const relY = -(center.y - boardCenter.y);
-        geoms.push(createCircularHole(relX, relY, radius, thickness));
+        geoms.push(createCircularHole(relX, relY, radius, thickness, segments));
         break;
       }
       case "polygon": {
@@ -15329,12 +15334,12 @@ var filterCutoutsForBoard = (cutouts, board) => {
 };
 
 // lib/utils/pcb-board-geometry.ts
-var import_extrusions2 = __toESM(require_extrusions(), 1);
-var import_primitives2 = __toESM(require_primitives(), 1);
-var import_transforms2 = __toESM(require_transforms(), 1);
-var import_booleans2 = __toESM(require_booleans(), 1);
 var geom3 = __toESM(require_geom3(), 1);
 var import_measureBoundingBox = __toESM(require_measureBoundingBox2(), 1);
+var import_booleans2 = __toESM(require_booleans(), 1);
+var import_extrusions2 = __toESM(require_extrusions(), 1);
+var import_transforms2 = __toESM(require_transforms(), 1);
+var import_primitives2 = __toESM(require_primitives(), 1);
 
 // lib/utils/batched-union.ts
 var import_booleans = __toESM(require_booleans(), 1);
@@ -15363,6 +15368,12 @@ var batchedUnion = (geoms, batchSize = 50) => {
 
 // lib/utils/pcb-board-geometry.ts
 var RADIUS_EPSILON = 1e-4;
+var getHoleSegments = (totalHoleCount, drillQuality) => {
+  if (drillQuality === "high") {
+    return totalHoleCount > HOLE_COUNT_THRESHOLD ? HIGH_QUALITY_MODE_REDUCED_SEGMENTS : HIGH_QUALITY_MODE_SEGMENTS;
+  }
+  return totalHoleCount > HOLE_COUNT_THRESHOLD ? REDUCED_QUALITY_MODE_SEGMENTS : DEFAULT_QUALITY_MODE_SEGMENTS;
+};
 var getNumberProperty = (obj, key) => {
   const value = obj[key];
   return typeof value === "number" ? value : void 0;
@@ -15387,7 +15398,7 @@ var createBoardOutlineGeom = (board, center, thickness) => {
   geom = (0, import_transforms2.translate)([0, 0, -thickness / 2], geom);
   return geom;
 };
-var createPillHoleWithSegments = (x, y, width, height, thickness, rotate, segments = DEFAULT_SEGMENTS) => {
+var createPillHoleWithSegments = (x, y, width, height, thickness, rotate, segments = DEFAULT_QUALITY_MODE_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);
@@ -15403,7 +15414,7 @@ var createPillHoleWithSegments = (x, y, width, height, thickness, rotate, segmen
   }
   return (0, import_transforms2.translate)([x, y, 0], hole3d);
 };
-var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = [], segments = DEFAULT_SEGMENTS) => {
+var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = [], segments = DEFAULT_QUALITY_MODE_SEGMENTS) => {
   const holeGeoms = [];
   for (const hole of holes) {
     const holeRecord = hole;
@@ -15540,12 +15551,17 @@ var createBoundingBox = (bbox) => {
   };
 };
 var createBoardMesh = (board, options) => {
-  const { thickness, holes = [], platedHoles = [], cutouts = [] } = options;
+  const {
+    thickness,
+    holes = [],
+    platedHoles = [],
+    cutouts = [],
+    drillQuality = "fast"
+  } = options;
   const center = board.center ?? { x: 0, y: 0 };
   let boardGeom = createBoardOutlineGeom(board, center, thickness);
   const totalHoleCount = holes.length + platedHoles.length;
-  const useReducedSegments = totalHoleCount > HOLE_COUNT_THRESHOLD;
-  const segments = useReducedSegments ? REDUCED_SEGMENTS : DEFAULT_SEGMENTS;
+  const segments = getHoleSegments(totalHoleCount, drillQuality);
   const holeGeoms = createHoleGeoms(
     center,
     thickness,
@@ -15553,7 +15569,7 @@ var createBoardMesh = (board, options) => {
     platedHoles,
     segments
   );
-  const cutoutGeoms = createCutoutGeoms(center, thickness, cutouts);
+  const cutoutGeoms = createCutoutGeoms(center, thickness, cutouts, segments);
   const subtractGeoms = [...holeGeoms, ...cutoutGeoms];
   if (subtractGeoms.length > 0) {
     const unifiedHoles = batchedUnion(subtractGeoms);
@@ -15571,19 +15587,29 @@ var createBoardMesh = (board, options) => {
 };
 
 // lib/utils/pcb-panel-geometry.ts
-var import_transforms3 = __toESM(require_transforms(), 1);
-var import_booleans3 = __toESM(require_booleans(), 1);
 var geom32 = __toESM(require_geom3(), 1);
 var import_measureBoundingBox2 = __toESM(require_measureBoundingBox2(), 1);
+var import_booleans3 = __toESM(require_booleans(), 1);
+var import_transforms3 = __toESM(require_transforms(), 1);
 var createPanelMesh = (panel, options) => {
   const { thickness, holes = [], platedHoles = [], cutouts = [] } = options;
+  const drillQuality = options.drillQuality ?? "fast";
   const center = panel.center ?? { x: 0, y: 0 };
   let panelGeom = createBoardOutlineGeom(panel, center, thickness);
-  const holeGeoms = createHoleGeoms(center, thickness, holes, platedHoles);
-  const cutoutGeoms = createCutoutGeoms(center, thickness, cutouts);
+  const totalHoleCount = holes.length + platedHoles.length;
+  const segments = drillQuality === "high" ? totalHoleCount > HOLE_COUNT_THRESHOLD ? HIGH_QUALITY_MODE_REDUCED_SEGMENTS : HIGH_QUALITY_MODE_SEGMENTS : totalHoleCount > HOLE_COUNT_THRESHOLD ? REDUCED_QUALITY_MODE_SEGMENTS : DEFAULT_QUALITY_MODE_SEGMENTS;
+  const holeGeoms = createHoleGeoms(
+    center,
+    thickness,
+    holes,
+    platedHoles,
+    segments
+  );
+  const cutoutGeoms = createCutoutGeoms(center, thickness, cutouts, segments);
   const subtractGeoms = [...holeGeoms, ...cutoutGeoms];
   if (subtractGeoms.length > 0) {
-    panelGeom = (0, import_booleans3.subtract)(panelGeom, ...subtractGeoms);
+    const unifiedHoles = batchedUnion(subtractGeoms);
+    panelGeom = (0, import_booleans3.subtract)(panelGeom, unifiedHoles);
   }
   panelGeom = (0, import_transforms3.rotateX)(-Math.PI / 2, panelGeom);
   const polygons = geom32.toPolygons(panelGeom);
@@ -15714,6 +15740,7 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
     componentColor = "rgba(128,128,128,0.5)",
     copperColor = "#C87B4B",
     boardThickness = DEFAULT_BOARD_THICKNESS,
+    boardDrillQuality = "fast",
     drawFauxBoard = false,
     defaultComponentHeight = DEFAULT_COMPONENT_HEIGHT,
     renderBoardTextures: shouldRenderTextures = true,
@@ -15738,7 +15765,8 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
       thickness: effectiveBoardThickness,
       holes: pcbHoles,
       platedHoles: pcbPlatedHoles,
-      cutouts: panelCutouts
+      cutouts: panelCutouts,
+      drillQuality: boardDrillQuality
     });
     const meshWidth = panelMesh.boundingBox.max.x - panelMesh.boundingBox.min.x;
     const meshHeight = panelMesh.boundingBox.max.z - panelMesh.boundingBox.min.z;
@@ -15783,7 +15811,8 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
       thickness: effectiveBoardThickness,
       holes: pcbHoles,
       platedHoles: pcbPlatedHoles,
-      cutouts: boardCutouts
+      cutouts: boardCutouts,
+      drillQuality: boardDrillQuality
     });
     const meshWidth = boardMesh.boundingBox.max.x - boardMesh.boundingBox.min.x;
     const meshHeight = boardMesh.boundingBox.max.z - boardMesh.boundingBox.min.z;
@@ -17570,6 +17599,7 @@ async function convertCircuitJsonToGltf(circuitJson, options = {}) {
   const {
     format = "gltf",
     boardTextureResolution = 1024,
+    boardDrillQuality = "fast",
     drawFauxBoard = false,
     includeModels = true,
     modelCache,
@@ -17579,6 +17609,7 @@ async function convertCircuitJsonToGltf(circuitJson, options = {}) {
   const scene3D = await convertCircuitJsonTo3D(circuitJson, {
     renderBoardTextures: true,
     textureResolution: boardTextureResolution,
+    boardDrillQuality,
     drawFauxBoard,
     coordinateTransform: options.coordinateTransform,
     showBoundingBoxes,

package/package.json

@@ -2,7 +2,7 @@
   "name": "circuit-json-to-gltf",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "scripts": {
     "test": "bun test tests/",
     "test:playwright": "playwright test",