easyeda 0.0.229 → 0.0.230

package/dist/browser/index.js

@@ -80281,13 +80281,13 @@ var parseCadOffsetsFromSvgNode = (svgNode) => {
   };
 };
 var readModelHeightMm = (raw) => {
-  const fallback = 2;
+  const fallback = 3.5;
   if (raw == null) return fallback;
   const n2 = Number(raw);
   if (!Number.isFinite(n2)) return fallback;
   const mmFromMil10 = mil10ToMm(n2);
   const mmFromMil = mm(`${n2}mil`);
-  const upper = 6;
+  const upper = 12;
   const lower = 0.1;
   let chosen = Math.max(mmFromMil10, mmFromMil);
   if (chosen > upper || chosen < lower) chosen = fallback;
@@ -80659,12 +80659,11 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
         const ROTATE_X_FOR_YUP = 90;
         const originalZRotation = (cad.rotation.z ?? 0) % 360;
         if (Math.abs(originalZRotation - 0) < 1 || Math.abs(originalZRotation - 360) < 1) {
-          cad.rotation.x = ((cad.rotation.x ?? 0) + 180 + 360) % 360;
+          cad.rotation.x = ((cad.rotation.x ?? 0) + 0 + 360) % 360;
         } else if (Math.abs(originalZRotation - 180) < 1) {
           cad.rotation.x = ((cad.rotation.x ?? 0) + 0 + 360) % 360;
         } else if (Math.abs(originalZRotation - 90) < 1) {
-          cad.rotation.x = ((cad.rotation.x ?? 0) + ROTATE_X_FOR_YUP + 360) % 360;
-          cad.rotation.y = ((cad.rotation.y ?? 0) + 270 + 360) % 360;
+          cad.rotation.x = ((cad.rotation.x ?? 0) + 0 + 360) % 360;
         } else if (Math.abs(originalZRotation - 270) < 1) {
           cad.rotation.x = ((cad.rotation.x ?? 0) + ROTATE_X_FOR_YUP + 360) % 360;
           cad.rotation.y = ((cad.rotation.y ?? 0) + 90 + 360) % 360;
@@ -80677,15 +80676,25 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
         if (side !== "top") {
           cad.rotation.x = ((cad.rotation.x ?? 0) + 180) % 360;
         }
-        const USE_Z_OFFSET = false;
+        const USE_Z_OFFSET_FOR_180 = Math.abs(originalZRotation - 180) < 1;
         const zOffRaw = cad.position.z ?? 0;
-        const zOff = USE_Z_OFFSET ? zOffRaw : 0;
+        const zOff = USE_Z_OFFSET_FOR_180 ? -zOffRaw : 0;
         const rx = (cad.rotation.x % 360 + 360) % 360;
-        const thicknessAlongWorldZ = rx % 180 === 90 ? cad.size.y : cad.size.z;
-        let centerZ = side === "top" ? t3 + zOff + thicknessAlongWorldZ / 2 : -t3 - zOff - thicknessAlongWorldZ / 2;
-        const desiredBottom = side === "top" ? +t3 : -t3;
-        const bottomZ = centerZ - thicknessAlongWorldZ / 2;
-        centerZ += desiredBottom - bottomZ;
+        let thicknessAlongWorldZ;
+        const is180RotatedYUp = (Math.abs(originalZRotation - 180) < 1 || Math.abs(originalZRotation - 0) < 1 || Math.abs(originalZRotation - 360) < 1) && Math.abs(rx) < 1;
+        if (is180RotatedYUp) {
+          thicknessAlongWorldZ = cad.size.y;
+        } else if (rx % 180 === 90) {
+          thicknessAlongWorldZ = cad.size.y;
+        } else {
+          thicknessAlongWorldZ = cad.size.z;
+        }
+        let centerZ;
+        if (is180RotatedYUp) {
+          centerZ = side === "top" ? t3 - thicknessAlongWorldZ / 2 : -t3 + thicknessAlongWorldZ / 2;
+        } else {
+          centerZ = side === "top" ? t3 + zOff + thicknessAlongWorldZ / 2 : -t3 - zOff - thicknessAlongWorldZ / 2;
+        }
         cad.position.z = centerZ;
       }
     }