circuit-json-to-gltf 0.0.24 → 0.0.26

package/dist/index.js

@@ -14614,6 +14614,38 @@ async function renderBoardTextures(circuitJson, resolution = 1024) {
   return { top, bottom };
 }
 
+// lib/utils/mesh-scale.ts
+function scalePoint(point, scale) {
+  return {
+    x: point.x * scale,
+    y: point.y * scale,
+    z: point.z * scale
+  };
+}
+function scaleTriangle(triangle, scale) {
+  return {
+    ...triangle,
+    vertices: triangle.vertices.map((vertex) => scalePoint(vertex, scale))
+  };
+}
+function scaleMesh(mesh, scale) {
+  if (!Number.isFinite(scale) || scale === 1) {
+    return mesh;
+  }
+  const scaledTriangles = mesh.triangles.map(
+    (triangle) => scaleTriangle(triangle, scale)
+  );
+  const scaledBoundingBox = {
+    min: scalePoint(mesh.boundingBox.min, scale),
+    max: scalePoint(mesh.boundingBox.max, scale)
+  };
+  return {
+    ...mesh,
+    triangles: scaledTriangles,
+    boundingBox: scaledBoundingBox
+  };
+}
+
 // lib/utils/pcb-board-geometry.ts
 var import_extrusions = __toESM(require_extrusions(), 1);
 var import_primitives = __toESM(require_primitives(), 1);
@@ -14683,11 +14715,53 @@ var createHoleGeoms = (boardCenter, thickness, holes = [], platedHoles = []) =>
   const holeGeoms = [];
   for (const hole of holes) {
     const holeRecord = hole;
+    const relX = hole.x - boardCenter.x;
+    const relY = -(hole.y - boardCenter.y);
+    const holeShape = holeRecord.hole_shape;
+    if (holeShape === "pill") {
+      const holeWidth = getNumberProperty(holeRecord, "hole_width");
+      const holeHeight = getNumberProperty(holeRecord, "hole_height");
+      if (!holeWidth || !holeHeight) continue;
+      const rotate = holeHeight > holeWidth;
+      const width = rotate ? holeHeight : holeWidth;
+      const height = rotate ? holeWidth : holeHeight;
+      const pillHole = createPillHole(
+        relX,
+        relY,
+        width,
+        height,
+        thickness,
+        rotate
+      );
+      holeGeoms.push(pillHole);
+      continue;
+    }
+    if (holeShape === "rotated_pill") {
+      const holeWidth = getNumberProperty(holeRecord, "hole_width");
+      const holeHeight = getNumberProperty(holeRecord, "hole_height");
+      if (!holeWidth || !holeHeight) continue;
+      const rotation = getNumberProperty(holeRecord, "ccw_rotation") ?? 0;
+      const rotationRad = -(rotation * Math.PI) / 180;
+      const minDimension = Math.min(holeWidth, holeHeight);
+      const maxAllowedRadius = Math.max(0, minDimension / 2 - RADIUS_EPSILON);
+      const roundRadius = maxAllowedRadius <= 0 ? 0 : Math.min(holeHeight / 2, maxAllowedRadius);
+      const hole2d = (0, import_primitives.roundedRectangle)({
+        size: [holeWidth, holeHeight],
+        roundRadius,
+        segments: DEFAULT_SEGMENTS
+      });
+      let hole3d = (0, import_extrusions.extrudeLinear)({ height: thickness + 1 }, hole2d);
+      hole3d = (0, import_transforms.translate)([0, 0, -(thickness + 1) / 2], hole3d);
+      if (rotationRad !== 0) {
+        hole3d = (0, import_transforms.rotateZ)(rotationRad, hole3d);
+      }
+      hole3d = (0, import_transforms.translate)([relX, relY, 0], hole3d);
+      holeGeoms.push(hole3d);
+      continue;
+    }
     const diameter = getNumberProperty(holeRecord, "hole_diameter") ?? getNumberProperty(holeRecord, "diameter");
     if (!diameter) continue;
     const radius = diameter / 2;
-    const relX = hole.x - boardCenter.x;
-    const relY = -(hole.y - boardCenter.y);
     holeGeoms.push(createCircularHole(relX, relY, radius, thickness));
   }
   for (const plated of platedHoles) {
@@ -14860,7 +14934,12 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
     pcbComponentIdsWith3D.add(cad.pcb_component_id);
     const pcbComponent = db.pcb_component.get(cad.pcb_component_id);
     const isBottomLayer = pcbComponent?.layer === "bottom";
-    const size = cad.size ?? {
+    const modelScaleFactor = cad.model_unit_to_mm_scale_factor ?? 1;
+    const size = cad.size ? {
+      x: cad.size.x * modelScaleFactor,
+      y: cad.size.y * modelScaleFactor,
+      z: cad.size.z * modelScaleFactor
+    } : {
       x: pcbComponent?.width ?? 2,
       y: defaultComponentHeight,
       z: pcbComponent?.height ?? 2
@@ -14930,6 +15009,9 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
         defaultTransform
       );
     }
+    if (box.mesh && modelScaleFactor !== 1) {
+      box.mesh = scaleMesh(box.mesh, modelScaleFactor);
+    }
     if (!box.mesh) {
       box.color = componentColor;
     }

package/package.json

@@ -2,7 +2,7 @@
   "name": "circuit-json-to-gltf",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "scripts": {
     "test": "bun test tests/",
     "format": "biome format --write .",
@@ -31,7 +31,7 @@
     "@vitejs/plugin-react": "^5.0.0",
     "bun-match-svg": "^0.0.12",
     "circuit-json": "^0.0.278",
-    "circuit-to-svg": "^0.0.175",
+    "circuit-to-svg": "^0.0.240",
     "graphics-debug": "^0.0.65",
     "looks-same": "^9.0.1",
     "poppygl": "^0.0.16",