geometrix 1.0.6 → 1.0.8

package/dist/index.d.ts

@@ -294,21 +294,39 @@ declare class PaxPath {
 }
 declare function paxPath(): PaxPath;
 
+interface tEnvelop {
+    xMin: number;
+    xMax: number;
+    yMin: number;
+    yMax: number;
+    orientation: boolean;
+}
+declare class Envelop {
+    /** @internal */
+    pEnvelop: tEnvelop;
+    constructor(iEnvelop: tEnvelop);
+    add(iEnvelop: tEnvelop): boolean;
+    check(iEnvelop: tEnvelop): boolean;
+}
+declare function envelop(iEnvelop: tEnvelop): Envelop;
+
 declare abstract class AContour {
     abstract circle: boolean;
     abstract imposedColor: string;
     abstract draw(ctx: CanvasRenderingContext2D, cAdjust: tCanvasAdjust, color: string): void;
     abstract extractSkeleton(): AContour;
     abstract generateContour(): AContour;
-    abstract generatePoints(): Point[];
+    abstract generatePoints(dnb: number): Point[];
+    abstract getEnvelop(): tEnvelop;
     abstract generateLines(): Line[];
     abstract check(): string;
     abstract toSvg(yCeiling: number, color?: string): string;
     abstract toDxfSeg(): DxfSeg[];
     abstract toPax(): tPaxContour;
     abstract getPerimeter(): number;
+    abstract generateRevertOrientation(): AContour;
 }
-declare function midArcPoint(px1: number, py1: number, seg: Segment1): Point;
+declare function midArcPoint(px1: number, py1: number, seg: Segment1, dnb: number): Point[];
 /**
  * class `Contour`
  *
@@ -365,7 +383,9 @@ declare class Contour extends AContour {
     draw(ctx: CanvasRenderingContext2D, cAdjust: tCanvasAdjust, color?: string): void;
     extractSkeleton(): Contour;
     generateContour(): Contour;
-    generatePoints(): Point[];
+    generatePoints(dnb: number): Point[];
+    getOrientation(iPts: Point[], extremX: number): boolean;
+    getEnvelop(): tEnvelop;
     generateLines(): Line[];
     /** @internal */
     checkContour(ctr: Contour): void;
