designix 0.5.42 → 0.5.44

package/dist/index.js

@@ -1736,6 +1736,7 @@ function pGeom3(t, param, suffix = "") {
   const figPetal = figure3();
   const figButtress1 = figure3();
   const figButtress2 = figure3();
+  const figButtress12 = figure3();
   rGeome.logstr += `${rGeome.partName} simTime: ${t}
 `;
   try {
@@ -1766,7 +1767,8 @@ function pGeom3(t, param, suffix = "") {
     rGeome.logstr += `vaxis_holder D2-next: ${ffix5(2 * R2next)} mm
 `;
     const ctrOuter = function(rnl) {
-      const rCtr = contour5(rnl * R5, -param.PHE1 / 2).addSegStrokeR(rnl * (innerR1 - R5), 0).addSegStrokeRP(-Math.PI / 2 + rnl * outerA, innerL2).addSegStrokeRP(-Math.PI / 2 + rnl * (Math.PI / 2 + outerA), param.PHE2).addSegStrokeRP(Math.PI / 2 + rnl * outerA, param.PHL1).addSegStrokeRP(Math.PI / 2 + rnl * (Math.PI / 2 + outerA), param.PHE2).addSegStrokeRP(-Math.PI / 2 + rnl * outerA, innerL2).addSegStrokeA(rnl * R5, param.PHE1 / 2).closeSegStroke();
+      const R5b = R5 + (innerR1 - R5) / 2;
+      const rCtr = contour5(rnl * R5b, -param.PHE1 / 2).addSegStrokeR(rnl * (innerR1 - R5b), 0).addSegStrokeRP(-Math.PI / 2 + rnl * outerA, innerL2).addSegStrokeRP(-Math.PI / 2 + rnl * (Math.PI / 2 + outerA), param.PHE2).addSegStrokeRP(Math.PI / 2 + rnl * outerA, param.PHL1).addSegStrokeRP(Math.PI / 2 + rnl * (Math.PI / 2 + outerA), param.PHE2).addSegStrokeRP(-Math.PI / 2 + rnl * outerA, innerL2).addSegStrokeA(rnl * R5b, param.PHE1 / 2).closeSegStroke();
       return rCtr;
     };
     const ctrLeg = function(rnl) {
@@ -1788,19 +1790,34 @@ function pGeom3(t, param, suffix = "") {
       return rCtr;
     };
     const ctrButtress2 = function(rnl) {
-      const rCtr = contour5(rnl * (R1 + param.PHR4), param.PHE1 / 2).addSegStrokeA(rnl * innerR2, param.PHE1 / 2).addSegStrokeRP(Math.PI / 2 + rnl * outerA, innerL2).addSegStrokeA(rnl * (R1 + param.PHR4), param.PHE1 + param.PHH1).closeSegStroke();
+      const rCtr = contour5(rnl * (R1 + param.PHR4), param.PHE1 / 2).addSegStrokeA(rnl * innerR2, param.PHE1 / 2).addSegStrokeRP(Math.PI / 2 + rnl * outerA, innerL2).addSegStrokeA(rnl * (R1 + param.PHR4), param.PHE1 / 2 + param.PHH1).closeSegStroke();
+      return rCtr;
+    };
+    const ctrButtress12 = function(rnl) {
+      const pA = point4(rnl * innerR2, param.PHE1 / 2).translatePolar(
+        Math.PI / 2 + rnl * outerA,
+        innerL2
+      );
+      const pB = point4(rnl * innerR1, -param.PHE1 / 2).translatePolar(
+        -Math.PI / 2 + rnl * outerA,
+        innerL2
+      );
+      const innerRb = R2 - param.PHE2 / 2;
+      const rCtr = contour5(rnl * innerRb, 0).addSegStrokeA(pA.cx, pA.cy).addSegStrokeA(rnl * (R1 + param.PHR4), param.PHE1 / 2 + param.PHH1).addSegStrokeA(rnl * (R1 + param.PHR4), param.PHE1 / 2).addSegStrokeA(rnl * (R1 + param.PHR4), -param.PHE1 / 2).addSegStrokeA(pB.cx, pB.cy).closeSegStroke();
       return rCtr;
     };
     figOuter.addSecond(ctrButtress1(-1));
     figOuter.addSecond(ctrButtress2(-1));
     figButtress1.mergeFigure(figOuter, true);
     figButtress2.mergeFigure(figOuter, true);
+    figButtress12.mergeFigure(figOuter, true);
     figOuter.addSecond(ctrButtress1(1));
     figOuter.addSecond(ctrButtress2(1));
     figButtress1.addMainO(ctrButtress1(1));
     figButtress1.addSecond(ctrButtress2(1));
     figButtress2.addSecond(ctrButtress1(1));
     figButtress2.addMainO(ctrButtress2(1));
+    figButtress12.addMainO(ctrButtress12(1));
     const fPetal = [];
     fPetal.push(contourCircle3(0, 0, innerR));
     figPetal.addSecond(contourCircle3(0, 0, R2));
@@ -1821,31 +1838,19 @@ function pGeom3(t, param, suffix = "") {
       facePetal: figPetal,
       faceOuter: figOuter,
       faceButtress1: figButtress1,
-      faceButtress2: figButtress2
+      faceButtress2: figButtress2,
+      faceButtress12: figButtress12
     };
     const designName = rGeome.partName;
     const tm = transform3d();
     tm.addRotation(Math.PI / 2, 0, 0);
     tm.addTranslation(0, param.PHE3 / 2, 0);
-    const preExtrude1 = petalAngles.map((rota, idx) => {
-      const tm1 = transform3d(tm.getMatrix());
-      tm1.addRotation(0, 0, rota);
-      const rElem = {
-        outName: `subpax_${designName}_b1_${idx}`,
-        face: `${designName}_faceButtress1`,
-        extrudeMethod: EExtrude2.eLinearOrtho,
-        length: param.PHE3,
-        rotate: tm1.getRotation(),
-        translate: tm1.getTranslation()
-      };
-      return rElem;
-    });
     const preExtrude2 = petalAngles.map((rota, idx) => {
       const tm2 = transform3d(tm.getMatrix());
       tm2.addRotation(0, 0, rota);
       const rElem = {
         outName: `subpax_${designName}_b2_${idx}`,
-        face: `${designName}_faceButtress2`,
+        face: `${designName}_faceButtress12`,
         extrudeMethod: EExtrude2.eLinearOrtho,
         length: param.PHE3,
         rotate: tm2.getRotation(),
@@ -1853,10 +1858,6 @@ function pGeom3(t, param, suffix = "") {
       };
       return rElem;
     });
-    const b1List = petalAngles.map((elem, idx) => {
-      const subElem = `subpax_${designName}_b1_${idx}`;
-      return subElem;
-    });
     const b2List = petalAngles.map((elem, idx) => {
       const subElem = `subpax_${designName}_b2_${idx}`;
       return subElem;
@@ -1878,7 +1879,7 @@ function pGeom3(t, param, suffix = "") {
           rotate: [0, 0, 0],
           translate: [0, 0, -param.PHE1 / 2]
         },
-        ...preExtrude1,
+        //...preExtrude1,
         ...preExtrude2
       ],
       volumes: [
@@ -1888,7 +1889,7 @@ function pGeom3(t, param, suffix = "") {
           inList: [
             `subpax_${designName}_petal`,
             `subpax_${designName}_outer`,
-            ...b1List,
+            //...b1List,
             ...b2List
           ]
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "designix",
-	"version": "0.5.42",
+	"version": "0.5.44",
 	"description": "The first designs made with parametrix",
 	"private": false,
 	"repository": {
@@ -72,7 +72,7 @@
 		"clean": "shx rm -fr dist dist2 node_modules"
 	},
 	"dependencies": {
-		"geometrix": "^0.5.40"
+		"geometrix": "^0.5.42"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "^7.0.1",