flo-mat 3.0.0 → 3.0.2

package/node/find-2-prong/calc-seperation-tolerance.js

@@ -0,0 +1,86 @@
+import { ddAddDd, ddMultDd, twoSum, twoProduct, ddDiffDd, ddDivDd, twoDiff, ddMultDouble1 } from 'double-double';
+const ts = twoSum;
+const tp = twoProduct;
+const td = twoDiff;
+const qaq = ddAddDd;
+const qmq = ddMultDd;
+const qdq = ddDiffDd;
+const qmd = ddMultDouble1;
+const { asin, acos, cos, sqrt, PI: π } = Math;
+/**
+ * Calculates and returns an appropriate seperation tolerance between `CpNode`s.
+ *
+ * @param R radius of the circle implied by the curvature at the boundary
+ * @param r radius of the MAT circle
+ * @param θ angle between point...
+ */
+function calcSeperationTolerance2(R, r, δ) {
+    const a = r + δ;
+    if (a >= R) {
+        return Number.POSITIVE_INFINITY;
+    }
+    const b = R - r; //?
+    const c = R; //?
+    const N = c * c - a * a - b * b; //?
+    const N_ = qdq(qdq(tp(c, c), tp(a, a)), tp(b, b));
+    const D = 2 * a * b; //?
+    const D_ = tp(-2 * a, b);
+    const Q = ddDivDd(N_, D_)[1]; //?
+    const cosC = -N / D; //?
+    const C = acos(cosC);
+    const CC = acos(Q);
+    const θ = π - CC; //?
+    return θ;
+    // return r*θ;  // approximate arc with line
+}
+export { calcSeperationTolerance };
+function degToRad(degrees) {
+    return degrees / 360 * 2 * Math.PI;
+}
+function radToDeg(rad) {
+    return rad * 360 / 2 / Math.PI;
+}
+const R = 699;
+const r = 698;
+const δ = 1000 * 2 ** -46; //?
+calcSeperationTolerance(R, r, δ); //?
+calcSeperationTolerance2(R, r, δ); //?
+calcSeperationTolerance3(R, r, δ); //?
+function calcSeperationTolerance(R, r, δ) {
+    const a = r + δ;
+    if (a >= R) {
+        return Number.POSITIVE_INFINITY;
+    }
+    const R_r_ = twoDiff(R, r); //?
+    const A_ = qmd(r, R_r_); //?
+    const N_ = qdq(qdq(A_, tp(r, δ)), tp(δ, δ / 2)); //?
+    const D_ = qaq(A_, qmd(δ, R_r_)); //?
+    const R_r = R - r; //?
+    const A = r * R_r; //?
+    const N = A - r * δ - (δ * δ) / 2; //?
+    const D = A + R_r * δ; //?
+    const cosC = N / D; //?
+    const Q = ddDivDd(N_, D_)[1]; //?
+    // const Q = N_[1]/D_[1];//?
+    const C = acos(cosC);
+    const CC = acos(Q);
+    const θ = CC; //?
+    // return r*θ;
+    return r * θ;
+}
+// * see https://en.wikipedia.org/wiki/Law_of_cosines, Version suited to small angles
+function calcSeperationTolerance3(R, r, δ) {
+    const a = r + δ; //?
+    const c = R - r; //?
+    const b = R; //?
+    // c² = (a - b)² + 4ab*sin²(θ/2) OR
+    // (c² - (a - b)²)/4ab = sin²(θ/2)
+    const cc = c * c; //? 
+    const abc = a * a + b * b - 2 * a * b; //?
+    const A = cc - abc; //?
+    const B = sqrt(A / (4 * a * b)); //?
+    const θ = 2 * asin(B); //?
+    return θ;
+    // return r*θ;  // approximate arc with line
+}
+//# sourceMappingURL=calc-seperation-tolerance.js.map

package/node/find-2-prong/calc-seperation-tolerance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calc-seperation-tolerance.js","sourceRoot":"","sources":["../../src/find-2-prong/calc-seperation-tolerance.ts"],"names":[],"mappings":"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"}

package/node/find-2-prong/cull-bezier-pieces.d.ts