@@ -374,6 +394,7 @@ declare class Contour extends AContour {
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourPath;
     getPerimeter(): number;
+    generateRevertOrientation(): Contour;
 }
 /**
  * class `ContourCircle`
@@ -394,13 +415,15 @@ declare class ContourCircle extends AContour {
     draw(ctx: CanvasRenderingContext2D, cAdjust: tCanvasAdjust, color?: string): void;
     extractSkeleton(): ContourCircle;
     generateContour(): ContourCircle;
-    generatePoints(): Point[];
+    generatePoints(dnb: number): Point[];
+    getEnvelop(): tEnvelop;
     generateLines(): Line[];
     check(): string;
     toSvg(yCeiling: number, color?: string): string;
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourCircle;
     getPerimeter(): number;
+    generateRevertOrientation(): ContourCircle;
 }
 declare function contour(ix: number, iy: number, icolor?: string): Contour;
 declare function contourCircle(ix: number, iy: number, iRadius: number, icolor?: string): ContourCircle;
@@ -634,6 +657,21 @@ interface tParamValInFile {
 declare function createParamFile(lastModif: string, iPartName: string, idparams: tParamVal, comment: string): string;
 declare function parseParamFile(fContentStr: string): [tParamValInFile, string];
 
+type tVec2 = [number, number];
+type tVec3$1 = [number, number, number];
+type tT2dMatrix = [tVec3$1, tVec3$1, tVec3$1];
+declare class Transform2d {
+    mmat: tT2dMatrix;
+    constructor(iMat: tT2dMatrix);
+    addRotation(az: number): this;
+    addTranslation(ax: number, ay: number): this;
+    getMatrix(): tT2dMatrix;
+    getRotation(): number;
+    getTranslation(): tVec2;
+    transform(iv: tVec2): tVec2;
+}
+declare function transform2d(initM?: tT2dMatrix): Transform2d;
+
 type tVec3 = [number, number, number];
 type tVec4 = [number, number, number, number];
 type tT3dMatrix = [tVec4, tVec4, tVec4, tVec4];
@@ -687,4 +725,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, Transform3d, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustCopy, adjustInit, adjustMini, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, ctrOblong, ctrRectRot, ctrRectRot2, ctrRectangle, ctrTrapezoid, ctrTrapezoidRot2, 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, midArcPoint, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointCoord, 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 tFigures, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tOuterInner, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxFace, 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 };
+export { Contour, ContourCircle, DesignParam, DxfSeg, DxfWrite, EBVolume, EExtrude, EFormat, Figure, Line, PSeg, PType, PaxPath, Point, SegDbg, SegEnum, Segment1, Segment2, ShapePoint, Transform2d, Transform3d, Vector, aBFromLaLbAa, aCFromAaAb, aCFromLaLbLc, adjustCenter, adjustCopy, adjustInit, adjustMini, adjustRect, adjustScale, adjustTranslate, adjustZero, arcSeg1To2, arcSeg2To1, bisector, canvas2point, canvasTranslatePolar, checkGeom, checkImpPages, circleCenter, colors, contour, contourCircle, copyLayers, createParamFile, ctrOblong, ctrRectRot, ctrRectRot2, ctrRectangle, ctrTrapezoid, ctrTrapezoidRot2, degToRad, designParam, dxfSegArc, dxfSegCircle, dxfSegLine, dxfWriter, envelop, ffix, figure, fileBin, fileBinContent, fileMime, fileSuffix, fileTextContent, fround, gSegDbg, initGeom, initLayers, isActiveCorner, isAddPoint, isCorner, isSeg, isWithin, lbFromLaAaAb, lcFromLaLbAc, line, linePP, makeCorner, mergeFaces, midArcPoint, oneDesignParam, orientedArc, pCheckbox, pDropdown, pNumber, pSectionSeparator, paramListToVal, parseParamFile, paxCircle, paxPath, point, point2canvas, pointCoord, 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 tEnvelop, type tExtrude, type tFigures, type tGeom, type tGeomFunc, type tInherit, type tLayers, type tOuterInner, type tPackage, type tPageDef, type tParam, type tParamChanged, type tParamDef, type tParamVal, type tParamValInFile, type tPaxContour, type tPaxContourCircle, type tPaxContourPath, type tPaxFace, type tPaxSeg, type tPaxSegArc, type tPaxSegSt, type tPolar, type tPosiOrien, type tSimTime, type tSubDesign, type tSubInst, type tT2dMatrix, type tT3dMatrix, type tVec2, type tVec3, type tVec4, type tVolume, tolerance, transform2d, transform3d, vector, version_details, withinHPiHPi, withinPiPi, withinZero2Pi, withinZeroPi, zeroPDef };

package/dist/index.js

@@ -1704,16 +1704,17 @@ function paxPath() {
 // src/contour.ts
 var AContour = class {
 };
-function midArcPoint(px1, py1, seg) {
+function midArcPoint(px1, py1, seg, dnb) {
   const seg2 = arcSeg1To2(px1, py1, seg);
   const p3 = point(seg2.pc.cx, seg2.pc.cy);
-  const a12h = withinPiPi((seg2.a2 - seg2.a1) / 2);
-  let a3 = seg2.a1 + a12h;
-  if (Math.sign(a12h) > 0 && !seg.arcCcw || Math.sign(a12h) < 0 && seg.arcCcw) {
-    a3 += Math.PI;
+  const a12h = withinZero2Pi(seg2.a2 - seg2.a1);
+  const a12g = seg.arcCcw ? a12h : a12h - 2 * Math.PI;
+  const a12f = a12g / dnb;
+  const rPts = [];
+  for (let idx = 1; idx < dnb; idx++) {
+    rPts.push(p3.translatePolar(seg2.a1 + idx * a12f, seg.radius));
   }
-  const p4 = p3.translatePolar(a3, seg.radius);
-  return p4;
+  return rPts;
 }
 var Contour = class _Contour extends AContour {
   /** @internal */
@@ -2245,18 +2246,15 @@ var Contour = class _Contour extends AContour {
     }
     return rContour;
   }
