flo-mat 2.0.4 → 3.0.0

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

@@ -0,0 +1,15 @@
+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';
+/**
+ * @internal
+ * Add 2 prongs. See comments on the add2Prong function.
+ * @param loops
+ * @param cpGraphs
+ * @param for2Prongss
+ * @param extreme The maximum coordinate value used to calculate floating point
+ * tolerances.
+ */
+declare function findAndAdd2ProngsOnAllPaths(cpNode: CpNode | undefined, loops: Loop[], cpGraphs: Map<Loop, LlRbTree<CpNode>>, for2Prongss: PointOnShape[][], extreme: number, for1Prongs: boolean): CpNode | undefined;
+export { findAndAdd2ProngsOnAllPaths };

package/node/{mat/find-mat → find-2-prong}/find-and-add-2-prongs-on-all-paths.js

@@ -1,6 +1,7 @@
 import { findAndAdd2Prongs } from './find-and-add-2-prongs.js';
+import { fixOrdering } from '../find-mat/fix-ordering.js';
 /**
- * @hidden
+ * @internal
  * Add 2 prongs. See comments on the add2Prong function.
  * @param loops
  * @param cpGraphs
@@ -8,13 +9,13 @@ import { findAndAdd2Prongs } from './find-and-add-2-prongs.js';
  * @param extreme The maximum coordinate value used to calculate floating point
  * tolerances.
  */
-function findAndAdd2ProngsOnAllPaths(loops, cpGraphs, for2Prongss, extreme) {
-    let cpNode;
+function findAndAdd2ProngsOnAllPaths(cpNode, loops, cpGraphs, for2Prongss, extreme, for1Prongs) {
     for (let k = 0; k < for2Prongss.length; k++) {
         const for2Prongs = for2Prongss[k];
-        const _cpNode = findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme);
+        const _cpNode = findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme, for1Prongs);
         cpNode = cpNode || _cpNode;
     }
+    fixOrdering(cpNode);
     return cpNode;
 }
 export { findAndAdd2ProngsOnAllPaths };

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

@@ -0,0 +1 @@
+{"version":3,"file":"find-and-add-2-prongs-on-all-paths.js","sourceRoot":"","sources":["../../src/find-2-prong/find-and-add-2-prongs-on-all-paths.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D;;;;;;;;GAQG;AACH,SAAS,2BAA2B,CAC5B,MAA0B,EAC1B,KAAa,EACb,QAAoC,EACpC,WAA6B,EAC7B,OAAe,EACf,UAAmB;IAEvB,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QACvF,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC;KAC9B;IAED,WAAW,CAAC,MAAO,CAAC,CAAC;IAErB,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,2BAA2B,EAAE,CAAA"}

package/node/{mat/find-mat → find-2-prong}/find-and-add-2-prongs.d.ts

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

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

@@ -0,0 +1,60 @@
+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';
+const { PI, atan2 } = Math;
+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 for2Prongs
+ * @param extreme The maximum coordinate value used to calculate floating point
+ * tolerances.
+ */
+function findAndAdd2Prongs(loops, cpGraphs, k, for2Prongs, extreme, for1Prongs) {
+    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;
+    for (let i = 0; i < for2Prongs.length; i++) {
+        // const angles = [0];
+        let angles = [0];
+        const pos = for2Prongs[i];
+        if (pos.t === 1) {
+            const { curve } = pos;
+            const corner = getCorner(curve.ps, curve.next.ps);
+            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 a3 = ((a2 - a1) + 2 * PI) % (2 * PI);
+                let angle = ANGLE;
+                while (angle <= a3 - (ANGLE / 2)) {
+                    angles.push(angle);
+                    angle += ANGLE;
+                }
+            }
+        }
+        for (let angle of angles) {
+            const twoProngInfo = find2Prong(angle, loops, extreme, squaredDiagonalLength, cpGraphs, pos, false, k, for1Prongs);
+            if (twoProngInfo) {
+                const { circle, zs } = twoProngInfo;
+                const cpNode = add2Prong(cpGraphs, circle, pos, zs, false, extreme);
+                cpNode_ = cpNode_ || cpNode;
+            }
+            if (typeof _debug_ !== 'undefined') {
+                if (i + 1 === _debug_.directives.stopAfterTwoProngsNum) {
+                    return undefined;
+                }
+            }
+        }
+    }
+    return cpNode_;
+}
+export { findAndAdd2Prongs };
+//# sourceMappingURL=find-and-add-2-prongs.js.map

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

