geometrix 0.5.44 → 0.5.45

package/dist/index.js

@@ -3157,8 +3157,14 @@ function arc_to_stroke(cx, cy, radius, a1, a2, ccw, max_angle = Math.PI / 6, max
 }
 
 // src/write_openscad.ts
-var approxMaxAngle = Math.PI / 8;
-var approxMaxLength = 20;
+var approxMaxAngle = Math.PI / 16;
+var approxMaxLength = 2;
+function ff4(ifloat) {
+  return ifloat.toFixed(4);
+}
+function fid(iIdx) {
+  return iIdx.toString().padStart(3, "0");
+}
 function oscadSegLine(p2x, p2y) {
   const rSeg = [[p2x, p2y]];
   return rSeg;
@@ -3211,9 +3217,6 @@ function toOpenscadSeg(paxCtr) {
   }
   return rOscadSeg;
 }
-function ff4(ifloat) {
-  return ifloat.toFixed(4);
-}
 var OpenscadWriteFigure = class {
   pts;
   ptIdx;
@@ -3242,8 +3245,8 @@ var OpenscadWriteFigure = class {
     const aList = [];
     const bList = [];
     for (const idx of this.pts.keys()) {
-      const aId = `ca_${faceId}_${idx}`;
-      const bId = `cb_${faceId}_${idx}`;
+      const aId = `ca_${faceId}_${fid(idx)}`;
+      const bId = `cb_${faceId}_${fid(idx)}`;
       rStr += `${aId} = ${this.pts[idx]};
 `;
       rStr += `${bId} = ${this.ptIdx[idx]};
@@ -3429,6 +3432,12 @@ function oscadWrite() {
 // src/write_openjscad.ts
 var approxMaxAngle2 = Math.PI / 16;
 var approxMaxLength2 = 2;
+function ff5(ifloat) {
+  return ifloat.toFixed(4);
+}
+function fid2(iIdx) {
+  return iIdx.toString().padStart(3, "0");
+}
 function ojscadSegLine(p2x, p2y) {
   const rSeg = [[p2x, p2y]];
   return rSeg;
@@ -3481,12 +3490,6 @@ function jcSegCircle(cx, cy, radius) {
   const rSeg = circle_to_stroke(cx, cy, radius, approxMaxAngle2, approxMaxLength2);
   return rSeg;
 }
-function ff5(ifloat) {
-  return ifloat.toFixed(4);
-}
-function fid(iIdx) {
-  return iIdx.toString().padStart(3, "0");
-}
 function makeContourString(iCtr, ctrId) {
   const pts2 = [];
   for (const pt of iCtr) {
@@ -3556,10 +3559,10 @@ const main = () => {
     let rStr = "";
     const figFaceList = [];
     for (const [faceIdx, paxFace] of aFaces.entries()) {
-      const faceName = `face_${figName}_Fa${fid(faceIdx)}`;
+      const faceName = `face_${figName}_Fa${fid2(faceIdx)}`;
       const faceCtrList = [];
       for (const [ctrIdx, paxCtr] of paxFace.entries()) {
-        const subFaceName = `ctr_${faceName}_Ctr${fid(ctrIdx)}`;
+        const subFaceName = `ctr_${faceName}_Ctr${fid2(ctrIdx)}`;
         if (paxCtr.circle === true) {
           const paxCircle2 = paxCtr;
           rStr += jcFaceCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius, subFaceName);
@@ -3710,7 +3713,7 @@ function ojscadWrite() {
 function ff6(ifloat) {
   return ifloat.toFixed(4);
 }
-function fid2(iIdx) {
+function fid3(iIdx) {
   return iIdx.toString().padStart(3, "0");
 }
 function fcFaceCircle(cx, cy, radius, outName) {
@@ -3734,18 +3737,18 @@ function fcFaceContour(paxCtr, outName) {
   let sIdx = 0;
   for (const [segIdx, seg] of paxCtr.entries()) {
     if (seg.typ === 0 /* eStart */) {
-      rStr += `	P${fid2(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
+      rStr += `	P${fid3(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
 `;
       pIdx += 1;
     } else if (seg.typ === 1 /* eStroke */) {
-      rStr += `	P${fid2(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
+      rStr += `	P${fid3(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
 `;
       if (segIdx < paxCtr.length - 1) {
         pIdxLast = pIdx;
       } else {
         pIdxLast = 0;
       }
-      rStr += `	S${fid2(sIdx)} = Part.LineSegment(P${fid2(pIdx - 1)}, P${fid2(pIdxLast)})
+      rStr += `	S${fid3(sIdx)} = Part.LineSegment(P${fid3(pIdx - 1)}, P${fid3(pIdxLast)})
 `;
       pIdx += 1;
       sIdx += 1;
@@ -3753,20 +3756,20 @@ function fcFaceContour(paxCtr, outName) {
       try {
         const seg1 = convPaxToSeg1(seg);
         const p4 = midArcPoint(px1, py1, seg1);
-        rStr += `	P${fid2(pIdx)} = App.Vector(${ff6(p4.cx)}, ${ff6(p4.cy)}, 0)
+        rStr += `	P${fid3(pIdx)} = App.Vector(${ff6(p4.cx)}, ${ff6(p4.cy)}, 0)
 `;
         pIdx += 1;
       } catch (emsg) {
         console.log("err730: " + emsg);
       }
-      rStr += `	P${fid2(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
+      rStr += `	P${fid3(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
 `;
       if (segIdx < paxCtr.length - 1) {
         pIdxLast = pIdx;
       } else {
         pIdxLast = 0;
       }
-      rStr += `	S${fid2(sIdx)} = Part.Arc(P${fid2(pIdx - 2)}, P${fid2(pIdx - 1)}, P${fid2(pIdxLast)})
+      rStr += `	S${fid3(sIdx)} = Part.Arc(P${fid3(pIdx - 2)}, P${fid3(pIdx - 1)}, P${fid3(pIdxLast)})
 `;
       pIdx += 1;
       sIdx += 1;
@@ -3774,7 +3777,7 @@ function fcFaceContour(paxCtr, outName) {
     px1 = seg.px;
     py1 = seg.py;
   }
-  const segList = Array.from({ length: sIdx }, (v, i) => `S${fid2(i)}`);
+  const segList = Array.from({ length: sIdx }, (v, i) => `S${fid3(i)}`);
   rStr += `	aShape = Part.Shape([${segList.join(", ")}])
 	aWire = Part.Wire(aShape.Edges)
 	subFace = Part.Face(aWire)
@@ -3789,7 +3792,7 @@ function fcOneFace(ctrNames, outName) {
 `;
   const ctrShorts = [];
   for (const [idx, ctr] of ctrNames.entries()) {
-    const short = `FC${fid2(idx)}`;
+    const short = `FC${fid3(idx)}`;
     rStr += `	${short} = ${ctr}()
 `;
     ctrShorts.push(short);
@@ -3814,7 +3817,7 @@ function fcOneFig(faceNames, outName) {
 `;
   const faceShorts = [];
   for (const [idx, face] of faceNames.entries()) {
-    const short = `FA${fid2(idx)}`;
+    const short = `FA${fid3(idx)}`;
     rStr += `	${short} = ${face}()
 `;
     faceShorts.push(short);
@@ -3944,11 +3947,11 @@ ${extrud.outName} = fex_${extrud.outName}()
 `;
       let vidx = 0;
       for (const vol of othersV) {
-        rStr += `	V${fid2(vidx + 1)} = V${fid2(vidx)}.${combMethod}(${vol})
+        rStr += `	V${fid3(vidx + 1)} = V${fid3(vidx)}.${combMethod}(${vol})
 `;
         vidx += 1;
       }
-      rStr += `	VFC = V${fid2(vidx)}.removeSplitter()
+      rStr += `	VFC = V${fid3(vidx)}.removeSplitter()
 	return VFC
 ${volum.outName} = fvol_${volum.outName}()
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.44",
+	"version": "0.5.45",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {