geometrix 1.0.14 → 1.0.16

package/dist/index.d.ts

@@ -339,6 +339,7 @@ declare class Contour extends AContour {
     debugPoints: Point[];
     debugLines: Line[];
     lastPoint: Point;
+    lastPoint2: Point;
     imposedColor: string;
     /**
      *	@param ix - the X absolute coordinate of the first point of the contour
@@ -363,11 +364,11 @@ declare class Contour extends AContour {
     addSegStrokeAP(aa: number, al: number): this;
     addSegStrokeR(rx: number, ry: number): this;
     addSegStrokeRP(ra: number, rl: number): this;
-    addSegStrokeAifBig(ax: number, ay: number, minLength: number, secondNfirst: boolean): this;
     addSegArc(iRadius: number, iLarge: boolean, iCcw: boolean): this;
     addSegArc2(): this;
     addSegArc3(iTangentAngle1: number, firstNlast: boolean): this;
     addSeg2Arcs(ita1: number, ita2: number): this;
+    addSegStrokeAifBig(ax: number, ay: number, minLength: number, secondNfirst: boolean): this;
     addCornerPointed(): this;
     addCornerRounded(iRadius: number): this;
     addCornerWidened(iRadius: number): this;

package/dist/index.js

@@ -1724,6 +1724,7 @@ var Contour = class _Contour extends AContour {
   debugPoints;
   debugLines;
   lastPoint;
+  lastPoint2;
   imposedColor;
   /**
    *	@param ix - the X absolute coordinate of the first point of the contour
@@ -1737,10 +1738,12 @@ var Contour = class _Contour extends AContour {
     this.debugPoints = [];
     this.debugLines = [];
     this.lastPoint = point(ix, iy);
+    this.lastPoint2 = point(ix, iy);
     this.imposedColor = icolor;
   }
   /** @internal */
   setLastPoint(ix, iy) {
+    this.lastPoint2 = this.lastPoint;
     this.lastPoint = point(ix, iy);
   }
   /** @internal */
@@ -1813,22 +1816,6 @@ var Contour = class _Contour extends AContour {
     this.addPointRP(ra, rl).addSegStroke();
     return this;
   }
-  addSegStrokeAifBig(ax, ay, minLength, secondNfirst) {
-    const p0 = this.getLastPoint();
-    const ppLength = Math.sqrt((ax - p0.cx) ** 2 + (ay - p0.cy) ** 2);
-    if (ppLength > minLength) {
-      this.addPointA(ax, ay).addSegStroke();
-    } else if (secondNfirst) {
-      const preType = this.segments[this.segments.length - 1].sType;
-      if (preType === 0 /* eStroke */) {
-        this.segments.pop();
-        this.addPointA(ax, ay).addSegStroke();
-      } else {
-        throw `err186: addSegStrokeA-ifBig used after a not eStroke ${preType} at segment ${this.segments.length}`;
-      }
-    }
-    return this;
-  }
   addSegArc(iRadius, iLarge, iCcw) {
     if (this.points.length !== 1) {
       throw `err954: contour addSegArc with unexpected points.length ${this.points.length}`;
@@ -1975,6 +1962,27 @@ var Contour = class _Contour extends AContour {
     }
     return this;
   }
+  addSegStrokeAifBig(ax, ay, minLength, secondNfirst) {
+    const p0 = this.getLastPoint();
+    const ppLength = Math.sqrt((ax - p0.cx) ** 2 + (ay - p0.cy) ** 2);
+    if (ppLength > minLength) {
+      this.addPointA(ax, ay).addSegStroke();
+    } else if (secondNfirst) {
+      const preSeg = this.segments[this.segments.length - 1];
+      const lastP = this.lastPoint2;
+      this.setLastPoint(lastP.cx, lastP.cy);
+      if (preSeg.sType === 0 /* eStroke */) {
+        this.segments.pop();
+        this.addPointA(ax, ay).addSegStroke();
+      } else if (preSeg.sType === 1 /* eArc */) {
+        this.segments.pop();
+        this.addPointA(ax, ay).addSegArc(preSeg.radius, preSeg.arcLarge, preSeg.arcCcw);
+      } else {
+        throw `err186: addSegStrokeA-ifBig used after eStart or eCorner ${preSeg.sType} at segment ${this.segments.length}`;
+      }
+    }
+    return this;
+  }
   addCornerPointed() {
     const seg = new Segment1(2 /* ePointed */, 0, 0, 0);
     this.addSeg(seg);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geometrix",
-	"version": "1.0.14",
+	"version": "1.0.16",
 	"description": "The 2D geometry engine of the parametrix",
 	"private": false,
 	"repository": {