geometrix 0.5.41 → 0.5.43

package/dist/index.js

@@ -3703,8 +3703,9 @@ function fcFaceContour(paxCtr, outName) {
   let px1 = 0;
   let py1 = 0;
   let pIdx = 0;
+  let pIdxLast = 0;
   let sIdx = 0;
-  for (const seg of paxCtr) {
+  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)
 `;
@@ -3712,7 +3713,12 @@ function fcFaceContour(paxCtr, outName) {
     } else if (seg.typ === 1 /* eStroke */) {
       rStr += `	P${fid(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
 `;
-      rStr += `	S${fid(sIdx)} = Part.LineSegment(P${fid(pIdx - 1)}, P${fid(pIdx)})
+      if (segIdx < paxCtr.length - 1) {
+        pIdxLast = pIdx;
+      } else {
+        pIdxLast = 0;
+      }
+      rStr += `	S${fid(sIdx)} = Part.LineSegment(P${fid(pIdx - 1)}, P${fid(pIdxLast)})
 `;
       pIdx += 1;
       sIdx += 1;
@@ -3728,7 +3734,12 @@ function fcFaceContour(paxCtr, outName) {
       }
       rStr += `	P${fid(pIdx)} = App.Vector(${ff6(seg.px)}, ${ff6(seg.py)}, 0)
 `;
-      rStr += `	S${fid(sIdx)} = Part.Arc(P${fid(pIdx - 2)}, P${fid(pIdx - 1)}, P${fid(pIdx)})
+      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)})
 `;
       pIdx += 1;
       sIdx += 1;
@@ -3861,10 +3872,10 @@ print(f"outFileName: {outFileName}")
       rStr += `	VEX = FIG.revolve(App.Vector(0, 0, 0), App.Vector(0, 1, 0), 360).rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), 90)`;
     }
     rStr += `
-	VR1 = VEX.rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), ${radToDeg(extrud.rotate[0])})
-	VR2 = VR1.rotate(App.Vector(0, 0, 0), App.Vector(0, 1, 0), ${radToDeg(extrud.rotate[1])})
-	VR3 = VR2.rotate(App.Vector(0, 0, 0), App.Vector(0, 0, 1), ${radToDeg(extrud.rotate[2])})
-	VFP = VR3.translate(App.Vector(${extrud.translate[0]}, ${extrud.translate[1]}, ${extrud.translate[2]}))
+	VR1 = VEX.rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), ${ff6(radToDeg(extrud.rotate[0]))})
+	VR2 = VR1.rotate(App.Vector(0, 0, 0), App.Vector(0, 1, 0), ${ff6(radToDeg(extrud.rotate[1]))})
+	VR3 = VR2.rotate(App.Vector(0, 0, 0), App.Vector(0, 0, 1), ${ff6(radToDeg(extrud.rotate[2]))})
+	VFP = VR3.translate(App.Vector(${ff6(extrud.translate[0])}, ${ff6(extrud.translate[1])}, ${ff6(extrud.translate[2])}))
 	return VFP
 ${extrud.outName} = fex_${extrud.outName}()
 
@@ -3883,30 +3894,38 @@ ${extrud.outName} = fex_${extrud.outName}()
     let rStr = "";
     if (volum.inList.length === 0) {
       console.log(`err215: ${volum.outName} has an empty inList`);
-    } else if (volum.inList.length === 1) {
+    } else if (volum.inList.length === 1 || volum.boolMethod === 0 /* eIdentity */) {
       rStr += `${volum.outName} = ${volum.inList[0]}
 `;
     } else {
       const firstV = volum.inList[0];
       const othersV = volum.inList.slice(1);
+      let combMethod = "dbg897";
       switch (volum.boolMethod) {
-        case 0 /* eIdentity */:
-          rStr += `${volum.outName} = ${firstV}
-`;
-          break;
         case 1 /* eIntersection */:
-          rStr += `${volum.outName} = ${firstV}.common([${othersV.join(", ")}])
-`;
+          combMethod = "common";
           break;
         case 2 /* eUnion */:
-          rStr += `${volum.outName} = ${firstV}.fuse([${othersV.join(", ")}])
-`;
+          combMethod = "fuse";
           break;
         case 3 /* eSubstraction */:
-          rStr += `${volum.outName} = ${firstV}.cut([${othersV.join(", ")}])
-`;
+          combMethod = "cut";
           break;
       }
+      rStr += `def fvol_${volum.outName}():
+	V000 = ${firstV}
+`;
+      let vidx = 0;
+      for (const vol of othersV) {
+        rStr += `	V${fid(vidx + 1)} = V${fid(vidx)}.${combMethod}(${vol})
+`;
+        vidx += 1;
+      }
+      rStr += `	VFC = V${fid(vidx)}.removeSplitter()
+	return VFC
+${volum.outName} = fvol_${volum.outName}()
+
+`;
     }
     return rStr;
   }
@@ -3928,11 +3947,13 @@ ${extrud.outName} = fex_${extrud.outName}()
     return rGeoms;
   }
   getOneInherit(inherit) {
-    const rStr = `
-IVR1_${inherit.subdesign} = ${inherit.subdesign}.rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), ${radToDeg(inherit.rotate[0])})
-IVR2_${inherit.subdesign} = IVR1_${inherit.subdesign}.rotate(App.Vector(0, 0, 0), App.Vector(0, 1, 0), ${radToDeg(inherit.rotate[1])})
-IVR3_${inherit.subdesign} = IVR2_${inherit.subdesign}.rotate(App.Vector(0, 0, 0), App.Vector(0, 0, 1), ${radToDeg(inherit.rotate[2])})
-${inherit.outName} = IVR3_${inherit.subdesign}.translate(App.Vector(${inherit.translate[0]}, ${inherit.translate[1]}, ${inherit.translate[2]}))
+    const rStr = `def finh_${inherit.outName}():
+	IVR1 = ${inherit.subdesign}.rotate(App.Vector(0, 0, 0), App.Vector(1, 0, 0), ${ff6(radToDeg(inherit.rotate[0]))})
+	IVR2 = IVR1.rotate(App.Vector(0, 0, 0), App.Vector(0, 1, 0), ${ff6(radToDeg(inherit.rotate[1]))})
+	IVR3 = IVR2.rotate(App.Vector(0, 0, 0), App.Vector(0, 0, 1), ${ff6(radToDeg(inherit.rotate[2]))})
+	IVF = IVR3.translate(App.Vector(${ff6(inherit.translate[0])}, ${ff6(inherit.translate[1])}, ${ff6(inherit.translate[2])}))
+	return IVF
+${inherit.outName} = finh_${inherit.outName}()
 
 `;
     return rStr;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.41",
+	"version": "0.5.43",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -67,7 +67,7 @@
 		"json5": "^2.2.3"
 	},
 	"devDependencies": {
-		"@types/node": "^20.14.0",
+		"@types/node": "^20.14.1",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
 		"eslint": "^8.57.0",