@@ -0,0 +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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"}

package/node/{mat/find-mat → find-2-prong}/find-and-add-hole-closing-2-prongs.d.ts

@@ -1,8 +1,8 @@
 import { LlRbTree } from 'flo-ll-rb-tree';
-import { Loop } from '../../loop.js';
-import { CpNode } from '../../cp-node.js';
+import { Loop } from 'flo-boolean';
+import { CpNode } from '../cp-node/cp-node.js';
 /**
- * @hidden
+ * @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)

package/node/{mat/find-mat → find-2-prong}/find-and-add-hole-closing-2-prongs.js

@@ -1,9 +1,9 @@
-import { getShapeBounds } from '../../svg/get-shape-bounds.js';
-import { getMinYPos } from '../../svg/get-min-y-pos.js';
-import { find2Prong } from './find-2-prong/find-2-prong.js';
+import { getShapeBounds } from '../svg/get-shape-bounds.js';
+import { getMinYPos } from '../svg/get-min-y-pos.js';
+import { find2Prong } from './find-2-prong.js';
 import { add2Prong } from './add-2-prong.js';
 /**
- * @hidden
+ * @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)
@@ -20,7 +20,7 @@ function findAndAddHoleClosing2Prongs(loops, cpTrees, extreme) {
     // We start at 1 since 0 is the outer (root) loop
     for (let k = 1; k < minYs.length; k++) {
         const posSource = minYs[k];
-        const holeClosingTwoProng = find2Prong(loops, extreme, squaredDiagonalLength, cpTrees, posSource, true, k);
+        const holeClosingTwoProng = find2Prong(0, loops, extreme, squaredDiagonalLength, cpTrees, posSource, true, k, false);
         if (!holeClosingTwoProng) {
             throw new Error(`Unable to find hole-closing 2-prong`);
         }

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

@@ -0,0 +1 @@
+{"version":3,"file":"find-and-add-hole-closing-2-prongs.js","sourceRoot":"","sources":["../../src/find-2-prong/find-and-add-hole-closing-2-prongs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C;;;;;;;;GAQG;AACH,SAAS,4BAA4B,CAC7B,KAAa,EACb,OAAmC,EACnC,OAAe;IAEnB,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,qBAAqB,GACvB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC;QACxC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC;IAE7C,wCAAwC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEpC,iDAAiD;IACjD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAE3B,MAAM,mBAAmB,GAAG,UAAU,CAClC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,CAC/E,CAAC;QAEF,IAAI,CAAC,mBAAmB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SAC1D;QAED,uEAAuE;QACvE,wEAAwE;QACxE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAC;QAEzD,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;KAC3E;AACL,CAAC;AAGD,OAAO,EAAE,4BAA4B,EAAE,CAAA"}

package/node/find-2-prong/find-equidistant-point-on-line-dd.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Returns the point on the line from y to x that is equidistant from y and z.
+ *
+ * @internal
+ * @param x
+ * @param y
+ * @param z
+  */
+declare function findEquidistantPointOnLineDd(x: number[], y: number[], z: number[]): number[];
+export { findEquidistantPointOnLineDd };

package/node/find-2-prong/find-equidistant-point-on-line-dd.js

