circuit-json-to-gltf 0.0.14 → 0.0.16

package/dist/index.js

@@ -1145,14 +1145,19 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
       continue;
     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 ?? {
       x: pcbComponent?.width ?? 2,
       y: defaultComponentHeight,
       z: pcbComponent?.height ?? 2
     };
-    const center = cad.position ? { x: cad.position.x, y: cad.position.z, z: cad.position.y } : {
+    const center = cad.position ? {
+      x: cad.position.x,
+      y: isBottomLayer ? -Math.abs(cad.position.z) : cad.position.z,
+      z: cad.position.y
+    } : {
       x: pcbComponent?.center.x ?? 0,
-      y: boardThickness / 2 + size.y / 2,
+      y: isBottomLayer ? -(boardThickness / 2 + size.y / 2) : boardThickness / 2 + size.y / 2,
       z: pcbComponent?.center.y ?? 0
     };
     const meshType = model_stl_url ? "stl" : model_obj_url ? "obj" : model_gltf_url ? "gltf" : "glb";
@@ -1165,14 +1170,32 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
     if (cad.rotation) {
       if (model_glb_url || model_gltf_url) {
         box.rotation = convertRotationFromCadRotation({
-          x: cad.rotation.x,
+          x: isBottomLayer ? cad.rotation.x + 180 : cad.rotation.x,
           y: cad.rotation.z,
           // Circuit Z rotation becomes model Y rotation
           z: cad.rotation.y
           // Circuit Y rotation becomes model Z rotation
         });
       } else {
-        box.rotation = convertRotationFromCadRotation(cad.rotation);
+        box.rotation = convertRotationFromCadRotation({
+          x: isBottomLayer ? cad.rotation.x + 180 : cad.rotation.x,
+          y: cad.rotation.y,
+          z: cad.rotation.z
+        });
+      }
+    } else if (isBottomLayer) {
+      if (model_glb_url || model_gltf_url) {
+        box.rotation = convertRotationFromCadRotation({
+          x: 180,
+          y: 0,
+          z: 0
+        });
+      } else {
+        box.rotation = convertRotationFromCadRotation({
+          x: 180,
+          y: 0,
+          z: 0
+        });
       }
     }
     const defaultTransform = coordinateTransform ?? (model_glb_url || model_gltf_url ? void 0 : COORDINATE_TRANSFORMS.Z_UP_TO_Y_UP_USB_FIX);
@@ -1199,10 +1222,11 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
       Math.min(component.width, component.height),
       defaultComponentHeight
     );
+    const isBottomLayer = component.layer === "bottom";
     boxes.push({
       center: {
         x: component.center.x,
-        y: boardThickness / 2 + compHeight / 2,
+        y: isBottomLayer ? -(boardThickness / 2 + compHeight / 2) : boardThickness / 2 + compHeight / 2,
         z: component.center.y
       },
       size: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "circuit-json-to-gltf",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "scripts": {
     "test": "bun test tests/",
     "format": "biome format --write .",
@@ -48,6 +48,9 @@
   "peerDependenciesMeta": {
     "@resvg/resvg-wasm": {
       "optional": true
+    },
+    "@resvg/resvg-js": {
+      "optional": true
     }
   }
 }