geometrix 0.5.23 → 0.5.25

package/dist/index.d.ts

@@ -445,7 +445,8 @@ declare function copyLayers(iLayers: tLayers): tLayers;
 declare enum PType {
     eNumber = 0,
     eCheckbox = 1,
-    eDropdown = 2
+    eDropdown = 2,
+    eSectionSeparator = 3
 }
 interface tParam {
     name: string;
@@ -468,6 +469,7 @@ interface tParamDef {
     paramSvg: Record<string, string>;
     sim: tSimTime;
 }
+declare const zeroPDef: tParamDef;
 type tParamVal = Record<string, number>;
 type tParamChanged = Record<string, boolean>;
 interface tDesignParamOne {
@@ -503,6 +505,7 @@ declare function designParam(iparamDef: tParamDef, suffix?: string): DesignParam
 declare function pNumber(name: string, unit: string, init: number, min?: number, max?: number, step?: number): tParam;
 declare function pCheckbox(name: string, init: boolean): tParam;
 declare function pDropdown(name: string, values: string[]): tParam;
+declare function pSectionSeparator(name: string): tParam;
 
 type tPosiOrien = [number, number, number];
 interface tSubInst {
@@ -581,20 +584,36 @@ declare enum EFormat {
     eJSCAD = 6,
     eZIP = 7
 }
-declare function fileTextContent(fgeom: tGeomFunc, paramVal: tParamVal, eFace: string, exportFormat: EFormat): string;
-declare function fileBinContent(fgeom: tGeomFunc, tSim: number, paramVal: tParamVal, exportFormat: EFormat): Promise<Blob>;
+declare function fileTextContent(fgeom: tGeomFunc, paramVal: tParamVal, ipDef: tParamDef, eFace: string, exportFormat: EFormat): string;
+declare function fileBinContent(fgeom: tGeomFunc, tSim: number, paramVal: tParamVal, ipDef: tParamDef, exportFormat: EFormat): Promise<Blob>;
 declare function fileMime(exportFormat: EFormat): string;
 declare function fileSuffix(exportFormat: EFormat): string;
 declare function fileBin(exportFormat: EFormat): boolean;
 
 interface tParamValInFile {
     lastModif: string;
+    partName: string;
     pVal: tParamVal;
     comment: string;
 }
-declare function createParamFile(lastModif: string, idparams: tParamVal, comment: string): string;
+declare function createParamFile(lastModif: string, iPartName: string, idparams: tParamVal, comment: string): string;
 declare function parseParamFile(fContentStr: string): [tParamValInFile, string];
 
+type tVec3 = [number, number, number];
+type tVec4 = [number, number, number, number];
+type tT3dMatrix = [tVec4, tVec4, tVec4, tVec4];
+declare class Transform3d {
+    mmat: tT3dMatrix;
+    constructor(iMat: tT3dMatrix);
+    addRotation(ax: number, ay: number, az: number): void;
+    addTranslation(ax: number, ay: number, az: number): void;
+    getMatrix(): tT3dMatrix;
+    getRotation(): tVec3;
+    getTranslation(): tVec3;
+    transform(iv: tVec3): tVec3;
+}
+declare function transform3d(initM?: tT3dMatrix): Transform3d;
+
 /** For cli-app and ui-app */
 type tDependencies = Record<string, string>;
 /** For cli-app and ui-app */
@@ -608,4 +627,4 @@ declare function version_details(appPackage: tPackage): string[];
 
 declare function checkImpPages(pages: tAllPageDef): [boolean, string];
 
-export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustInit, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointMinMax, prefixLog, radToDeg, radius2canvas, rightTriLaFromLbLc, rightTriLbFromLaLc, roundZero, type tAffine, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tCartesian, type tContour, type tDependencies, type tDesignParamList, type tDesignParamOne, type tExtrude, type tFaces, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tVolume, tolerance, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi };
+export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Transform3d, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustInit, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointMinMax, prefixLog, radToDeg, radius2canvas, rightTriLaFromLbLc, rightTriLbFromLaLc, roundZero, type tAffine, type tAllLink, type tAllPageDef, type tBVolume, type tCanvasAdjust, type tCartesian, type tContour, type tDependencies, type tDesignParamList, type tDesignParamOne, type tExtrude, type tFaces, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tT3dMatrix, type tVec3, type tVec4, type tVolume, tolerance, transform3d, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi, zeroPDef };

package/dist/index.js

@@ -1799,13 +1799,15 @@ var Contour = class _Contour extends AContour {
       const p0p2middle = p0.middlePoint(p2);
       const a0 = p0p2middle.angleToPoint(p0);
       const a1 = p0p2middle.angleToPoint(p1);
-      const a3 = p0p2middle.angleToPoint(p3);
       const a01 = withinPiPi(a1 - a0);
-      const a03 = withinPiPi(a3 - a0);
       let large = false;
       let ccw = false;
-      if (Math.sign(a03) * Math.sign(a01) > 0) {
-        large = true;
+      if (!p0p2middle.isEqual(p3)) {
+        const a3 = p0p2middle.angleToPoint(p3);
+        const a03 = withinPiPi(a3 - a0);
+        if (Math.sign(a03) * Math.sign(a01) > 0) {
+          large = true;
+        }
       }
       if (Math.sign(a01) > 0) {
         ccw = true;
@@ -2737,8 +2739,19 @@ var PType = /* @__PURE__ */ ((PType2) => {
   PType2[PType2["eNumber"] = 0] = "eNumber";
   PType2[PType2["eCheckbox"] = 1] = "eCheckbox";
   PType2[PType2["eDropdown"] = 2] = "eDropdown";
+  PType2[PType2["eSectionSeparator"] = 3] = "eSectionSeparator";
   return PType2;
 })(PType || {});
+var zeroPDef = {
+  partName: "",
+  params: [],
+  paramSvg: {},
+  sim: {
+    tMax: 0,
+    tStep: 0,
+    tUpdate: 0
+  }
+};
 function oneDesignParam(iVal, iInit, iChg) {
   const oneDP = { val: iVal, init: iInit, chg: iChg };
   return oneDP;
@@ -2878,6 +2891,19 @@ function pDropdown(name, values) {
   };
   return rParam;
 }
+function pSectionSeparator(name) {
+  const rParam = {
+    name,
+    unit: "section-separator",
+    init: 0,
+    min: 0,
+    max: 0,
+    step: 0,
+    dropdown: [],
+    pType: 3 /* eSectionSeparator */
+  };
+  return rParam;
+}
 
 // src/volume.ts
 var EExtrude = /* @__PURE__ */ ((EExtrude2) => {
@@ -2945,9 +2971,10 @@ var PaxWrite = class {
     }
     return figFaces;
   }
-  getPaxJson(paramVal, geome0) {
+  getPaxJson(paramVal, geome0, ipDef) {
     const rPaxJson = {
       partName: geome0.partName,
+      pDef: ipDef,
       params: paramVal,
       faces: this.getFigures(geome0.fig),
       volume: geome0.vol,
@@ -2956,8 +2983,8 @@ var PaxWrite = class {
     };
     return rPaxJson;
   }
-  getPaxStr(paramVal, geome0) {
-    const paxJson = this.getPaxJson(paramVal, geome0);
+  getPaxStr(paramVal, geome0, ipDef) {
+    const paxJson = this.getPaxJson(paramVal, geome0, ipDef);
     const rStr = JSON.stringify(paxJson, null, 2);
     return rStr;
   }
@@ -3254,7 +3281,7 @@ module ${inherit.outName} () {
     if (vol.inherits !== void 0) {
       const subGeoms = this.getAllSubGeoms(vol.inherits);
       for (const oneGeom of subGeoms) {
-        const paxJson = paxWrite().getPaxJson({}, oneGeom);
+        const paxJson = paxWrite().getPaxJson({}, oneGeom, zeroPDef);
         rStr += this.getAllFigures(paxJson.faces, paxJson.partName);
         rStr += this.getVolume(oneGeom.vol);
       }
@@ -3503,7 +3530,7 @@ const ${inherit.outName} =
     if (vol.inherits !== void 0) {
       const subGeoms = this.getAllSubGeoms(vol.inherits);
       for (const oneGeom of subGeoms) {
-        const paxJson = paxWrite().getPaxJson({}, oneGeom);
+        const paxJson = paxWrite().getPaxJson({}, oneGeom, zeroPDef);
         rStr += this.getAllFigures(paxJson.faces, paxJson.partName);
         rStr += this.getVolume(oneGeom.vol);
       }
@@ -3650,21 +3677,21 @@ function figureToDxf(aCtr) {
   const rDxf = dxf.stringify();
   return rDxf;
 }
-function makePax(paramVal, geome0) {
-  const rStr = paxWrite().getPaxStr(paramVal, geome0);
+function makePax(paramVal, geome0, ipDef) {
+  const rStr = paxWrite().getPaxStr(paramVal, geome0, ipDef);
   return rStr;
 }
 function makeOpenscad(geome0) {
-  const paxJson = paxWrite().getPaxJson({}, geome0);
+  const paxJson = paxWrite().getPaxJson({}, geome0, zeroPDef);
   const rStr = oscadWrite().getExportFile(paxJson);
   return rStr;
 }
 function makeOpenjscad(geome0) {
-  const paxJson = paxWrite().getPaxJson({}, geome0);
+  const paxJson = paxWrite().getPaxJson({}, geome0, zeroPDef);
   const rStr = ojscadWrite().getExportFile(paxJson);
   return rStr;
 }
-async function makeZip(paramVal, geome0, tSim, geome1) {
+async function makeZip(paramVal, geome0, tSim, geome1, ipDef) {
   const zipFileWriter = new zip.BlobWriter("application/zip");
   const zipWriter = new zip.ZipWriter(zipFileWriter);
   const partName = geome0.partName;
@@ -3693,7 +3720,7 @@ async function makeZip(paramVal, geome0, tSim, geome1) {
   await zipWriter.add(`deco_${partName}_all_merged.svg`, svgMergedDeco);
   const svgMergedDecoT = new zip.TextReader(figureToSvgDeco(mergedFace));
   await zipWriter.add(`deco_${partName}_all_merged_t${tSim}.svg`, svgMergedDecoT);
-  const zPax = new zip.TextReader(makePax(paramVal, geome0));
+  const zPax = new zip.TextReader(makePax(paramVal, geome0, ipDef));
   await zipWriter.add(`${partName}.pax.json`, zPax);
   const zSCad = new zip.TextReader(makeOpenscad(geome0));
   await zipWriter.add(`${partName}_noarc_openscad.scad`, zSCad);
@@ -3716,7 +3743,7 @@ var EFormat = /* @__PURE__ */ ((EFormat2) => {
   EFormat2[EFormat2["eZIP"] = 7] = "eZIP";
   return EFormat2;
 })(EFormat || {});
-function fileTextContent(fgeom, paramVal, eFace, exportFormat) {
+function fileTextContent(fgeom, paramVal, ipDef, eFace, exportFormat) {
   const geome0 = fgeom(0, paramVal);
   let rFileContent = "";
   if (!geome0.calcErr) {
@@ -3742,7 +3769,7 @@ function fileTextContent(fgeom, paramVal, eFace, exportFormat) {
       const figu = mergeFaces(geome0.fig);
       rFileContent = figureToDxf(figu.mainList);
     } else if (exportFormat === 4 /* ePAX */) {
-      rFileContent = makePax(paramVal, geome0);
+      rFileContent = makePax(paramVal, geome0, ipDef);
     } else if (exportFormat === 5 /* eOPENSCAD */) {
       rFileContent = makeOpenscad(geome0);
     } else if (exportFormat === 6 /* eJSCAD */) {
@@ -3755,13 +3782,13 @@ function fileTextContent(fgeom, paramVal, eFace, exportFormat) {
   }
   return rFileContent;
 }
-async function fileBinContent(fgeom, tSim, paramVal, exportFormat) {
+async function fileBinContent(fgeom, tSim, paramVal, ipDef, exportFormat) {
   const geome0 = fgeom(0, paramVal);
   const geome1 = fgeom(tSim, paramVal);
   let rFileContent = new Blob();
   if (!geome0.calcErr && !geome1.calcErr) {
     if (exportFormat === 7 /* eZIP */) {
-      rFileContent = await makeZip(paramVal, geome0, tSim, geome1);
+      rFileContent = await makeZip(paramVal, geome0, tSim, geome1, ipDef);
     } else {
       console.log(`err913: unknown exportFormat ${exportFormat}`);
     }
@@ -3813,9 +3840,10 @@ function fileBin(exportFormat) {
 }
 
 // src/paramFile.ts
-function createParamFile(lastModif, idparams, comment) {
+function createParamFile(lastModif, iPartName, idparams, comment) {
   const allVal = {
     lastModif,
+    partName: iPartName,
     pVal: idparams,
     comment
   };
@@ -3825,13 +3853,17 @@ function createParamFile(lastModif, idparams, comment) {
 function parseParamFile(fContentStr) {
   const wholeJson = JSON.parse(fContentStr);
   const lastModifKey = "lastModif";
+  const partNameKey = "partName";
   const pValKey = "pVal";
   const commentKey = "comment";
   let rlog = "";
-  const rObj = { lastModif: "", pVal: {}, comment: "" };
+  const rObj = { lastModif: "", partName: "", pVal: {}, comment: "" };
   if (Object.hasOwn(wholeJson, lastModifKey)) {
     rObj[lastModifKey] = wholeJson[lastModifKey];
   }
+  if (Object.hasOwn(wholeJson, partNameKey)) {
+    rObj[partNameKey] = wholeJson[partNameKey];
+  }
   if (Object.hasOwn(wholeJson, pValKey)) {
     const paNaVa = wholeJson[pValKey];
     for (const paNa of Object.keys(paNaVa)) {
@@ -3853,6 +3885,167 @@ function parseParamFile(fContentStr) {
   return [rObj, rlog];
 }
 
+// src/transform3d.ts
+function t3dInitNull() {
+  const rM = [
+    [0, 0, 0, 0],
+    [0, 0, 0, 0],
+    [0, 0, 0, 0],
+    [0, 0, 0, 0]
+  ];
+  return rM;
+}
+function t3dInitIdentity() {
+  const rM = [
+    [1, 0, 0, 0],
+    [0, 1, 0, 0],
+    [0, 0, 1, 0],
+    [0, 0, 0, 1]
+  ];
+  return rM;
+}
+function t3dRotateX(ax) {
+  const rM = t3dInitIdentity();
+  const cos = Math.cos(ax);
+  const sin = Math.sin(ax);
+  rM[1][1] = cos;
+  rM[2][2] = cos;
+  rM[2][1] = sin;
+  rM[1][2] = -sin;
+  return rM;
+}
+function t3dRotateY(ay) {
+  const rM = t3dInitIdentity();
+  const cos = Math.cos(ay);
+  const sin = Math.sin(ay);
+  rM[0][0] = cos;
+  rM[2][2] = cos;
+  rM[0][2] = sin;
+  rM[2][0] = -sin;
+  return rM;
+}
+function t3dRotateZ(az) {
+  const rM = t3dInitIdentity();
+  const cos = Math.cos(az);
+  const sin = Math.sin(az);
+  rM[0][0] = cos;
+  rM[1][1] = cos;
+  rM[0][1] = -sin;
+  rM[1][0] = sin;
+  return rM;
+}
+function t3dMatMultiply(ma, mb) {
+  const rM = t3dInitNull();
+  for (let i = 0; i < 4; i++) {
+    for (let j = 0; j < 4; j++) {
+      let t = 0;
+      for (let k = 0; k < 4; k++) {
+        t += ma[i][k] * mb[k][j];
+      }
+      rM[i][j] = t;
+    }
+  }
+  return rM;
+}
+function t3dCombine(tM) {
+  let rM = t3dInitIdentity();
+  for (const tmi of tM) {
+    rM = t3dMatMultiply(tmi, rM);
+  }
+  return rM;
+}
+function t3dRotate(ax, ay, az) {
+  const rM = t3dCombine([t3dRotateX(ax), t3dRotateY(ay), t3dRotateZ(az)]);
+  return rM;
+}
+function t3dTranslate(ax, ay, az) {
+  const rM = t3dInitIdentity();
+  rM[0][3] = ax;
+  rM[1][3] = ay;
+  rM[2][3] = az;
+  return rM;
+}
+function t3dCopyMatrix(tm) {
+  const rM = t3dInitNull();
+  for (let i = 0; i < 4; i++) {
+    for (let j = 0; j < 4; j++) {
+      rM[i][j] = tm[i][j];
+    }
+  }
+  return rM;
+}
+function t3dApply(ma, va) {
+  const vb = [va[0], va[1], va[2], 1];
+  const rV = [0, 0, 0];
+  for (let i = 0; i < 3; i++) {
+    let t = 0;
+    for (let k = 0; k < 4; k++) {
+      t += ma[i][k] * vb[k];
+    }
+    rV[i] = t;
+  }
+  return rV;
+}
+function t3dGetTranslation(tm) {
+  const rVT = [tm[0][3], tm[1][3], tm[2][3]];
+  return rVT;
+}
+function t3dGetRotation(tm) {
+  let ax = 0;
+  let ay = 0;
+  let az = 0;
+  const tm20 = tm[2][0];
+  const yota = 10 ** -5;
+  if (Math.abs(tm20 - 1) < yota) {
+    az = 0;
+    ay = -Math.PI / 2;
+    ax = -az + Math.atan2(-tm[0][1], -tm[0][2]);
+  } else if (Math.abs(tm20 + 1) < yota) {
+    az = 0;
+    ay = Math.PI / 2;
+    ax = az + Math.atan2(tm[0][1], tm[0][2]);
+  } else {
+    ax = Math.atan2(tm[2][1], tm[2][2]);
+    ay = Math.atan2(-tm[2][0], Math.sqrt(tm[2][1] ** 2 + tm[2][2] ** 2));
+    az = Math.atan2(tm[1][0], tm[0][0]);
+  }
+  const rVR = [ax, ay, az];
+  return rVR;
+}
+var Transform3d = class {
+  mmat;
+  constructor(iMat) {
+    this.mmat = t3dCopyMatrix(iMat);
+  }
+  addRotation(ax, ay, az) {
+    const mR = t3dRotate(ax, ay, az);
+    this.mmat = t3dCombine([this.mmat, mR]);
+  }
+  addTranslation(ax, ay, az) {
+    const mT = t3dTranslate(ax, ay, az);
+    this.mmat = t3dCombine([this.mmat, mT]);
+  }
+  getMatrix() {
+    return this.mmat;
+  }
+  getRotation() {
+    const rVR = t3dGetRotation(this.mmat);
+    return rVR;
+  }
+  getTranslation() {
+    const rVT = t3dGetTranslation(this.mmat);
+    return rVT;
+  }
+  transform(iv) {
+    const rV = t3dApply(this.mmat, iv);
+    return rV;
+  }
+};
+var initMid = t3dInitIdentity();
+function transform3d(initM = initMid) {
+  return new Transform3d(initM);
+}
+
 // src/version_details.ts
 function version_details(appPackage) {
   const rStr = [];
@@ -3906,6 +4099,7 @@ export {
   Segment1,
   Segment2,
   ShapePoint,
+  Transform3d,
   Vector,
   aBFromLaLbAa,
   aCFromAaAb,
@@ -3962,6 +4156,7 @@ export {
   pCheckbox,
   pDropdown,
   pNumber,
+  pSectionSeparator,
   paramListToVal,
   parseParamFile,
   paxCircle,
@@ -3976,11 +4171,13 @@ export {
   rightTriLbFromLaLc,
   roundZero,
   tolerance,
+  transform3d,
   vector,
   version_details,
   withinHPiHPi,
   withinPiPi,
   withinZero2Pi,
-  withinZeroPi
+  withinZeroPi,
+  zeroPDef
 };
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.23",
+	"version": "0.5.25",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -41,20 +41,20 @@
 		"clean": "shx rm -fr dist node_modules"
 	},
 	"dependencies": {
-		"@zip.js/zip.js": "^2.7.34"
+		"@zip.js/zip.js": "^2.7.40"
 	},
 	"devDependencies": {
-		"@types/node": "^20.11.19",
+		"@types/node": "^20.11.30",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
-		"eslint": "^8.56.0",
+		"eslint": "^8.57.0",
 		"eslint-config-prettier": "^9.1.0",
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.2.5",
 		"shx": "^0.3.4",
 		"tsup": "^8.0.2",
-		"typescript": "^5.3.3",
-		"vitest": "^1.3.1"
+		"typescript": "^5.4.3",
+		"vitest": "^1.4.0"
 	},
 	"exports": {
 		".": {