@@ -0,0 +1,56 @@
+import { twoDiff, twoProduct, ddDivDd, ddAddDd, ddDiffDd, ddMultDd, ddMultBy2, ddMultDouble1 } from "double-double";
+const { abs } = Math;
+const td = twoDiff;
+const tp = twoProduct;
+/**
+ * Returns the point on the line from y to x that is equidistant from y and z.
+ *
+ * @internal
+ * @param x
+ * @param y
+ * @param z
+  */
+function findEquidistantPointOnLineDd(x, y, z) {
+    // Some basic algebra (not shown) finds the required point.
+    // Swap axes if x and y are more aligned to y-axis than to x-axis.
+    const swapAxes = abs(x[1] - y[1]) > abs(x[0] - y[0]);
+    // Cache
+    let x1;
+    let x2;
+    let y1;
+    let y2;
+    let z1;
+    let z2;
+    if (swapAxes) {
+        x1 = x[1];
+        x2 = x[0];
+        y1 = y[1];
+        y2 = y[0];
+        z1 = z[1];
+        z2 = z[0];
+    }
+    else {
+        x1 = x[0];
+        x2 = x[1];
+        y1 = y[0];
+        y2 = y[1];
+        z1 = z[0];
+        z2 = z[1];
+    }
+    // a <= 1 (due to swapped axes)
+    // const a = (x2 - y2) / (x1 - y1); 
+    // const b = y2 - a*y1;
+    // const c = (y1*y1 + y2*y2 - z1*z1 - z2*z2) + 2*b*(z2 - y2);
+    // const d = y1 - z1 + a*(y2 - z2);
+    // const t1 = c/(2*d);
+    // const t2 = a*t1 + b;
+    const a = ddDivDd(td(x2, y2), td(x1, y1));
+    const b = ddDiffDd([0, y2], ddMultDouble1(y1, a));
+    const c = ddAddDd((ddDiffDd(ddAddDd(tp(y1, y1), tp(y2, y2)), ddAddDd(tp(z1, z1), tp(z2, z2)))), ddMultBy2(ddMultDd(b, (td(z2, y2)))));
+    const d = ddAddDd(td(y1, z1), ddMultDd(a, td(y2, z2)));
+    const t1 = ddDivDd(c, ddMultBy2(d));
+    const t2 = ddAddDd(ddMultDd(a, t1), b);
+    return swapAxes ? [t2[1], t1[1]] : [t1[1], t2[1]];
+}
+export { findEquidistantPointOnLineDd };
+//# sourceMappingURL=find-equidistant-point-on-line-dd.js.map

package/node/find-2-prong/find-equidistant-point-on-line-dd.js.map

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

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

@@ -0,0 +1,15 @@
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Loop } from 'flo-boolean';
+import { BezierPiece } from '../mat/bezier-piece.js';
+import { CpNode } from '../cp-node/cp-node.js';
+import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { Circle } from '../geometry/circle.js';
+/** @internal */
+declare function getInitialBezierPieces(angle: number, isHoleClosing: boolean, k: number, loops: Loop[], cpTrees: Map<Loop, LlRbTree<CpNode>>, y: PointOnShape, circle: Circle): {
+    bezierPieces: BezierPiece[];
+    δ: undefined;
+} | {
+    bezierPieces: BezierPiece[];
+    δ: CpNode[];
+};
+export { getInitialBezierPieces };

package/node/find-2-prong/get-initial-bezier-pieces.js

