geometrix 0.5.24 → 0.5.26

package/dist/index.d.ts

@@ -599,6 +599,23 @@ interface tParamValInFile {
 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;
+
+declare function ctrRectangle(ox: number, oy: number, width: number, height: number, cornerRounded?: number): tContour;
+
 /** For cli-app and ui-app */
 type tDependencies = Record<string, string>;
 /** For cli-app and ui-app */
@@ -612,4 +629,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, 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 tVolume, tolerance, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi, zeroPDef };
+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, ctrRectangle, 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;
@@ -3883,6 +3885,173 @@ 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/common_contours.ts
+function ctrRectangle(ox, oy, width, height, cornerRounded = 0) {
+  const rCtr = contour(ox, oy).addCornerRounded(cornerRounded).addSegStrokeR(width, 0).addCornerRounded(cornerRounded).addSegStrokeR(0, height).addCornerRounded(cornerRounded).addSegStrokeR(-width, 0).addCornerRounded(cornerRounded).closeSegStroke();
+  return rCtr;
+}
+
 // src/version_details.ts
 function version_details(appPackage) {
   const rStr = [];
@@ -3936,6 +4105,7 @@ export {
   Segment1,
   Segment2,
   ShapePoint,
+  Transform3d,
   Vector,
   aBFromLaLbAa,
   aCFromAaAb,
@@ -3959,6 +4129,7 @@ export {
   contourCircle,
   copyLayers,
   createParamFile,
+  ctrRectangle,
   degToRad,
   designParam,
   dxfSegArc,
@@ -4007,6 +4178,7 @@ export {
   rightTriLbFromLaLc,
   roundZero,
   tolerance,
+  transform3d,
   vector,
   version_details,
   withinHPiHPi,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "0.5.24",
+	"version": "0.5.26",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -41,10 +41,10 @@
 		"clean": "shx rm -fr dist node_modules"
 	},
 	"dependencies": {
-		"@zip.js/zip.js": "^2.7.37"
+		"@zip.js/zip.js": "^2.7.40"
 	},
 	"devDependencies": {
-		"@types/node": "^20.11.25",
+		"@types/node": "^20.11.30",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
 		"eslint": "^8.57.0",
@@ -53,8 +53,8 @@
 		"prettier": "^3.2.5",
 		"shx": "^0.3.4",
 		"tsup": "^8.0.2",
-		"typescript": "^5.4.2",
-		"vitest": "^1.3.1"
+		"typescript": "^5.4.3",
+		"vitest": "^1.4.0"
 	},
 	"exports": {
 		".": {