@@ -1,4 +1,4 @@
-import { BezierPiece } from '../mat/bezier-piece.js';
+import { CurvePiece } from '../mat/curve-piece.js';
 /**
  * @internal
  * Cull all bezierPieces not within given radius of a given point.
@@ -7,5 +7,5 @@ import { BezierPiece } from '../mat/bezier-piece.js';
  * @param p
  * @param rSquared
  */
-declare function cullBezierPieces2(bezierPieces: BezierPiece[], p: number[], rSquared: number): BezierPiece[];
+declare function cullBezierPieces2(bezierPieces: CurvePiece[], p: number[], rSquared: number): CurvePiece[];
 export { cullBezierPieces2 };

package/node/find-2-prong/cull-bezier-pieces.js

@@ -1,5 +1,5 @@
 import { getClosestSquareDistanceToRect } from '../geometry/get-closest-square-distance-to-rect.js';
-import { getBoundingBox_ } from '../geometry/get-bounding-box-.js';
+import { getBoundingBox$ } from '../geometry/get-bounding-box-.js';
 /**
  * @internal
  * Cull all bezierPieces not within given radius of a given point.
@@ -16,7 +16,7 @@ function cullBezierPieces2(bezierPieces, p, rSquared) {
     const newPieces = [];
     for (const bezierPiece of bezierPieces) {
         const ps = bezierPiece.curve.ps;
-        const rect = getBoundingBox_(ps);
+        const rect = getBoundingBox$(ps);
         const bd = getClosestSquareDistanceToRect(rect, p);
         if (bd <= TOLERANCE * rSquared) {
             newPieces.push(bezierPiece);

package/node/find-2-prong/cull-bezier-pieces.js.map

@@ -1 +1 @@
-{"version":3,"file":"cull-bezier-pieces.js","sourceRoot":"","sources":["../../src/find-2-prong/cull-bezier-pieces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oDAAoD,CAAC;AAEpG,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE;;;;;;;GAOG;AACH,SAAS,iBAAiB,CAClB,YAA2B,EAC3B,CAAW,EACX,QAAgB;IAEpB,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,CAAC;IAE7B,IAAI,YAAY,CAAC,MAAM,IAAI,CAAC,EAAE;QAC1B,OAAO,YAAY,CAAC;KACvB;IAGD,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACpC,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAEhC,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,EAAE,GAAG,8BAA8B,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACnD,IAAI,EAAE,IAAI,SAAS,GAAC,QAAQ,EAAE;YAC1B,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC/B;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"cull-bezier-pieces.js","sourceRoot":"","sources":["../../src/find-2-prong/cull-bezier-pieces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oDAAoD,CAAC;AAEpG,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE;;;;;;;GAOG;AACH,SAAS,iBAAiB,CAClB,YAA0B,EAC1B,CAAW,EACX,QAAgB;IAEpB,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,CAAC;IAE7B,IAAI,YAAY,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAC3B,OAAO,YAAY,CAAC;IACxB,CAAC;IAGD,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACrC,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAEhC,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,EAAE,GAAG,8BAA8B,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACnD,IAAI,EAAE,IAAI,SAAS,GAAC,QAAQ,EAAE,CAAC;YAC3B,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

package/node/find-2-prong/find-2-prong.d.ts

@@ -1,8 +1,6 @@
-import { LlRbTree } from 'flo-ll-rb-tree';
-import { CpNode } from '../cp-node/cp-node.js';
-import { Loop } from 'flo-boolean';
 import { Circle } from '../geometry/circle.js';
 import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { MatMeta } from '../mat/mat-meta.js';
 /**
  * @internal
  * Adds a 2-prong to the MAT. The first point on the shape boundary is given and
@@ -19,14 +17,14 @@ import { PointOnShape } from '../point-on-shape/point-on-shape.js';
  *    d of dΩ as in Fig. 19."
  * In fact, we (and they) start by fixing one point on the boundary beforehand.
  * @param loops A shape represented by path loops
- * @param extreme The extreme coordinate value of the shape
+ * @param maxCoordinate The extreme coordinate value of the shape
  * @param squaredDiagonalLength The squared diagonal length of the shape
  * bounding box.
  * @param y The source point of the 2-prong to be found
  * @param isHoleClosing True if this is a hole-closing two-prong, false otherwise
- * @param k The loop array index
+ * @param loopIdx The loop array index
  */