@@ -0,0 +1,40 @@
+import { getNeighbouringPoints } from '../mat/get-neighboring-cps.js';
+import { getBoundaryPieceBeziers } from '../mat/get-boundary-piece-beziers.js';
+import { isPosDullCorner } from '../point-on-shape/is-pos-dull-corner.js';
+import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
+/** @internal */
+function getInitialBezierPieces(angle, isHoleClosing, k, loops, cpTrees, y, circle) {
+    if (isHoleClosing) {
+        const bezierPieces = [];
+        for (let k2 = 0; k2 < k; k2++) {
+            const pieces = loops[k2].curves
+                .map(curve => ({ curve, ts: [0, 1] }));
+            bezierPieces.push(...pieces);
+        }
+        return { bezierPieces, δ: undefined };
+    }
+    let bezierPieces;
+    const order = isPosDullCorner(y)
+        ? y.t === 1 && angle === 0
+            ? -1
+            : y.t === 0
+                ? +1
+                : calcPosOrder(circle, y)
+        : 0;
+    const loop = loops[k];
+    const cpNode = getNeighbouringPoints(cpTrees.get(loop), y, order, 0)[0];
+    const δ = [cpNode, cpNode];
+    if (!cpNode ||
+        // The special case if there is only a single sharp corner or 
+        // terminating 2-prong currently in the MAT. Don't remove!
+        (cpNode === cpNode.next.next)) {
+        bezierPieces = loop.curves
+            .map(curve => ({ curve, ts: [0, 1] }));
+    }
+    else {
+        bezierPieces = getBoundaryPieceBeziers(δ);
+    }
+    return { bezierPieces, δ };
+}
+export { getInitialBezierPieces };
+//# sourceMappingURL=get-initial-bezier-pieces.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get-initial-bezier-pieces.js","sourceRoot":"","sources":["../../src/find-2-prong/get-initial-bezier-pieces.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAI/E,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAInE,gBAAgB;AAChB,SAAS,sBAAsB,CACvB,KAAa,EACb,aAAsB,EACtB,CAAS,EACT,KAAa,EACb,OAAmC,EACnC,CAAe,EACf,MAAc;IAElB,IAAI,aAAa,EAAE;QACf,MAAM,YAAY,GAAkB,EAAE,CAAC;QACvC,KAAK,IAAI,EAAE,GAAC,CAAC,EAAE,EAAE,GAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YACvB,MAAM,MAAM,GAAkB,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM;iBACzC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YACzC,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;SAChC;QAED,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;KACzC;IAED,IAAI,YAA2B,CAAC;IAChC,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC;YACtB,CAAC,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACX,CAAC,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC,CAAC;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACtB,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,IAAI,CAAC,MAAM;QACP,8DAA8D;QAC9D,0DAA0D;QAC1D,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAC/B;QACE,YAAY,GAAG,IAAI,CAAC,MAAM;aACrB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;KAC5C;SAAM;QACH,YAAY,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;KAC7C;IAED,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;AAC/B,CAAC;AAGD,OAAO,EAAE,sBAAsB,EAAE,CAAA"}

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

@@ -0,0 +1,8 @@
+import { BezierPiece } from '../mat/bezier-piece.js';
+/**
+ * @internal
+ *
+ * Reduces the circle radius initially as an optimization step.
+ */
+declare function reduceRadius(extreme: number, bezierPieces: BezierPiece[], p: number[], x: number[]): number;
+export { reduceRadius };

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

@@ -0,0 +1,72 @@
+import { evalDeCasteljau } from "flo-bezier3";
+import { dot, lineLineIntersection, squaredDistanceBetween } from "flo-vector2d";
+/**
+ * @internal
+ *
+ * Reduces the circle radius initially as an optimization step.
+ */
+function reduceRadius(extreme, bezierPieces, p, x) {
+    const TOLERANCE = 1 + 2 ** -10;
+    let prevP = undefined;
+    let minRadius = Number.POSITIVE_INFINITY;
+    for (let i = 0; i < bezierPieces.length; i++) {
+        const bezierPiece = bezierPieces[i];
+        const ps = bezierPiece.curve.ps;
+        let r1 = Number.POSITIVE_INFINITY;
+        const p1 = evalDeCasteljau(ps, bezierPiece.ts[0]);
+        // Prevent evaluating the same points twice
+        if (!prevP || prevP[0] !== p1[0] || prevP[1] !== p1[1]) {
+            const cc1 = getCircleCenterFrom2PointsAndNormal(extreme, p, x, p1);
+            if (cc1) {
+                r1 = squaredDistanceBetween(p, cc1);
+            }
+        }
+        let r2 = Number.POSITIVE_INFINITY;
+        const p2 = evalDeCasteljau(ps, bezierPiece.ts[1]);
+        const cc2 = getCircleCenterFrom2PointsAndNormal(extreme, p, x, p2);
+        if (cc2) {
+            r2 = squaredDistanceBetween(p, cc2);
+        }
+        prevP = p2;
+        const d = Math.min(r1, r2);
+        if (d < minRadius) {
+            minRadius = d;
+        }
+    }
+    // The extra bit is to account for floating point precision.
+    return TOLERANCE * minRadius;
+}
+/**
+ * @internal
+ * @param p A point on the circle with normal pointing to x towards the center
+ * of the circle.
+ * @param x
+ * @param p1 Another point on the circle.
+ */
+function getCircleCenterFrom2PointsAndNormal(extreme, p, x, p1) {
+    const TOLERANCE = (2 ** -14 * extreme) ** 2;
+    // Ignore if p and p1 are too close together
+    if (squaredDistanceBetween(p, p1) < TOLERANCE) {
+        return undefined;
+    }
+    /** The perpindicular bisector between the two given points on the circle */
+    const pb = [
+        (p[0] + p1[0]) / 2,
+        (p[1] + p1[1]) / 2,
+    ];
+    const tan = [p1[0] - p[0], p1[1] - p[1]];
+    const norm = [-tan[1], tan[0]]; // Rotate by 90 degrees
+    const pb2 = [pb[0] + norm[0], pb[1] + norm[1]];
+    const res = lineLineIntersection([p, x], [pb, pb2]);
+    if (!res) {
+        return undefined;
+    }
+    const resO = [res[0] - p[0], res[1] - p[1]];
+    const xO = [x[0] - p[0], x[1] - p[1]];
+    if (dot(resO, xO) < 0) {
+        return undefined;
+    }
+    return res;
+}
+export { reduceRadius };
+//# sourceMappingURL=reduce-radius.js.map

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

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

