geometrix 0.5.43 → 0.5.45

package/dist/index.d.ts

@@ -430,12 +430,12 @@ declare class Figure {
     addLines(ilines: Line[]): void;
     addVector(ivector: Vector): void;
     /**
-     * add one Outer contour and several Inner contours to the Main Layer
+     * add one face (one Outer contour and several Inner contours) to the Main Layer
      * @param {tOuterInner} iFace - the Face (i.e one Outer and several Inner contours) to be added
      */
     addMainOI(iFace: tOuterInner): void;
     /**
-     * add one Outer contour to the Main Layer
+     * add a simple face (one Outer contour) to the Main Layer
      * @param {tContour} iFace - the Face (without inner contours) to be added
      */
     addMainO(iFace: tContour): void;

package/dist/index.js

@@ -2499,7 +2499,7 @@ var Figure = class _Figure {
     this.vectorList.push(ivector);
   }
   /**
-   * add one Outer contour and several Inner contours to the Main Layer
+   * add one face (one Outer contour and several Inner contours) to the Main Layer
    * @param {tOuterInner} iFace - the Face (i.e one Outer and several Inner contours) to be added
    */
   addMainOI(iFace) {
@@ -2514,7 +2514,7 @@ var Figure = class _Figure {
     this.mainList.push(oneFace);
   }
   /**
-   * add one Outer contour to the Main Layer
+   * add a simple face (one Outer contour) to the Main Layer
    * @param {tContour} iFace - the Face (without inner contours) to be added
    */
   addMainO(iFace) {
@@ -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]};
@@ -3427,8 +3430,14 @@ function oscadWrite() {
 }
 
 // src/write_openjscad.ts
-var approxMaxAngle2 = Math.PI / 8;
-var approxMaxLength2 = 20;
+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;
@@ -3437,7 +3446,7 @@ function ojscadSegArc(cx, cy, radius, aa1, aa2, arcCcw) {
   const rSeg = arc_to_stroke(cx, cy, radius, aa1, aa2, arcCcw, approxMaxAngle2, approxMaxLength2);
   return rSeg;
 }
-function toOpenjscadSeg(paxCtr) {
+function jcSegContour(paxCtr) {
   const rOjscadSeg = [];
   let px1 = 0;
   let py1 = 0;
@@ -3477,82 +3486,102 @@ function toOpenjscadSeg(paxCtr) {
   }
   return rOjscadSeg;
 }
-function ojscadSegCircle(cx, cy, radius) {
+function jcSegCircle(cx, cy, radius) {
   const rSeg = circle_to_stroke(cx, cy, radius, approxMaxAngle2, approxMaxLength2);
   return rSeg;
 }
-function ff5(ifloat) {
-  return ifloat.toFixed(4);
-}
-var OjscadWriteFigure = class {
-  pts;
-  constructor() {
-    this.pts = [];
-  }
-  addContour(ictr) {
-    const pts2 = [];
-    for (const pt of ictr) {
-      const [px, py] = pt;
-      pts2.push(`[ ${ff5(px)}, ${ff5(py)} ]`);
-    }
-    const ptStr = `[ ${pts2.join(",")} ]`;
-    this.pts.push(ptStr);
+function makeContourString(iCtr, ctrId) {
+  const pts2 = [];
+  for (const pt of iCtr) {
+    const [px, py] = pt;
+    pts2.push(`[ ${ff5(px)}, ${ff5(py)} ]`);
   }
-  getFigure(faceId) {
-    let rStr = "";
-    const aList = [];
-    for (const idx of this.pts.keys()) {
-      const aId = `ctr_${faceId}_${idx}`;
-      rStr += `const ${aId} = polygon({ points: ${this.pts[idx]} });
+  const ptStr = `[ ${pts2.join(",\n	")} ]`;
+  const rStr = `const ${ctrId} = polygon({ points: ${ptStr} });
+
 `;
-      aList.push(aId);
-    }
-    if (aList.length === 1) {
-      rStr += `const face_${faceId} = ${aList[0]};
+  return rStr;
+}
+function jcFaceCircle(cx, cy, radius, ctrName) {
+  const ctr = jcSegCircle(cx, cy, radius);
+  const rStr = makeContourString(ctr, ctrName);
+  return rStr;
+}
+function jcFaceContour(paxCtr, ctrName) {
+  const ctr = jcSegContour(paxCtr);
+  const rStr = makeContourString(ctr, ctrName);
+  return rStr;
+}
+function jcOneFace(ctrNames, outName) {
+  let rStr = "";
+  const outer = ctrNames[0];
+  const inner = ctrNames.slice(1);
+  if (inner.length > 0) {
+    rStr += `${outName} = subtract( ${ctrNames.join(", ")} );
 `;
-    } else if (aList.length > 1) {
-      const ctrList = aList.join(", ");
-      rStr += `const face_${faceId} = subtract( ${ctrList} )
+  } else {
+    rStr += `${outName} = ${outer};
 `;
-    }
-    return rStr;
   }
-};
+  return rStr;
+}
+function jcOneFig(faceNames, outName) {
+  let rStr = "";
+  const firstFace = faceNames[0];
+  const otherFace = faceNames.slice(1);
+  if (otherFace.length > 0) {
+    rStr += `${outName} = union( ${faceNames.join(", ")} );
+`;
+  } else {
+    rStr += `${outName} = ${firstFace};
+`;
+  }
+  return rStr;
+}
 var OpenjscadWrite = class {
   //constructor() {}
   getHeader() {
     const rStr = `// Generated by Parametrix
-const { polygon } = require('@jscad/modeling').primitives
+
+const { polygon } = require('@jscad/modeling').primitives;
 //const { subtract } = require('@jscad/modeling').booleans;
-const { union, intersect, scission, subtract } = require('@jscad/modeling').booleans
+//const { union, intersect, scission, subtract } = require('@jscad/modeling').booleans;
+const { union, intersect, subtract } = require('@jscad/modeling').booleans;
 const { extrudeLinear, extrudeRotate } = require('@jscad/modeling').extrusions;
-const { translate, rotate } = require('@jscad/modeling').transforms
+const { translate, rotate } = require('@jscad/modeling').transforms;
+
 const main = () => {
+
 `;
     return rStr;
   }
-  getOneFigure(aFaces, faceId) {
-    const ojscadWF = new OjscadWriteFigure();
-    for (const paxFace of aFaces) {
-      for (const paxCtr of paxFace) {
+  getOneFigure(aFaces, figName) {
+    let rStr = "";
+    const figFaceList = [];
+    for (const [faceIdx, paxFace] of aFaces.entries()) {
+      const faceName = `face_${figName}_Fa${fid2(faceIdx)}`;
+      const faceCtrList = [];
+      for (const [ctrIdx, paxCtr] of paxFace.entries()) {
+        const subFaceName = `ctr_${faceName}_Ctr${fid2(ctrIdx)}`;
         if (paxCtr.circle === true) {
           const paxCircle2 = paxCtr;
-          const ojscadSeg = ojscadSegCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius);
-          ojscadWF.addContour(ojscadSeg);
+          rStr += jcFaceCircle(paxCircle2.cx, paxCircle2.cy, paxCircle2.radius, subFaceName);
         } else {
           const paxPath2 = paxCtr;
-          const ojscadSeg = toOpenjscadSeg(paxPath2.seg);
-          ojscadWF.addContour(ojscadSeg);
+          rStr += jcFaceContour(paxPath2.seg, subFaceName);
         }
+        faceCtrList.push(subFaceName);
       }
+      rStr += jcOneFace(faceCtrList, faceName);
+      figFaceList.push(faceName);
     }
-    const rOjscadF = ojscadWF.getFigure(faceId);
-    return rOjscadF;
+    rStr += jcOneFig(figFaceList, figName);
+    return rStr;
   }
-  getAllFigures(faces, partName) {
+  getAllFigures(figs, partName) {
     let rStr = "";
-    for (const face in faces) {
-      const figu = this.getOneFigure(faces[face], `${partName}_${face}`);
+    for (const ifig in figs) {
+      const figu = this.getOneFigure(figs[ifig], `fig_${partName}_${ifig}`);
       rStr += figu;
     }
     return rStr;
@@ -3571,9 +3600,10 @@ const main = () => {
 const ${extrud.outName} =
 	translate( [ ${extrud.translate[0]}, ${extrud.translate[1]}, ${extrud.translate[2]}, ],
 		rotate( [ ${extrud.rotate[0]}, ${extrud.rotate[1]}, ${extrud.rotate[2]}, ],
-			   ${extrudMethod}( ${extrudOption}, face_${extrud.face} )
+			   ${extrudMethod}( ${extrudOption}, fig_${extrud.face} )
 		)
 	);
+
 `;
     return rStr;
   }
@@ -3660,7 +3690,7 @@ const ${inherit.outName} =
   }
   getFooter(partName) {
     const rStr = `
-  return pax_${partName};
+return pax_${partName};
 }
 module.exports = { main };
 `;
@@ -3683,7 +3713,7 @@ function ojscadWrite() {
 function ff6(ifloat) {
   return ifloat.toFixed(4);
 }
-function fid(iIdx) {
+function fid3(iIdx) {
   return iIdx.toString().padStart(3, "0");
 }
 function fcFaceCircle(cx, cy, radius, outName) {
@@ -3707,18 +3737,18 @@ function fcFaceContour(paxCtr, outName) {
   let sIdx = 0;
   for (const [segIdx, seg] of paxCtr.entries()) {
     if (seg.typ === 0 /* eStart */) {
-      rStr += `	P${fid(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${fid(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${fid(sIdx)} = Part.LineSegment(P${fid(pIdx - 1)}, P${fid(pIdxLast)})
+      rStr += `	S${fid3(sIdx)} = Part.LineSegment(P${fid3(pIdx - 1)}, P${fid3(pIdxLast)})
 `;
       pIdx += 1;
       sIdx += 1;
@@ -3726,20 +3756,20 @@ function fcFaceContour(paxCtr, outName) {
       try {
         const seg1 = convPaxToSeg1(seg);
         const p4 = midArcPoint(px1, py1, seg1);
-        rStr += `	P${fid(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${fid(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${fid(sIdx)} = Part.Arc(P${fid(pIdx - 2)}, P${fid(pIdx - 1)}, P${fid(pIdxLast)})
+      rStr += `	S${fid3(sIdx)} = Part.Arc(P${fid3(pIdx - 2)}, P${fid3(pIdx - 1)}, P${fid3(pIdxLast)})
 `;
       pIdx += 1;
       sIdx += 1;
@@ -3747,7 +3777,7 @@ function fcFaceContour(paxCtr, outName) {
     px1 = seg.px;
     py1 = seg.py;
   }
-  const segList = Array.from({ length: sIdx }, (v, i) => `S${fid(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)
@@ -3762,7 +3792,7 @@ function fcOneFace(ctrNames, outName) {
 `;
   const ctrShorts = [];
   for (const [idx, ctr] of ctrNames.entries()) {
-    const short = `FC${fid(idx)}`;
+    const short = `FC${fid3(idx)}`;
     rStr += `	${short} = ${ctr}()
 `;
     ctrShorts.push(short);
@@ -3787,7 +3817,7 @@ function fcOneFig(faceNames, outName) {
 `;
   const faceShorts = [];
   for (const [idx, face] of faceNames.entries()) {
-    const short = `FA${fid(idx)}`;
+    const short = `FA${fid3(idx)}`;
     rStr += `	${short} = ${face}()
 `;
     faceShorts.push(short);
@@ -3917,11 +3947,11 @@ ${extrud.outName} = fex_${extrud.outName}()
 `;
       let vidx = 0;
       for (const vol of othersV) {
-        rStr += `	V${fid(vidx + 1)} = V${fid(vidx)}.${combMethod}(${vol})
+        rStr += `	V${fid3(vidx + 1)} = V${fid3(vidx)}.${combMethod}(${vol})
 `;
         vidx += 1;
       }
-      rStr += `	VFC = V${fid(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.43",
+	"version": "0.5.45",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -67,13 +67,13 @@
 		"json5": "^2.2.3"
 	},
 	"devDependencies": {
-		"@types/node": "^20.14.1",
+		"@types/node": "^20.14.2",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
 		"eslint": "^8.57.0",
 		"eslint-config-prettier": "^9.1.0",
 		"npm-run-all": "^4.1.5",
-		"prettier": "^3.3.0",
+		"prettier": "^3.3.2",
 		"shx": "^0.3.4",
 		"tsup": "^8.1.0",
 		"typescript": "^5.4.5",