geometrix 1.0.5 → 1.0.7

package/dist/index.d.ts

@@ -300,15 +300,17 @@ declare abstract class AContour {
     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(): [number, number, number, number, boolean];
     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 +367,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(): [number, number, number, number, boolean];
     generateLines(): Line[];
     /** @internal */
     checkContour(ctr: Contour): void;
@@ -374,6 +378,7 @@ declare class Contour extends AContour {
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourPath;
     getPerimeter(): number;
+    generateRevertOrientation(): AContour;
 }
 /**
  * class `ContourCircle`
@@ -394,13 +399,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(): [number, number, number, number, boolean];
     generateLines(): Line[];
     check(): string;
     toSvg(yCeiling: number, color?: string): string;
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourCircle;
     getPerimeter(): number;
+    generateRevertOrientation(): AContour;
 }
 declare function contour(ix: number, iy: number, icolor?: string): Contour;
 declare function contourCircle(ix: number, iy: number, iRadius: number, icolor?: string): ContourCircle;

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 [rXmin, rXmax, rYmin, rYmax, 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 [
+      this.px - this.radius,
+      this.px + this.radius,
+      this.py - this.radius,
+      this.py + this.radius,
+      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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "1.0.5",
+	"version": "1.0.7",
 	"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.23.0",
-		"vitest": "^3.0.5"
+		"typescript-eslint": "^8.24.1",
+		"vitest": "^3.0.6"
 	}
 }