package/node/find-2-prong/squared-distance-between-dd.d.ts

@@ -0,0 +1,2 @@
+declare function squaredDistanceBetweenDd(x: number[], y: number[]): number;
+export { squaredDistanceBetweenDd };

package/node/find-2-prong/squared-distance-between-dd.js

@@ -0,0 +1,17 @@
+import { ddMultDd, ddAddDd, twoDiff } from 'double-double';
+function squaredDistanceBetweenDd(x, y) {
+    const [x0, y0] = x;
+    const [x1, y1] = y;
+    // xd = x0 - x1;
+    // yd = y0 - y1;
+    // xx = xd**2;
+    // yy = yd**2;
+    // return xx + yy
+    const xd = twoDiff(x0, x1);
+    const yd = twoDiff(y0, y1);
+    const xx = ddMultDd(xd, xd);
+    const yy = ddMultDd(yd, yd);
+    return ddAddDd(xx, yy)[1];
+}
+export { squaredDistanceBetweenDd };
+//# sourceMappingURL=squared-distance-between-dd.js.map

package/node/find-2-prong/squared-distance-between-dd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"squared-distance-between-dd.js","sourceRoot":"","sources":["../../src/find-2-prong/squared-distance-between-dd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG3D,SAAS,wBAAwB,CACzB,CAAW,EAAE,CAAW;IAE5B,MAAM,CAAC,EAAE,EAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAClB,MAAM,CAAC,EAAE,EAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAElB,gBAAgB;IAChB,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,iBAAiB;IAEjB,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;IAC1B,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;IAC1B,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;IAC3B,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;IAE3B,OAAO,OAAO,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAGD,OAAO,EAAE,wBAAwB,EAAE,CAAA"}

package/node/find-2-prong/x-for-debugging.d.ts

@@ -0,0 +1,9 @@
+import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+/** @internal */
+type TXForDebugging = {
+    x: number[];
+    y: PointOnShape;
+    z: PointOnShape;
+    t: number;
+};
+export { TXForDebugging };

package/node/find-2-prong/x-for-debugging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"x-for-debugging.js","sourceRoot":"","sources":["../../src/find-2-prong/x-for-debugging.ts"],"names":[],"mappings":""}

package/node/{mat/find-mat → find-3-prong.ts}/add-3-prong.d.ts

@@ -1,19 +1,24 @@
 import { LlRbTree } from 'flo-ll-rb-tree';