-  generatePoints() {
+  generatePoints(dnb) {
     const rPoints = [];
-    rPoints.push(...this.debugPoints);
-    const seg0 = this.segments[0];
-    rPoints.push(point(seg0.px, seg0.py));
     let px1 = 0;
     let py1 = 0;
     for (const seg of this.segments) {
       if (seg.sType === 1 /* eArc */) {
         try {
-          const p4 = midArcPoint(px1, py1, seg);
-          rPoints.push(p4);
+          const pts = midArcPoint(px1, py1, seg, dnb);
+          rPoints.push(...pts);
         } catch (emsg) {
           console.log("err453: " + emsg);
         }
@@ -2269,6 +2267,50 @@ var Contour = class _Contour extends AContour {
     }
     return rPoints;
   }
+  getOrientation(iPts, extremX) {
+    const pts = iPts.slice(1);
+    let sign = 0;
+    let pt1 = pts.at(-3);
+    let pt2 = pts.at(-2);
+    let pt3 = pts.at(-1);
+    for (const pt of pts) {
+      pt1 = pt2;
+      pt2 = pt3;
+      pt3 = pt;
+      if (pt2.cx === extremX) {
+        const vx = pt1.cx - pt2.cx;
+        const vy = pt1.cy - pt2.cy;
+        const ux = pt3.cx - pt2.cx;
+        const uy = pt3.cy - pt2.cy;
+        const pv = ux * vy - uy * vx;
+        sign = Math.sign(pv);
+      }
+    }
+    if (0 === sign) {
+      throw `err299: Orientation hasn't been found with point number ${pts.length}`;
+    }
+    const rOrientation = sign > 0 ? true : false;
+    return rOrientation;
+  }
+  getEnvelop() {
+    const pts = this.generatePoints(24);
+    const lx = [];
+    const ly = [];
+    for (const pt of pts) {
+      lx.push(pt.cx);
+      ly.push(pt.cy);
+    }
+    const rXmin = Math.min(...lx);
+    const rXmax = Math.max(...lx);
+    const rYmin = Math.min(...ly);
+    const rYmax = Math.max(...ly);
+    const rOrientation = this.getOrientation(pts, rXmin);
+    const orient2 = this.getOrientation(pts, rXmax);
+    if (orient2 !== rOrientation) {
+      throw `err390: orientation unstable ${rOrientation} ${orient2} with ${pts.length} points`;
+    }
+    return { xMin: rXmin, xMax: rXmax, yMin: rYmin, yMax: rYmax, orientation: rOrientation };
+  }
   generateLines() {
     const rLines = [];
     rLines.push(...this.debugLines);
@@ -2391,6 +2433,16 @@ var Contour = class _Contour extends AContour {
     }
     return rPerimeter;
   }
+  generateRevertOrientation() {
+    const seg0 = this.segments[0];
+    const rContour = new _Contour(seg0.px, seg0.py);
+    for (const seg of this.segments) {
+      if (isSeg(seg.sType)) {
+        rContour.addSeg(seg);
+      }
+    }
+    return rContour;
+  }
 };
 var ContourCircle = class _ContourCircle extends AContour {
   circle = true;
@@ -2443,16 +2495,26 @@ var ContourCircle = class _ContourCircle extends AContour {
     const rContour = new _ContourCircle(this.px, this.py, this.radius, this.imposedColor);
     return rContour;
   }
-  generatePoints() {
+  generatePoints(dnb) {
     const rPoints = [];
     const p1 = point(this.px, this.py);
+    const kp = dnb * 2;
     rPoints.push(p1);
-    for (let i = 0; i < 4; i++) {
-      const p2 = p1.translatePolar(i * Math.PI / 2, this.radius);
+    for (let i = 0; i < kp; i++) {
+      const p2 = p1.translatePolar(i * 2 * Math.PI / kp, this.radius);
       rPoints.push(p2);
     }
     return rPoints;
   }
+  getEnvelop() {
+    return {
+      xMin: this.px - this.radius,
+      xMax: this.px + this.radius,
+      yMin: this.py - this.radius,
+      yMax: this.py + this.radius,
+      orientation: true
+    };
+  }
   generateLines() {
     return [];
   }
@@ -2476,6 +2538,10 @@ var ContourCircle = class _ContourCircle extends AContour {
     const rPerimeter = 2 * Math.PI * this.radius;
     return rPerimeter;
   }
+  generateRevertOrientation() {
+    const rContour = new _ContourCircle(this.px, this.py, this.radius, this.imposedColor);
+    return rContour;
+  }
 };
 function contour(ix, iy, icolor = "") {
   return new Contour(ix, iy, icolor);
@@ -2537,7 +2603,7 @@ var Figure = class _Figure {
     const oneFace = [];
     for (const oneCtr of iFace) {
       const roundedContour = oneCtr.generateContour();
-      this.addPoints(roundedContour.generatePoints());
+      this.addPoints(roundedContour.generatePoints(2));
       this.addLines(roundedContour.generateLines());
       oneFace.push(roundedContour);
       this.mainBList.push(oneCtr.extractSkeleton());
@@ -2554,13 +2620,13 @@ var Figure = class _Figure {
   }
   addSecond(icontour) {
     const roundedContour = icontour.generateContour();
-    this.addPoints(roundedContour.generatePoints());
+    this.addPoints(roundedContour.generatePoints(2));
     this.addLines(roundedContour.generateLines());
     this.secondList.push(roundedContour);
     this.secondBList.push(icontour.extractSkeleton());
   }
   addDynamics(icontour) {
-    this.addPoints(icontour.generatePoints());
+    this.addPoints(icontour.generatePoints(2));
     this.addLines(icontour.generateLines());
     this.dynamicsList.push(icontour);
   }
@@ -3786,7 +3852,7 @@ function fcFaceContour(paxCtr, outName) {
     } else if (seg.typ === 2 /* eArc */) {
       try {
         const seg1 = convPaxToSeg1(seg);
-        const p4 = midArcPoint(px1, py1, seg1);
+        const p4 = midArcPoint(px1, py1, seg1, 2)[0];
         rStr += `	P${fid3(pIdx)} = App.Vector(${ff6(p4.cx)}, ${ff6(p4.cy)}, 0)
 `;
         pIdx += 1;
@@ -4089,7 +4155,7 @@ var MinMaxPoint = class {
         pts.push(point(this.xMax, this.yMax));
       }
       for (const ctr of aCtr) {
-        pts.push(...ctr.generatePoints());
+        pts.push(...ctr.generatePoints(2));
       }
       const [Xmin, Xmax, Ymin, Ymax] = pointMinMax(pts);
       this.xMin = Xmin;
@@ -4417,6 +4483,166 @@ function parseParamFile(fContentStr) {
   return [rObj, rlog];
 }
 
+// src/envelop.ts
+var Envelop = class {
+  /** @internal */
+  pEnvelop = { xMin: 0, xMax: 0, yMin: 0, yMax: 0, orientation: true };
+  constructor(iEnvelop) {
+    this.pEnvelop.xMin = iEnvelop.xMin;
+    this.pEnvelop.xMax = iEnvelop.xMax;
+    this.pEnvelop.yMin = iEnvelop.yMin;
+    this.pEnvelop.yMax = iEnvelop.yMax;
+    this.pEnvelop.orientation = iEnvelop.orientation;
+  }
+  add(iEnvelop) {
+    let rChange = false;
+    if (iEnvelop.xMin < this.pEnvelop.xMin) {
+      rChange = true;
+      this.pEnvelop.xMin = iEnvelop.xMin;
+      this.pEnvelop.orientation = iEnvelop.orientation;
+    }
+    if (iEnvelop.xMax > this.pEnvelop.xMax) {
+      this.pEnvelop.xMax = iEnvelop.xMax;
+    }
+    if (iEnvelop.yMin < this.pEnvelop.yMin) {
+      this.pEnvelop.yMin = iEnvelop.yMin;
+    }
+    if (iEnvelop.yMax > this.pEnvelop.yMax) {
+      this.pEnvelop.yMax = iEnvelop.yMax;
+    }
+    return rChange;
+  }
+  check(iEnvelop) {
+    let rOk = false;
+    const epsilon = 10 ** -2;
+    if (iEnvelop.xMin < this.pEnvelop.xMin + epsilon && iEnvelop.xMax > this.pEnvelop.xMax - epsilon && iEnvelop.yMin < this.pEnvelop.yMin + epsilon && iEnvelop.yMax > this.pEnvelop.yMax - epsilon) {
+      rOk = true;
+    }
+    return rOk;
+  }
+};
+function envelop(iEnvelop) {
+  return new Envelop(iEnvelop);
+}
+
+// src/transform2d.ts
+function t2dInitNull() {
+  const rM = [
+    [0, 0, 0],
+    [0, 0, 0],
+    [0, 0, 0]
+  ];
+  return rM;
+}
+function t2dInitIdentity() {
+  const rM = [
+    [1, 0, 0],
+    [0, 1, 0],
+    [0, 0, 1]
+  ];
+  return rM;
+}
+function t2dRotate(az) {
+  const rM = t2dInitIdentity();
+  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 t2dMatMultiply(ma, mb) {
+  const rM = t2dInitNull();
+  for (let i = 0; i < 3; i++) {
+    for (let j = 0; j < 3; j++) {
+      let t = 0;
+      for (let k = 0; k < 3; k++) {
+        t += ma[i][k] * mb[k][j];
+      }
+      rM[i][j] = t;
+    }
+  }
+  return rM;
+}
+function t2dCombine(tM) {
+  let rM = t2dInitIdentity();
+  for (const tmi of tM) {
+    rM = t2dMatMultiply(tmi, rM);
+  }
+  return rM;
+}
+function t2dTranslate(ax, ay) {
+  const rM = t2dInitIdentity();
+  rM[0][2] = ax;
+  rM[1][2] = ay;
+  return rM;
+}
+function t2dCopyMatrix(tm) {
+  const rM = t2dInitNull();
+  for (let i = 0; i < 3; i++) {
+    for (let j = 0; j < 3; j++) {
+      rM[i][j] = tm[i][j];
+    }
+  }
+  return rM;
+}
+function t2dApply(ma, va) {
+  const vb = [va[0], va[1], 1];
+  const rV = [0, 0];
+  for (let i = 0; i < 2; i++) {
+    let t = 0;
+    for (let k = 0; k < 3; k++) {
+      t += ma[i][k] * vb[k];
+    }
+    rV[i] = t;
+  }
+  return rV;
+}
+function t2dGetTranslation(tm) {
+  const rVT = [tm[0][2], tm[1][2]];
+  return rVT;
+}
+function t2dGetRotation(tm) {
+  const rAz = Math.atan2(tm[1][0], tm[0][0]);
+  return rAz;
+}
+var Transform2d = class {
+  mmat;
+  constructor(iMat) {
+    this.mmat = t2dCopyMatrix(iMat);
+  }
+  addRotation(az) {
+    const mR = t2dRotate(az);
+    this.mmat = t2dCombine([this.mmat, mR]);
+    return this;
+  }
+  addTranslation(ax, ay) {
+    const mT = t2dTranslate(ax, ay);
+    this.mmat = t2dCombine([this.mmat, mT]);
+    return this;
+  }
+  getMatrix() {
+    return this.mmat;
+  }
+  getRotation() {
+    const rVR = t2dGetRotation(this.mmat);
+    return rVR;
+  }
+  getTranslation() {
+    const rVT = t2dGetTranslation(this.mmat);
+    return rVT;
+  }
+  transform(iv) {
+    const rV = t2dApply(this.mmat, iv);
+    return rV;
+  }
+};
+var initMid = t2dInitIdentity();
+function transform2d(initM = initMid) {
+  return new Transform2d(initM);
+}
+
 // src/transform3d.ts
 function t3dInitNull() {
   const rM = [
@@ -4575,8 +4801,8 @@ var Transform3d = class {
     return rV;
   }
 };
-var initMid = t3dInitIdentity();
-function transform3d(initM = initMid) {
+var initMid2 = t3dInitIdentity();
+function transform3d(initM = initMid2) {
   return new Transform3d(initM);
 }
 
@@ -4672,6 +4898,7 @@ export {
   Segment1,
   Segment2,
   ShapePoint,
+  Transform2d,
   Transform3d,
   Vector,
   aBFromLaLbAa,
@@ -4710,6 +4937,7 @@ export {
   dxfSegCircle,
   dxfSegLine,
   dxfWriter,
+  envelop,
   ffix,
   figure,
   fileBin,
@@ -4754,6 +4982,7 @@ export {
   rightTriLbFromLaLc,
   roundZero,
   tolerance,
+  transform2d,
   transform3d,
   vector,
   version_details,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "1.0.6",
+	"version": "1.0.8",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {
@@ -69,15 +69,15 @@
 	"devDependencies": {
 		"@eslint/js": "^9.10.0",
 		"@types/eslint__js": "^8.42.3",
-		"@types/node": "^22.13.1",
-		"eslint": "^9.20.0",
+		"@types/node": "^22.13.4",
+		"eslint": "^9.20.1",
 		"eslint-config-prettier": "^10.0.1",
 		"npm-run-all2": "^7.0.2",
-		"prettier": "^3.5.0",
+		"prettier": "^3.5.1",
 		"rimraf": "^6.0.1",
 		"tsup": "^8.3.6",
 		"typescript": "^5.7.3",
-		"typescript-eslint": "^8.24.0",
-		"vitest": "^3.0.5"
+		"typescript-eslint": "^8.24.1",
+		"vitest": "^3.0.6"
 	}
 }