circuit-json-to-gltf 0.0.29 → 0.0.31

package/dist/index.d.ts

@@ -118,6 +118,7 @@ interface CircuitTo3DOptions {
     renderBoardTextures?: boolean;
     textureResolution?: number;
     coordinateTransform?: CoordinateTransformConfig;
+    showBoundingBoxes?: boolean;
 }
 interface BoardRenderOptions {
     layer: "top" | "bottom";
@@ -165,6 +166,7 @@ declare const COORDINATE_TRANSFORMS: {
     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>;

package/dist/index.js

@@ -13627,6 +13627,10 @@ var COORDINATE_TRANSFORMS = {
     axisMapping: { x: "x", y: "-z", z: "y" },
     flipX: -1,
     rotation: { x: 180, y: 180 }
+  },
+  // OBJ models: Z-up to Y-up with Y→Z (no negation to preserve winding order)
+  OBJ_Z_UP_TO_Y_UP: {
+    axisMapping: { x: "x", y: "z", z: "y" }
   }
 };
 
@@ -14759,9 +14763,11 @@ var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = []) =>
     holeGeoms.push(createCircularHole(relX, relY, radius, thickness));
   }
   for (const plated of platedHoles) {
-    const relX = plated.x - boardCenter.x;
-    const relY = -(plated.y - boardCenter.y);
     const platedRecord = plated;
+    const holeOffsetX = getNumberProperty(platedRecord, "hole_offset_x") ?? 0;
+    const holeOffsetY = getNumberProperty(platedRecord, "hole_offset_y") ?? 0;
+    const relX = plated.x - boardCenter.x + holeOffsetX;
+    const relY = -(plated.y - boardCenter.y + holeOffsetY);
     if (plated.shape === "pill" || plated.shape === "pill_hole_with_rect_pad") {
       const holeWidth = getNumberProperty(platedRecord, "hole_width") ?? getNumberProperty(platedRecord, "outer_diameter") ?? 0;
       const holeHeight = getNumberProperty(platedRecord, "hole_height") ?? getNumberProperty(platedRecord, "hole_diameter") ?? 0;
@@ -14865,7 +14871,8 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
     defaultComponentHeight = DEFAULT_COMPONENT_HEIGHT,
     renderBoardTextures: shouldRenderTextures = true,
     textureResolution = 1024,
-    coordinateTransform
+    coordinateTransform,
+    showBoundingBoxes = true
   } = options;
   const db = cju(circuitJson);
   const boxes = [];
@@ -14981,7 +14988,8 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
       }
     }
     const usingGlbCoordinates = Boolean(model_glb_url || model_gltf_url);
-    const defaultTransform = coordinateTransform ?? (usingGlbCoordinates ? void 0 : hasFootprinterModel ? COORDINATE_TRANSFORMS.FOOTPRINTER_MODEL_TRANSFORM : COORDINATE_TRANSFORMS.Z_UP_TO_Y_UP_USB_FIX);
+    const usingObjFormat = Boolean(model_obj_url);
+    const defaultTransform = coordinateTransform ?? (usingGlbCoordinates ? void 0 : hasFootprinterModel ? COORDINATE_TRANSFORMS.FOOTPRINTER_MODEL_TRANSFORM : usingObjFormat ? COORDINATE_TRANSFORMS.OBJ_Z_UP_TO_Y_UP : COORDINATE_TRANSFORMS.Z_UP_TO_Y_UP_USB_FIX);
     if (model_stl_url) {
       box.mesh = await loadSTL(model_stl_url, defaultTransform);
     } else if (model_obj_url) {
@@ -14999,36 +15007,42 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
     if (box.mesh && modelScaleFactor !== 1) {
       box.mesh = scaleMesh(box.mesh, modelScaleFactor);
     }
+    if (box.mesh && cad.position && usingObjFormat) {
+      const meshBottom = box.mesh.boundingBox.min.y;
+      box.center.y -= meshBottom;
+    }
     if (!box.mesh) {
       box.color = componentColor;
     }
     boxes.push(box);
   }
-  for (const component of db.pcb_component.list()) {
-    if (pcbComponentIdsWith3D.has(component.pcb_component_id)) continue;
-    const sourceComponent = db.source_component.get(
-      component.source_component_id
-    );
-    const compHeight = Math.min(
-      Math.min(component.width, component.height),
-      defaultComponentHeight
-    );
-    const isBottomLayer = component.layer === "bottom";
-    boxes.push({
-      center: {
-        x: component.center.x,
-        y: isBottomLayer ? -(effectiveBoardThickness + compHeight / 2) : effectiveBoardThickness / 2 + compHeight / 2,
-        z: component.center.y
-      },
-      size: {
-        x: component.width,
-        y: compHeight,
-        z: component.height
-      },
-      color: componentColor,
-      label: sourceComponent?.name ?? "?",
-      labelColor: "white"
-    });
+  if (showBoundingBoxes) {
+    for (const component of db.pcb_component.list()) {
+      if (pcbComponentIdsWith3D.has(component.pcb_component_id)) continue;
+      const sourceComponent = db.source_component.get(
+        component.source_component_id
+      );
+      const compHeight = Math.min(
+        Math.min(component.width, component.height),
+        defaultComponentHeight
+      );
+      const isBottomLayer = component.layer === "bottom";
+      boxes.push({
+        center: {
+          x: component.center.x,
+          y: isBottomLayer ? -(effectiveBoardThickness + compHeight / 2) : effectiveBoardThickness / 2 + compHeight / 2,
+          z: component.center.y
+        },
+        size: {
+          x: component.width,
+          y: compHeight,
+          z: component.height
+        },
+        color: componentColor,
+        label: sourceComponent?.name ?? "?",
+        labelColor: "white"
+      });
+    }
   }
   let camera;
   if (pcbBoard) {
@@ -16401,7 +16415,8 @@ async function convertCircuitJsonToGltf(circuitJson, options = {}) {
   const scene3D = await convertCircuitJsonTo3D(circuitJson, {
     renderBoardTextures: true,
     textureResolution: boardTextureResolution,
-    coordinateTransform: options.coordinateTransform
+    coordinateTransform: options.coordinateTransform,
+    showBoundingBoxes
   });
   const gltfOptions = {
     binary: format === "glb",

package/package.json

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