-import { CpNode } from '../../cp-node.js';
-import { Loop } from '../../loop.js';
-import { Circle } from '../../circle.js';
-import { IPointOnShape } from '../../point-on-shape.js';
+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';
 /**
- * @hidden
+ * @internal
+ *
  * Adds a 3-prong MAT circle according to the 3 given (previously calculated)
  * points on the shape.
+ *
+ * Returns 3 CpNodes if successful, else return one CpNode that is an offending
+ * too close existing CpNode.
+ *
  * @param cpTrees
  * @param orders
  * @param threeProng
  */
 declare function add3Prong(cpTrees: Map<Loop, LlRbTree<CpNode>>, orders: number[], threeProng: {
     circle: Circle;
-    ps: IPointOnShape[];
+    ps: PointOnShape[];
     δ3s: CpNode[][];
-}): Circle;
+}): CpNode[];
 export { add3Prong };

package/node/find-3-prong.ts/add-3-prong.js

@@ -0,0 +1,82 @@
+import { addToCpGraph } from '../mat/add-to-cp-graph.js';
+import { isAnotherCpCloseby } from '../mat/is-another-cp-closeby.js';
+/**
+ * @internal
+ *
+ * Adds a 3-prong MAT circle according to the 3 given (previously calculated)
+ * points on the shape.
+ *
+ * Returns 3 CpNodes if successful, else return one CpNode that is an offending
+ * too close existing CpNode.
+ *
+ * @param cpTrees
+ * @param orders
+ * @param threeProng
+ */
+function add3Prong(cpTrees, orders, threeProng) {
+    const { circle, ps: poss, δ3s } = threeProng;
+    // Keep for possible future debugging.	
+    /*
+    let ii = -1;
+    if (typeof _debug_ !== 'undefined') {
+        for (let i=0; i<3; i++) {
+            const cpBef = threeProng.δ3s[i][0].cp;
+            const cpAft = threeProng.δ3s[i][1].cp;
+
+            //let cmpBef = PointOnShape.compareInclOrder(cpBef.pointOnShape, poss[i], cpBef.order, orders[i]);
+            //let cmpAft = PointOnShape.compareInclOrder(cpAft.pointOnShape, poss[i], cpAft.order, orders[i]);
+            const cmpBef = compareCps(cpBef, { pointOnShape: poss[i], order: orders[i], order2: 0, circle: undefined });
+            const cmpAft = compareCps(cpAft, { pointOnShape: poss[i], order: orders[i], order2: 0, circle: undefined });
+
+            // const cmpBef = comparePoss(cpBef.pointOnShape, poss[i]);
+            // const cmpAft = comparePoss(cpAft.pointOnShape, poss[i]);
+
+            // len is used by debug functions to reference a particular
+            // three-prong.
+            const len = _debug_.generated.elems.threeProng.length-1;
+            if (cmpBef > 0) {
+                console.log('----------------------------------------');
+                console.log(`3-prong order is wrong (bef) : i: ${i} - cmp: ${cmpBef} - n: ${len}`);
+                console.log(threeProng);
+                console.log(cpBef);
+                console.log(cpAft);
+                console.log(poss[i]);
+                ii = i;
+            }
+            if (cmpAft < 0) {
+                console.log('----------------------------------------');
+                console.log(`3-prong order is wrong (aft) : i: ${i} - cmp: ${cmpAft} - n: ${len}`);
+                console.log(threeProng);
+                console.log(cpBef);
+                console.log(cpAft);
+                console.log(poss[i]);
+            }
+        }
+    }
+    */
+    // TODO - replace 1000 below with correct value
+    const c1 = isAnotherCpCloseby(cpTrees, poss[0], circle, orders[0], 0, 1000);
+    const c2 = isAnotherCpCloseby(cpTrees, poss[1], circle, orders[1], 0, 1000);
+    const c3 = isAnotherCpCloseby(cpTrees, poss[2], circle, orders[2], 0, 1000);
+    // for (let pos of poss) {
+    // 	if (pos.t === 0.9978869234519733) {
+    // 		console.log(pos)
+    // 	}
+    // }
+    // if (!!c1) {
+    // 	console.log(getRealProngCount(c1));
+    // }
+    // if (!!c2) {
+    // 	console.log(getRealProngCount(c2));
+    // }
+    // if (!!c3) {
+    // 	console.log(getRealProngCount(c3));
+    // }
+    // if (!!c1) { return [c1]; }
+    // if (!!c2) { return [c2]; }
+    // if (!!c3) { return [c3]; }
+    const cps = addToCpGraph(circle, orders, cpTrees, poss, δ3s);
+    return cps;
+}
+export { add3Prong };
+//# sourceMappingURL=add-3-prong.js.map