-declare function find2Prong(angle: number, loops: Loop[], extreme: number, squaredDiagonalLength: number, cpTrees: Map<Loop, LlRbTree<CpNode>>, y: PointOnShape, isHoleClosing: boolean, k: number, for1Prong: boolean): {
+declare function find2Prong(meta: MatMeta, isHoleClosing: boolean, for1Prong: boolean, angle: number, y: PointOnShape): {
     circle: Circle;
     zs: PointOnShape[];
 } | undefined;

package/node/find-2-prong/find-2-prong.js

@@ -1,6 +1,5 @@
 import { distanceBetween, fromTo, interpolate, rotate, translate } from 'flo-vector2d';
 import { getOsculatingCircle } from '../point-on-shape/get-osculating-circle.js';
-import { addDebugInfo } from './add-debug-info.js';
 import { findEquidistantPointOnLineDd } from './find-equidistant-point-on-line-dd.js';
 import { getInitialBezierPieces } from './get-initial-bezier-pieces.js';
 import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
@@ -9,7 +8,8 @@ import { squaredDistanceBetweenDd } from './squared-distance-between-dd.js';
 import { cullBezierPieces2 } from './cull-bezier-pieces.js';
 import { add1Prong } from './add-1-prong.js';
 import { createPos } from '../point-on-shape/create-pos.js';
-const { sqrt, abs, sin, cos } = Math;
+import { calcSeperationTolerance } from './calc-seperation-tolerance.js';
+const { ceil, log2, max, sqrt, abs, sin, cos } = Math;
 /**
  * @internal
  * Adds a 2-prong to the MAT. The first point on the shape boundary is given and
@@ -26,79 +26,83 @@ const { sqrt, abs, sin, cos } = Math;
  *    d of dΩ as in Fig. 19."
  * In fact, we (and they) start by fixing one point on the boundary beforehand.
  * @param loops A shape represented by path loops
- * @param extreme The extreme coordinate value of the shape
+ * @param maxCoordinate The extreme coordinate value of the shape
  * @param squaredDiagonalLength The squared diagonal length of the shape
  * bounding box.
  * @param y The source point of the 2-prong to be found
  * @param isHoleClosing True if this is a hole-closing two-prong, false otherwise
- * @param k The loop array index
+ * @param loopIdx The loop array index
  */
-function find2Prong(angle, loops, extreme, squaredDiagonalLength, cpTrees, y, isHoleClosing, k, for1Prong) {
+function find2Prong(meta, isHoleClosing, for1Prong, angle, y) {
+    const { loops, maxCoordinate, squaredDiagonalLength, cpTrees } = meta;
+    const loop = y.curve.loop;
     const MAX_ITERATIONS = 25;
-    const squaredSeperationTolerance = ((2 ** -21) * extreme) ** 2;
-    const errorTolerance = (2 ** -46) * extreme;
+    const minSquaredSeperationTolerance = ((2 ** -21) * maxCoordinate) ** 2;
+    const errorTolerance = (2 ** -46) * maxCoordinate;
+    // const errorTolerance = (2**-28)*maxCoordinate;
     const maxOsculatingCircleRadius = sqrt(squaredDiagonalLength);
     const minCurvature = 1 / maxOsculatingCircleRadius;
-    let xO; // the original x to mitigate drift
+    const oneProngTolerance = (2 ** -16) * maxCoordinate;
+    const [xO, rO] = getO(angle, isHoleClosing, maxOsculatingCircleRadius, minCurvature, y);
     const p = y.p;
-    let rO;
-    if (isHoleClosing) {
-        xO = [p[0], p[1] - maxOsculatingCircleRadius];
-        rO = maxOsculatingCircleRadius;
-    }
-    else {
-        if (angle === 0) {
-            ({ center: xO, radius: rO } = getOsculatingCircle(minCurvature, y));
-        }
-        else {
-            ({ center: xO, radius: rO } = getOsculatingCircle(minCurvature, y, true));
-            const v = fromTo(y.p, xO);
-            const v_ = rotate(sin(angle), cos(angle))(v);
-            xO = translate(y.p)(v_);
-        }
-    }
     // The boundary piece that should contain the other point of 
     // the 2-prong circle. (Defined by start and end points).
-    const { bezierPieces, δ } = getInitialBezierPieces(angle, isHoleClosing, k, loops, cpTrees, y, { center: xO, radius: rO });
+    let bezierPieces = getInitialBezierPieces(angle, isHoleClosing, loop, loops, cpTrees, y, { center: xO, radius: rO });
+    // console.log(bezierPieces.length);
     /** The center of the two-prong (successively refined) */
     let x = xO;
     // The lines below is an optimization.
-    const r_ = sqrt(reduceRadius(extreme, bezierPieces, p, xO));
+    const r_ = sqrt(reduceRadius(maxCoordinate, bezierPieces, p, xO));
     if (rO > r_) {
         x = interpolate(p, xO, r_ / rO);
     }
-    /** Trace the convergence (for debugging). */
-    const xs = [];
     /** The antipode of the two-prong (successively refined) */
     let zs = undefined;
     let z = undefined;
-    let bezierPieces_ = bezierPieces;
     let i = 0;
     while (i < MAX_ITERATIONS) {
         const xy = squaredDistanceBetweenDd(x, y.p);
-        if (i < 5) {
-            bezierPieces_ = cullBezierPieces2(bezierPieces_, x, xy);
+        if (i < 2) {
+            bezierPieces = cullBezierPieces2(bezierPieces, x, xy);
+        }
+        const pow = max(0, ceil(log2(maxCoordinate / xy))) + 1; // determines accuracy
+        // console.log(pow);
+        const _zs = getCloseBoundaryPointsCertified(pow, bezierPieces, x, y.curve, y.t, for1Prong && i == 0 && rO !== 1 / minCurvature, angle).map(info => createPos(info.curve, info.t, false));
+        let maxD = Number.NEGATIVE_INFINITY;
+        let maxPos = undefined;
+        zs = [];
+        for (const z of _zs) {
+            if (z === undefined) {
+                continue;
+            }
+            const _yz = squaredDistanceBetweenDd(y.p, z.p);
+            if (_yz > maxD) {
+                maxD = _yz;
+                maxPos = z;
+            }
+            if (_yz !== 0) {
+                zs.push(z);
+            }
         }
-        zs = getCloseBoundaryPointsCertified(bezierPieces_, x, y.curve, y.t, for1Prong && i == 0 && rO !== 1 / minCurvature, angle).map(info => createPos(info.curve, info.t, false));
-        z = zs[0];
-        if (z === undefined) {
-            addDebugInfo2(isHoleClosing);
+        // z = zs[0];
+        const yz = maxD;
+        z = maxPos;
+        if (z === undefined || yz === 0) {
+            // addDebugInfo2(isHoleClosing);
             return undefined;
         }
         const xz = squaredDistanceBetweenDd(x, z.p);
-        const yz = squaredDistanceBetweenDd(y.p, z.p);
         // if on first try
         if (i === 0) {
-            if (rO < (1 - 2 ** -6) * sqrt(xz)) {
-                add1Prong(rO, xO, cpTrees, y);
+            if (rO < (1 - oneProngTolerance) * sqrt(xz)) {
+                // console.log('1prong');
+                add1Prong(meta, rO, xO, y);
                 return undefined;
             }
-            // return undefined;
-        }
-        if (typeof _debug_ !== 'undefined') {
-            xs.push({ x, y, z: createPos(z.curve, z.t, false), t: y.t });
         }
+        // if (typeof _debug_ !== 'undefined') { xs.push({ x, y, z: createPos(z.curve, z.t, false), t: y.t }); }
         if (!isHoleClosing) {
+            const squaredSeperationTolerance = max(calcSeperationTolerance(rO, sqrt(xz), 2 ** 2 * errorTolerance), minSquaredSeperationTolerance);
             if (yz <= squaredSeperationTolerance) {
                 // if (typeof _debug_ !== 'undefined') { console.log(`failed: seperation too small - ${sqrt(yz)}`); }
                 return undefined;
@@ -116,29 +120,36 @@ function find2Prong(angle, loops, extreme, squaredDiagonalLength, cpTrees, y, is
         i++;
         if (i === MAX_ITERATIONS) {
             // Convergence was too slow.
-            if (typeof _debug_ !== 'undefined') {
-                console.log('failed (slow): max iterations reached');
-            }
+            // if (typeof _debug_ !== 'undefined') { console.log('failed (slow): max iterations reached'); }
             return undefined;
         }
     }
-    // const zs_ = zs;
-    // console.log(zs.length)
-    // const zPos = createPos(z.curve, z.t, false);
     const circle = { center: x, radius: distanceBetween(x, z.p) };
-    if (typeof _debug_ !== 'undefined') {
-        addDebugInfo(bezierPieces, false, x, y, z, circle, δ, xs, isHoleClosing);
-    }
-    // return { circle, zs: zs_ };
-    return { circle, zs: zs };
+    // if (typeof _debug_ !== 'undefined') { addDebugInfo(bezierPieces, false, x, y, z, circle!, δ!, xs, isHoleClosing); }
+    // return { circle, zs };
+    // zs = zs.filter(z => z !== undefined)
+    return { circle, zs: [z] };
 }
-function addDebugInfo2(isHoleClosing) {
-    if (typeof _debug_ !== 'undefined') {
-        const elems = _debug_.generated.elems;
-        const elem = isHoleClosing ? elems.twoProng_holeClosing : elems.twoProng_regular;
-        const elemStr = isHoleClosing ? 'hole-closing: ' + elem.length : 'regular: ' + elem.length;
-        console.log('failed: no closest point - ' + elemStr);
+function getO(angle, isHoleClosing, maxOsculatingCircleRadius, minCurvature, y) {
+    let xO; // the original x to mitigate drift
+    const p = y.p;
+    let rO;
+    if (isHoleClosing) {
+        xO = [p[0], p[1] - maxOsculatingCircleRadius];
+        rO = maxOsculatingCircleRadius;
+    }
+    else {
+        if (angle === 0) {
+            ({ center: xO, radius: rO } = getOsculatingCircle(minCurvature, y));
+        }
+        else {
+            ({ center: xO, radius: rO } = getOsculatingCircle(minCurvature, y, true));
+            const v = fromTo(y.p, xO);
+            const v_ = rotate(sin(angle), cos(angle))(v);
+            xO = translate(y.p)(v_);
+        }
     }
+    return [xO, rO];
 }
 export { find2Prong };
 //# sourceMappingURL=find-2-prong.js.map

package/node/find-2-prong/find-2-prong.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-2-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/find-2-prong.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAKvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAGrC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,SAAS,UAAU,CACjB,KAAa,EACb,KAAa,EACb,OAAe,EACf,qBAA6B,EAC7B,OAAmC,EAC7B,CAAe,EACrB,aAAsB,EACtB,CAAS,EACT,SAAkB;IAEnB,MAAM,cAAc,GAAG,EAAE,CAAC;IAC1B,MAAM,0BAA0B,GAAG,CAAC,CAAC,CAAC,IAAE,CAAC,EAAE,CAAC,GAAC,OAAO,CAAC,IAAE,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,CAAC,CAAC,IAAE,CAAC,EAAE,CAAC,GAAC,OAAO,CAAC;IACxC,MAAM,yBAAyB,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,CAAC,GAAC,yBAAyB,CAAC;IAEjD,IAAI,EAAY,CAAC,CAAE,mCAAmC;IACtD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACd,IAAI,EAAU,CAAC;IACf,IAAI,aAAa,EAAE;QAClB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC;QAC9C,EAAE,GAAG,yBAAyB,CAAC;KAC/B;SAAM;QACN,IAAI,KAAK,KAAK,CAAC,EAAE;YAChB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,mBAAmB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;SACpE;aAAM;YACN,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,mBAAmB,CAAC,YAAY,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;YAC1E,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1B,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7C,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACxB;KACD;IAED,6DAA6D;IAC7D,yDAAyD;IACzD,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,sBAAsB,CACjD,KAAK,EAAE,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CACtE,CAAC;IAEF,yDAAyD;IACzD,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX,sCAAsC;IACtC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5D,IAAI,EAAE,GAAG,EAAE,EAAE;QACZ,CAAC,GAAG,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,GAAC,EAAE,CAAC,CAAC;KAC9B;IAED,6CAA6C;IAC7C,MAAM,EAAE,GAAqB,EAAE,CAAC;IAChC,2DAA2D;IAC3D,IAAI,EAAE,GAAmB,SAAU,CAAC;IACpC,IAAI,CAAC,GAAiB,SAAU,CAAC;IACjC,IAAI,aAAa,GAAG,YAAY,CAAC;IAEjC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,cAAc,EAAE;QAC1B,MAAM,EAAE,GAAG,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,aAAa,GAAG,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;SAAE;QAEvE,EAAE,GAAG,+BAA+B,CACnC,aAAa,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAC9B,SAAS,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,GAAC,YAAY,EAC5C,KAAK,CACL,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAEpD,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAEV,IAAI,CAAC,KAAK,SAAS,EAAE;YACpB,aAAa,CAAC,aAAa,CAAC,CAAC;YAC7B,OAAO,SAAS,CAAC;SACjB;QAED,MAAM,EAAE,GAAG,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,EAAE,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9C,kBAAkB;QAClB,IAAI,CAAC,KAAK,CAAC,EAAE;YACZ,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,IAAE,CAAC,CAAC,CAAC,GAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBAC9B,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC9B,OAAO,SAAS,CAAC;aACjB;YACD,oBAAoB;SACpB;QAED,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAAE;QAGrG,IAAI,CAAC,aAAa,EAAE;YACnB,IAAI,EAAE,IAAI,0BAA0B,EAAE;gBACrC,qGAAqG;gBACrG,OAAO,SAAS,CAAC;aACjB;SACD;QAED,2DAA2D;QAC3D,qDAAqD;QACrD,MAAM,KAAK,GAAG,4BAA4B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,qCAAqC;QAErC,CAAC,GAAG,KAAK,CAAC;QAEV,IAAI,KAAK,GAAG,cAAc,EAAE;YAC3B,MAAM;SACN;QAED,CAAC,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,cAAc,EAAE;YACzB,4BAA4B;YAC5B,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;gBAAE,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;aAAE;YAC7F,OAAO,SAAS,CAAC;SACjB;KACD;IAED,kBAAkB;IAClB,yBAAyB;IACzB,+CAA+C;IAE/C,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9D,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAAE,YAAY,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAO,EAAE,CAAE,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;KAAE;IAEnH,8BAA8B;IAC9B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;AAC3B,CAAC;AAGD,SAAS,aAAa,CAAC,aAAsB;IAC5C,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC;QACtC,MAAM,IAAI,GAAG,aAAa,CAAE,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAA;QACjF,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3F,OAAO,CAAC,GAAG,CAAC,6BAA6B,GAAG,OAAO,CAAC,CAAC;KACrD;AACF,CAAC;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"find-2-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/find-2-prong.ts"],"names":[],"mappings":"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"}

package/node/find-2-prong/find-and-add-2-prong.d.ts

@@ -0,0 +1,11 @@
+import { CpNode } from "../cp-node/cp-node.js";
+import { MatMeta } from "../mat/mat-meta.js";
+import { PointOnShape } from "../point-on-shape/point-on-shape.js";
+/**
+ * Just to simplify `find2Prong` a bit.
+ *
+ * * Cannot be used with holeClosers or angles other than 0
+ * * Can be used after the mat has been found
+ */
+declare function findAndAdd2Prong(meta: MatMeta, y: PointOnShape): CpNode | undefined;
+export { findAndAdd2Prong };

package/node/find-2-prong/find-and-add-2-prong.js

@@ -0,0 +1,19 @@
+import { add2Prong } from "./add-2-prong.js";
+import { find2Prong } from "./find-2-prong.js";
+/**
+ * Just to simplify `find2Prong` a bit.
+ *
+ * * Cannot be used with holeClosers or angles other than 0
+ * * Can be used after the mat has been found
+ */
+function findAndAdd2Prong(meta, y) {
+    const twoProngInfo = find2Prong(meta, false, false, 0, y);
+    if (twoProngInfo === undefined) {
+        return undefined;
+    }
+    const { circle, zs } = twoProngInfo;
+    const cpNode = add2Prong(meta, circle, [y, ...zs], false);
+    return cpNode;
+}
+export { findAndAdd2Prong };
+//# sourceMappingURL=find-and-add-2-prong.js.map

package/node/find-2-prong/find-and-add-2-prong.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-and-add-2-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/find-and-add-2-prong.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG/C;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,IAAa,EACb,CAAe;IAEnB,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,CAAC;IACpC,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAE1D,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/find-2-prong/find-and-add-2-prongs-on-all-loops.d.ts

@@ -0,0 +1,14 @@
+import { CpNode } from '../cp-node/cp-node.js';
+import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { MatMeta } from '../mat/mat-meta.js';
+/**
+ * @internal
+ * Add 2 prongs. See comments on the add2Prong function.
+ *
+ * @param meta
+ * @param angleIncrement
+ * @param for2Prongss
+ * @param for1Prongs
+ */
+declare function findAndAdd2ProngsOnAllLoops(meta: MatMeta, angleIncrement: number, for2Prongss: PointOnShape[][], for1Prongs: boolean): CpNode | undefined;
+export { findAndAdd2ProngsOnAllLoops };

package/node/find-2-prong/find-and-add-2-prongs-on-all-loops.js

@@ -0,0 +1,21 @@
+import { findAndAdd2Prongs } from './find-and-add-2-prongs.js';
+/**
+ * @internal
+ * Add 2 prongs. See comments on the add2Prong function.
+ *
+ * @param meta
+ * @param angleIncrement
+ * @param for2Prongss
+ * @param for1Prongs
+ */
+function findAndAdd2ProngsOnAllLoops(meta, angleIncrement, for2Prongss, for1Prongs) {
+    let cpNode;
+    for (let k = 0; k < for2Prongss.length; k++) {
+        const for2Prongs = for2Prongss[k];
+        const _cpNode = findAndAdd2Prongs(meta, angleIncrement, for2Prongs, for1Prongs);
+        cpNode = cpNode === undefined ? _cpNode : cpNode;
+    }
+    return cpNode;
+}
+export { findAndAdd2ProngsOnAllLoops };
+//# sourceMappingURL=find-and-add-2-prongs-on-all-loops.js.map

package/node/find-2-prong/find-and-add-2-prongs-on-all-loops.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-and-add-2-prongs-on-all-loops.js","sourceRoot":"","sources":["../../src/find-2-prong/find-and-add-2-prongs-on-all-loops.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAI/D;;;;;;;;GAQG;AACH,SAAS,2BAA2B,CAC5B,IAAa,EACb,cAAsB,EACtB,WAA6B,EAC7B,UAAmB;IAEvB,IAAI,MAA0B,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,iBAAiB,CAC7B,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAC/C,CAAC;QACF,MAAM,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACrD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,2BAA2B,EAAE,CAAA"}

package/node/find-2-prong/find-and-add-2-prongs.d.ts

@@ -1,16 +1,12 @@
-import { LlRbTree } from 'flo-ll-rb-tree';
-import { Loop } from 'flo-boolean';
-import { CpNode } from '../cp-node/cp-node.js';
 import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { MatMeta } from '../mat/mat-meta.js';
 /**
  * @internal
  * Find and add two-prongs.
- * @param loops
- * @param cpGraphs
- * @param k
+ * @param meta
+ * @param angleIncrement
  * @param for2Prongs
- * @param extreme The maximum coordinate value used to calculate floating point
- * tolerances.
+ * @param for1Prong
  */
-declare function findAndAdd2Prongs(loops: Loop[], cpGraphs: Map<Loop, LlRbTree<CpNode>>, k: number, for2Prongs: PointOnShape[], extreme: number, for1Prongs: boolean): CpNode | undefined;
+declare function findAndAdd2Prongs(meta: MatMeta, angleIncrement: number, for2Prongs: PointOnShape[], for1Prong: boolean): import("../index.js").CpNode | undefined;
 export { findAndAdd2Prongs };

package/node/find-2-prong/find-and-add-2-prongs.js

@@ -1,28 +1,22 @@
-import { getShapeBounds } from '../svg/get-shape-bounds.js';
 import { find2Prong } from './find-2-prong.js';
 import { add2Prong } from './add-2-prong.js';
-import { getCorner } from '../corner/get-corner.js';
 import { rotateNeg90Degrees } from 'flo-vector2d';
+import { getCorner } from '../corner/get-corner.js';
 const { PI, atan2 } = Math;
-const ANGLE = 15 * PI / 180; // 15 degrees - don't make smaller than 2 degrees
+// const ANGLE = 15*PI/180;  // 15 degrees - don't make smaller than 2 degrees
 /**
  * @internal
  * Find and add two-prongs.
- * @param loops
- * @param cpGraphs
- * @param k
+ * @param meta
+ * @param angleIncrement
  * @param for2Prongs
- * @param extreme The maximum coordinate value used to calculate floating point
- * tolerances.
+ * @param for1Prong
  */
-function findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme, for1Prongs) {
+function findAndAdd2Prongs(meta, angleIncrement, for2Prongs, for1Prong) {
     let cpNode_;
-    const bounds = getShapeBounds(loops);
-    const squaredDiagonalLength = (bounds.maxX.p[0] - bounds.minX.p[0]) ** 2 +
-        (bounds.maxY.p[1] - bounds.minY.p[1]) ** 2;
+    const angleIncrement_ = angleIncrement * PI / 180;
     for (let i = 0; i < for2Prongs.length; i++) {
-        // const angles = [0];
-        let angles = [0];
+        const angles = [0];
         const pos = for2Prongs[i];
         if (pos.t === 1) {
             const { curve } = pos;
@@ -30,21 +24,23 @@ function findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme, for1Prongs)
             if (corner.isQuiteDull) {
                 const tangentI = rotateNeg90Degrees(corner.tangents[0]);
                 const tangentO = rotateNeg90Degrees(corner.tangents[1]);
-                const a1 = ((atan2(tangentI[1], tangentI[0]) + 2 * PI) % (2 * PI));
-                const a2 = ((atan2(tangentO[1], tangentO[0]) + 2 * PI) % (2 * PI));
+                // const tangentI = corner.tangents[0];
+                // const tangentO = corner.tangents[1];
+                const a1 = (atan2(tangentI[1], tangentI[0]) + 2 * PI) % (2 * PI);
+                const a2 = (atan2(tangentO[1], tangentO[0]) + 2 * PI) % (2 * PI);
                 const a3 = ((a2 - a1) + 2 * PI) % (2 * PI);
-                let angle = ANGLE;
-                while (angle <= a3 - (ANGLE / 2)) {
+                let angle = angleIncrement_;
+                while (angle <= a3 - (angleIncrement_ / 2)) {
                     angles.push(angle);
-                    angle += ANGLE;
+                    angle += angleIncrement_;
                 }
             }
         }
         for (let angle of angles) {
-            const twoProngInfo = find2Prong(angle, loops, extreme, squaredDiagonalLength, cpGraphs, pos, false, k, for1Prongs);
+            const twoProngInfo = find2Prong(meta, false, for1Prong, angle, pos);
             if (twoProngInfo) {
                 const { circle, zs } = twoProngInfo;
-                const cpNode = add2Prong(cpGraphs, circle, pos, zs, false, extreme);
+                const cpNode = add2Prong(meta, circle, [pos, ...zs], false);
                 cpNode_ = cpNode_ || cpNode;
             }
             if (typeof _debug_ !== 'undefined') {

package/node/find-2-prong/find-and-add-2-prongs.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-and-add-2-prongs.js","sourceRoot":"","sources":["../../src/find-2-prong/find-and-add-2-prongs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"find-and-add-2-prongs.js","sourceRoot":"","sources":["../../src/find-2-prong/find-and-add-2-prongs.ts"],"names":[],"mappings":"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"}

package/node/find-2-prong/find-and-add-hole-closing-2-prongs.d.ts

@@ -1,14 +1,13 @@
-import { LlRbTree } from 'flo-ll-rb-tree';
-import { Loop } from 'flo-boolean';
 import { CpNode } from '../cp-node/cp-node.js';
+import { MatMeta } from '../mat/mat-meta.js';
 /**
  * @internal
  * Find and add two-prongs that remove any holes in the shape.
  * @param loops The loops (that as a precondition must be ordered from
  * highest (i.e. smallest y-value) topmost point loops to lowest)
  * @param cpTrees
- * @param extreme The maximum coordinate value used to calculate floating point
+ * @param maxCoordinate The maximum coordinate value used to calculate floating point
  * tolerances.
  */
-declare function findAndAddHoleClosing2Prongs(loops: Loop[], cpTrees: Map<Loop, LlRbTree<CpNode>>, extreme: number): void;
+declare function findAndAddHoleClosing2Prongs(meta: MatMeta): CpNode | undefined;
 export { findAndAddHoleClosing2Prongs };