package/node/find-3-prong.ts/add-3-prong.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-3-prong.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/add-3-prong.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGrE;;;;;;;;;;;;GAYG;AACH,SAAS,SAAS,CAChB,OAAmC,EACnC,MAAgB,EAChB,UAIC;IAEF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;IAE7C,uCAAuC;IAEvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAqCE;IAEF,+CAA+C;IAC/C,MAAM,EAAE,GAAG,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5E,MAAM,EAAE,GAAG,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5E,MAAM,EAAE,GAAG,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAE5E,0BAA0B;IAC1B,uCAAuC;IACvC,qBAAqB;IACrB,KAAK;IACL,IAAI;IAGJ,cAAc;IACd,uCAAuC;IACvC,IAAI;IACJ,cAAc;IACd,uCAAuC;IACvC,IAAI;IACJ,cAAc;IACd,uCAAuC;IACvC,IAAI;IAEJ,6BAA6B;IAC7B,6BAA6B;IAC7B,6BAA6B;IAE7B,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAE7D,OAAO,GAAG,CAAC;AACZ,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/{mat/find-mat/find-3-prong → find-3-prong.ts}/calc-better-x.d.ts

@@ -1,7 +1,7 @@
-import { IPointOnShape } from '../../../point-on-shape.js';
-import { BezierPiece } from '../../bezier-piece.js';
+import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { BezierPiece } from '../mat/bezier-piece.js';
 /**
- * @hidden
+ * @internal
  * Find new x and ps that are a better estimate of the 3-prong circle.
  * The potential function, V, is defined as the distance to the actual 3 prong
  * circle center.
@@ -14,6 +14,6 @@ import { BezierPiece } from '../../bezier-piece.js';
 declare function calcBetterX(bezierPiece3s: BezierPiece[][], x: number[], vectorToZeroV: number[]): {
     newX: number[];
     newV: number;
-    newPs: IPointOnShape[];
+    newPs: (PointOnShape | undefined)[];
 };
 export { calcBetterX };

package/node/{mat/find-mat/find-3-prong → find-3-prong.ts}/calc-better-x.js

@@ -1,7 +1,7 @@
 import { fromTo, circumCenter, len, scale, translate } from 'flo-vector2d';
 import { getClosestPoints } from './get-closest-points.js';
 /**
- * @hidden
+ * @internal
  * Find new x and ps that are a better estimate of the 3-prong circle.
  * The potential function, V, is defined as the distance to the actual 3 prong
  * circle center.

package/node/find-3-prong.ts/calc-better-x.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calc-better-x.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/calc-better-x.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D;;;;;;;;;;GAUG;AACH,SAAS,WAAW,CACZ,aAA8B,EAC9B,CAAW,EACX,aAAuB;IAE3B,MAAM,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IAE7B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,CAAC;IACT,IAAI,KAAmC,CAAC;IACxC,IAAI,IAAI,CAAC;IACT,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY;IACvB,GAAG;QACC,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAG3B,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAE9C,kBAAkB;QAClB,MAAM,eAAe,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACvD,IAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAE7B,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC;QAElB,EAAE,GAAG,EAAE,GAAC,CAAC,CAAC;QAEV,CAAC,EAAE,CAAC;KACP,QAAQ,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;IAE3B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AAChC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/{mat/find-mat/find-3-prong → find-3-prong.ts}/calc-initial-3-prong-center.d.ts

@@ -1,7 +1,7 @@
-import { CpNode } from '../../../cp-node.js';
-import { BezierPiece } from '../../bezier-piece.js';
+import { CpNode } from '../cp-node/cp-node.js';
+import { BezierPiece } from '../mat/bezier-piece.js';
 /**
- * @hidden
+ * @internal
  * Finds an initial 3-prong circle center point from which to iterate. The point
  * must be within the shape.
  * @param δ3s - The three boundary pieces of which we need to find the three