flo-mat 3.0.15 → 4.0.2

package/node/find-2-prong/get-medial/get-closest-points.js

@@ -0,0 +1,167 @@
+import { lengthSquared } from "flo-vector2d";
+import { roots, Horner } from 'flo-poly';
+import { evalDeCasteljau, getMedialPointCoeffs, getMedialPointCoeffsBez0, getMedialPointCoeffsBez2_SameCurve, getMedialPointCoeffsBez3_SameCurve } from 'flo-bezier3';
+const { sqrt, abs, max } = Math;
+/**
+ * @param maxCoordPowerOf2
+ * @param nnorm
+ * @param yPos The point on the shape
+ * @param for1Prong defaults to `false`;
+ * @param angle defaults to `0`;
+ * @param curvePiece The curve piece
+ *
+ * @internal
+ */
+function getClosestPoint(maxCoordPowerOf2, nnorm, yPos, for1Prong, angle, curvePiece) {
+    const { curve, ts: [tS, tE] } = curvePiece;
+    const { ps } = curve;
+    const { curve: touchedCurve, t, p: y } = yPos;
+    const isTouched = curve === touchedCurve;
+    const shouldDeflate = angle === 0 && isTouched;
+    const infos = [];
+    let startPushed = false;
+    let endPushed = false;
+    let ss;
+    if (tS !== tE &&
+        !(shouldDeflate && ps.length === 2) &&
+        !(isTouched && ps.length === 3 && for1Prong)) {
+        const { A, B, H } = shouldDeflate
+            ? ps.length === 3
+                ? getMedialPointCoeffsBez2_SameCurve(t, nnorm, ps)
+                : getMedialPointCoeffsBez3_SameCurve(t, nnorm, ps)
+            : getMedialPointCoeffs(y, nnorm, ps);
+        ss = roots(H, tS, tE) || [];
+        //-----------------------
+        for (let i = 0; i < ss.length; i++) {
+            const ri = ss[i];
+            const { tS: sS, tE: sE, t: _s } = ri;
+            if (ri.multiplicity > 1) {
+                continue;
+            }
+            if (sE < tS || sS > tE) {
+                continue;
+            } // outside curve piece
+            if (sS < 0) {
+                continue;
+            } // outside curve piece
+            // clip to [0,1]
+            const s = sE > 1 ? 1 : _s;
+            //-----------------------
+            const AS = Horner(A, s);
+            const BS = Horner(B, s);
+            // const CS = Horner(C, s);
+            // const DS = Horner(D, s);
+            const _AS = abs(AS);
+            // const _CS = abs(CS);
+            // if (max(_AS, _CS) < 2**-40) { continue; }
+            if (max(_AS) < 2 ** -40) {
+                continue;
+            }
+            // const w = _AS > _CS
+            //     ? -BS / AS
+            //     : -DS / CS;  // alternative
+            const w = -BS / AS;
+            if (w <= 0) {
+                // If `w` is negative the circle radius is negative -> discard
+                continue;
+            }
+            const V = [w * nnorm[0], w * nnorm[1]];
+            const d = sqrt(lengthSquared(V));
+            if (d <= 2 ** (maxCoordPowerOf2 - 40)) {
+                // If `w` <= 2**-40 -> discard
+                continue;
+            }
+            const x = [y[0] + V[0], y[1] + V[1]];
+            //-----------------------
+            if (ri.tS <= tS && ri.tE >= tS) {
+                startPushed = true;
+            }
+            if (ri.tS <= tE && ri.tE >= tE) {
+                endPushed = true;
+            }
+            // If the point is the first control point of the curve then we
+            // ensure the point becomes the last control point of the prior
+            // curve to induce some symmetery and simplify the algorithm.
+            const s_ = s === 0 ? 1 : s;
+            const curve_ = s === 0 ? curve.prev : curve;
+            const info = {
+                curve: curve_,
+                s: s_,
+                d, x
+            };
+            infos.push(info);
+        }
+    }
+    //------------------------------------------
+    const pLast = ps[ps.length - 1];
+    let dontPush1 = ((t === 0 && curve === touchedCurve.prev) ||
+        (t === 1 && curve === touchedCurve));
+    //--------------------------------------
+    // Also check curve start control point
+    //--------------------------------------
+    const PS = [];
+    if (tS === 0) {
+        // We never check points at `t === 0` since they are covered by the previous curve's endpoint
+        // which cannot be culled if this curve`s `t === 0` is included
+    }
+    else if (tS === 1) {
+        if (!dontPush1 && !startPushed) {
+            PS.push({ P: pLast, t: 1 });
+        }
+    }
+    else {
+        if (!startPushed) {
+            const pp = evalDeCasteljau(ps, tS);
+            PS.push({ P: pp, t: tS });
+        }
+    }
+    //--------------------------------------
+    // Also check curve end control point
+    //--------------------------------------
+    if (tS !== tE) {
+        if (tE === 0) {
+            // We never check points at `t === 0` since they are covered by the previous curve's endpoint
+            // which cannot be culled if this curve`s `t === 0` is included
+        }
+        else if (tE === 1) {
+            if (!dontPush1 && !endPushed) {
+                PS.push({ P: pLast, t: 1 });
+                dontPush1 = true;
+            }
+        }
+        else {
+            if (!endPushed) {
+                const pp = evalDeCasteljau(ps, tE);
+                PS.push({ P: pp, t: tE });
+            }
+        }
+    }
+    //------------------------------------------
+    for (let i = 0; i < PS.length; i++) {
+        //-----------------------
+        const { P, t: s } = PS[i];
+        const { a0, b0 } = getMedialPointCoeffsBez0(y, nnorm, P);
+        if (abs(a0) <= 2 ** -40 || abs(b0) <= 2 ** -40) {
+            continue;
+        }
+        const w = -b0 / a0;
+        // too close to point of origin *or* negative;
+        if (w < 2 ** -40) {
+            continue;
+        }
+        const V = [w * nnorm[0], w * nnorm[1]];
+        const d = sqrt(lengthSquared(V));
+        const x = [y[0] + V[0], y[1] + V[1]];
+        const s_ = s === 0 ? 1 : s;
+        const curve_ = s === 0 ? curve.prev : curve;
+        const info = {
+            curve: curve_,
+            s: s_,
+            d, x
+        };
+        infos.push(info);
+    }
+    return infos;
+}
+export { getClosestPoint };
+//# sourceMappingURL=get-closest-points.js.map

package/node/find-2-prong/get-medial/get-closest-points.js.map

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

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

@@ -1,8 +1,8 @@
-import { CurvePiece } from '../mat/curve-piece.js';
+import type { CurvePiece } from '../mat/curve-piece.js';
 /**
- * @internal
- *
  * Reduces the circle radius initially as an optimization step.
+ *
+ * @internal
  */
-declare function reduceRadius(extreme: number, curvePieces: CurvePiece[], p: number[], x: number[]): number;
+declare function reduceRadius(maxCoordPowerOf2: number, curvePieces: CurvePiece[], y: number[], nnorm: number[]): number;
 export { reduceRadius };

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

@@ -1,63 +1,43 @@
-import { evalDeCasteljau } from "flo-bezier3";
-import { dot, lineLineIntersection, squaredDistanceBetween } from "flo-vector2d";
+import { getMedialPointCoeffsBez0 } from "flo-bezier3";
+import { lengthSquared, squaredDistanceBetween } from "flo-vector2d";
+const { abs } = Math;
+const TOLERANCE = 1 + 2 ** -20;
 /**
- * @internal
- *
  * Reduces the circle radius initially as an optimization step.
+ *
+ * @internal
  */
-function reduceRadius(extreme, curvePieces, p, x) {
-    const TOLERANCE = 1 + 2 ** -10;
-    let minRadius = Number.POSITIVE_INFINITY;
+function reduceRadius(maxCoordPowerOf2, curvePieces, y, nnorm) {
+    let minRadius = Infinity;
+    let x = [y[0] + nnorm[0], y[1] + nnorm[1]];
     for (let i = 0; i < curvePieces.length; i++) {
         const curvePiece = curvePieces[i];
-        const ps = curvePiece.curve.ps;
-        // let min = Number.POSITIVE_INFINITY;
-        const num = 2;
-        for (let j = 0; j < (num + 1); j++) {
-            const p_ = evalDeCasteljau(ps, curvePiece.ts[j / num]);
-            const cc = getCircleCenterFrom2PointsAndNormal(extreme, p, x, p_);
-            if (cc) {
-                let r = squaredDistanceBetween(p, cc);
-                if (r < minRadius) {
-                    minRadius = r;
-                }
+        const { ps } = curvePiece.curve;
+        const pS = ps[0];
+        const pE = ps[ps.length - 1];
+        for (const P of [pS, pE]) {
+            if (squaredDistanceBetween(x, P) > minRadius) {
+                continue; // short-circuit
+            }
+            const { a0, b0 } = getMedialPointCoeffsBez0(y, nnorm, P);
+            if (abs(a0) <= 2 ** -40 || abs(b0) <= 2 ** -40) {
+                continue;
+            }
+            const w = -b0 / a0;
+            // too close to point of origin *or* negative;
+            if (w < 2 ** -40) {
+                continue;
+            }
+            const N = [w * nnorm[0], w * nnorm[1]];
+            const r = lengthSquared(N);
+            if (r < minRadius) {
+                minRadius = r;
+                x = [y[0] + N[0], y[1] + N[1]];
             }
         }
     }
     // 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

@@ -1 +1 @@
-{"version":3,"file":"reduce-radius.js","sourceRoot":"","sources":["../../src/find-2-prong/reduce-radius.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reduce-radius.js","sourceRoot":"","sources":["../../src/find-2-prong/reduce-radius.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAGrB,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,CAAC;AAG7B;;;;GAIG;AACH,SAAS,YAAY,CACb,gBAAwB,EACxB,WAAyB,EACzB,CAAW,EACX,KAAe;IAEnB,IAAI,SAAS,GAAG,QAAQ,CAAC;IACzB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3C,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;QAElC,MAAM,EAAE,EAAE,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;QAEhC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE7B,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,EAAC,EAAE,CAAC,EAAE,CAAC;YACtB,IAAI,sBAAsB,CAAC,CAAC,EAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC;gBAC1C,SAAS,CAAE,gBAAgB;YAC/B,CAAC;YAED,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,wBAAwB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAEzD,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAE,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAE,CAAC,EAAE,EAAE,CAAC;gBACzC,SAAS;YACb,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;YAEnB,8CAA8C;YAC9C,IAAI,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAE7B,MAAM,CAAC,GAAG,CAAC,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAE3B,IAAI,CAAC,GAAG,SAAS,EAAE,CAAC;gBAChB,SAAS,GAAG,CAAC,CAAC;gBACd,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;IACL,CAAC;IAED,4DAA4D;IAC5D,OAAO,SAAS,GAAC,SAAS,CAAC;AAC/B,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

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

@@ -1,19 +1,22 @@
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { CurvePiece } from '../mat/curve-piece.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { CurvePiece } from '../mat/curve-piece.js';
 /**
- * @internal
- * Find new x and ps that are a better estimate of the 3-prong circle.
+ * Find new `x` and `ps` that are better estimates of the 3-prong circle.
+ *
  * The potential function, V, is defined as the distance to the actual 3 prong
  * circle center.
+ *
+ * @param maxCoordPowerOf2
  * @param curvePiece3s The three boundary pieces, each of which should contain
  * a point of the 3-prong to be found.
  * @param x The currently best guess at the center of the 3-prong circle.
  * @param vectorToZeroV
- * @param extreme
+ *
+ * @internal
  */
 declare function calcBetterX(curvePiece3s: CurvePiece[][], x: number[], vectorToZeroV: number[]): {
     newX: number[];
     newV: number;
-    newPoss: PointOnShape[];
+    newPoss: PrePointOnShape[];
 };
 export { calcBetterX };

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

@@ -1,15 +1,20 @@
-import { fromTo, circumCenter, len, scale, translate } from 'flo-vector2d';
-import { getClosestPoints } from './get-closest-points.js';
+// import { fromTo, circumCenter, len, scale, translate } from 'flo-vector2d';
+import { fromTo, len, scale, translate } from 'flo-vector2d';
+import { circumCenter } from './timed-cc.js'; // TODO - testing - restore
+import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
 /**
- * @internal
- * Find new x and ps that are a better estimate of the 3-prong circle.
+ * Find new `x` and `ps` that are better estimates of the 3-prong circle.
+ *
  * The potential function, V, is defined as the distance to the actual 3 prong
  * circle center.
+ *
+ * @param maxCoordPowerOf2
  * @param curvePiece3s The three boundary pieces, each of which should contain
  * a point of the 3-prong to be found.
  * @param x The currently best guess at the center of the 3-prong circle.
  * @param vectorToZeroV
- * @param extreme
+ *
+ * @internal
  */
 function calcBetterX(curvePiece3s, x, vectorToZeroV) {
     const V = len(vectorToZeroV);
@@ -22,7 +27,7 @@ function calcBetterX(curvePiece3s, x, vectorToZeroV) {
     do {
         const shift = scale(vectorToZeroV, nu);
         newX = translate(shift, x);
-        newPoss = getClosestPoints(newX, curvePiece3s);
+        newPoss = curvePiece3s.map(curvePieces => getCloseBoundaryPointsCertified(curvePieces, x)[0]);
         // Point of zero V
         const newCircleCenter = circumCenter(newPoss.map(pos => pos.p));
         const newVectorToZeroV = fromTo(newX, newCircleCenter);

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

@@ -0,0 +1 @@
+{"version":3,"file":"calc-better-x.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-better-x.ts"],"names":[],"mappings":"AAEA,8EAA8E;AAC9E,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC,CAAE,2BAA2B;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;;;;;;;;GAaG;AACH,SAAS,WAAW,CACZ,YAA4B,EAC5B,CAAW,EACX,aAAuB;IAM3B,MAAM,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IAE7B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,IAAI,MAAM,CAAC;IACX,IAAI,IAAI,CAAC;IACT,IAAI,OAA0B,CAAC;IAC/B,IAAI,IAAI,CAAC;IACT,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,YAAY;IACxB,GAAG,CAAC;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAE3B,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CACrC,+BAA+B,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CACrD,CAAC;QAEF,kBAAkB;QAClB,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,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;IACR,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;IAE3B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AAClC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/find-3-prong/calc-initial-3-prong-center.d.ts

@@ -0,0 +1,15 @@
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { CurvePiece } from '../mat/curve-piece.js';
+/**
+ * Finds an initial 3-prong circle center point from which to iterate. The point
+ * must be within the shape.
+ *
+ * @param maxCoordPowerOf2
+ * @param δ3s the three boundary pieces of which we need to find the three
+ * 3-prong points.
+ * @param curvePiece3s
+ *
+ * @internal
+ */
+declare function calcInitial3ProngCenter(δ3s: CpNode[][], curvePiece3s: CurvePiece[][]): number[];
+export { calcInitial3ProngCenter };

package/node/find-3-prong/calc-initial-3-prong-center.js

@@ -0,0 +1,27 @@
+// import { circumCenter } from 'flo-vector2d';
+import { circumCenter } from './timed-cc.js'; // TODO - testing - restore
+import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
+/**
+ * Finds an initial 3-prong circle center point from which to iterate. The point
+ * must be within the shape.
+ *
+ * @param maxCoordPowerOf2
+ * @param δ3s the three boundary pieces of which we need to find the three
+ * 3-prong points.
+ * @param curvePiece3s
+ *
+ * @internal
+ */
+function calcInitial3ProngCenter(δ3s, curvePiece3s) {
+    const circle = δ3s[0][0].pointOnShape.circle;
+    const twoProngCircleCenter = circle.center;
+    const pos = getCloseBoundaryPointsCertified(curvePiece3s[1], twoProngCircleCenter)[0];
+    const meanPoints = [
+        δ3s[0][0].pointOnShape.p,
+        pos.p,
+        δ3s[2][1].pointOnShape.p,
+    ];
+    return circumCenter(meanPoints);
+}
+export { calcInitial3ProngCenter };
+//# sourceMappingURL=calc-initial-3-prong-center.js.map

package/node/find-3-prong/calc-initial-3-prong-center.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calc-initial-3-prong-center.js","sourceRoot":"","sources":["../../src/find-3-prong/calc-initial-3-prong-center.ts"],"names":[],"mappings":"AAEA,+CAA+C;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC,CAAE,2BAA2B;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;;;;;GAUG;AACH,SAAS,uBAAuB,CACxB,GAAe,EACf,YAA4B;IAEhC,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;IAC7C,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAE3C,MAAM,GAAG,GAAG,+BAA+B,CACvC,YAAY,CAAC,CAAC,CAAC,EACf,oBAAoB,CACvB,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG;QACf,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACxB,GAAG,CAAC,CAAC;QACL,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;KAC3B,CAAC;IAEF,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;AACpC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}

package/node/find-3-prong/find-3-prong-for-delta3s.d.ts

@@ -0,0 +1,19 @@
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { CurvePiece } from '../mat/curve-piece.js';
+import type { ThreeProngInfo } from './three-prong-info.js';
+/**
+ * Finds a 3-prong using only the 3 given δs.
+ *
+ * @param δs the boundary pieces
+ * @param idx δ identifier
+ * @param k δs identifier
+ * @param curvePiecess
+ * @param maxCoordPowerOf2
+ *
+ * @internal
+ */
+declare function find3ProngForDelta3s(δs: CpNode[][], idx: number, k: number, curvePiecess: CurvePiece[][], maxCoordPowerOf2: number): {
+    error: number;
+    threeProngInfo: ThreeProngInfo;
+} | undefined;
+export { find3ProngForDelta3s };

package/node/{find-3-prong.ts → find-3-prong}/find-3-prong-for-delta3s.js

@@ -1,27 +1,29 @@
-import { fromTo, circumCenter, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
+// import { fromTo, circumCenter as getCircumCenter, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
+import { fromTo, len, distanceBetween, toUnitVector, rotate90Degrees, cross } from 'flo-vector2d';
+import { circumCenter as getCircumCenter } from './timed-cc.js'; // TODO - testing - restore
 import { tangent } from 'flo-bezier3';
-import { CpNodeFs } from '../cp-node/cp-node-fs.js';
 import { calcInitial3ProngCenter } from './calc-initial-3-prong-center.js';
 import { getClosestPoints } from './get-closest-points.js';
 import { calcBetterX } from './calc-better-x.js';
 import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
 import { getCorner } from '../corner/get-corner.js';
 import { isPosCorner } from '../point-on-shape/is-pos-corner.js';
-import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
-const { isSharp } = CpNodeFs;
-/** @internal */
-const calcVectorToZeroV_StraightToIt = fromTo;
+import { getPosCorner$ } from '../point-on-shape/get-pos-corner.js';
+import { isSharp } from '../cp-node/fs/is-sharp.js';
+const { min, abs, asin } = Math;
 /**
- * @internal
  * Finds a 3-prong using only the 3 given δs.
- * @param δs The boundary pieces
+ *
+ * @param δs the boundary pieces
  * @param idx δ identifier
+ * @param k δs identifier
  * @param curvePiecess
- * @param maxCoordinate The maximum coordinate value used to calculate floating point
- * tolerances.
+ * @param maxCoordPowerOf2
+ *
+ * @internal
  */
-function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
-    const TOLERANCE = 2 ** -32 * maxCoordinate;
+function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordPowerOf2) {
+    const TOLERANCE = 2 ** (maxCoordPowerOf2 - 32);
     const MAX_ITERATIONS = 10;
     const δs_ = [
         δs[0],
@@ -48,25 +50,39 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
     if (isSharp(δ3s[0][0])) {
         return undefined;
     }
+    // TODO
+    //----------------------------
+    // const l1 = curvePiece3s[0].length;
+    // const l2 = curvePiece3s[1].length;
+    // const l3 = curvePiece3s[2].length;
+    // if (l1 === 1 && l2 == 1 && l3 === 1) {
+    //     // console.log('aaa');
+    //     const A = curvePiece3s[0][0].curve.ps;
+    //     const B = curvePiece3s[1][0].curve.ps;
+    //     const C = curvePiece3s[2][0].curve.ps;
+    //     console.log(A.length, B.length, C.length);
+    // } else {
+    //     // console.log('bbb');
+    // }
+    //----------------------------
     let poss = undefined;
-    let circumCenter_;
     let j = 0; // Safeguard for slow convergence
-    let x = calcInitial3ProngCenter(maxCoordinate, δ3s, curvePiece3s);
-    let tolerance = Number.POSITIVE_INFINITY;
+    let x = calcInitial3ProngCenter(δ3s, curvePiece3s);
+    let tolerance = Infinity;
     while (tolerance > TOLERANCE && j < MAX_ITERATIONS) {
         j++;
         poss = getClosestPoints(x, curvePiece3s);
         if (!Number.isFinite(x[0]) || !Number.isFinite(x[1])) {
-            // TODO - the code can be cleaned up and sped up a lot if we don't
+            // FUTURE - the code can be cleaned up and sped up a lot if we don't
             // use this function as is but instead use δs[0] and δs[2] as is
             // and make δs[1] include all the rest of the beziers around the 
             // loop. This check, for instance, would be eliminated completely.
             return undefined;
         }
-        circumCenter_ = circumCenter(poss.map(x => x.p));
-        const vectorToZeroV = calcVectorToZeroV_StraightToIt(x, circumCenter_);
+        const circumCenter = getCircumCenter(poss.map(x => x.p));
+        const vectorToZeroV = fromTo(x, circumCenter);
         if (!Number.isFinite(vectorToZeroV[0]) || !Number.isFinite(vectorToZeroV[1])) {
-            // TODO - the code can be cleaned up and sped up a lot if we don't
+            // FUTURE - the code can be cleaned up and sped up a lot if we don't
             // use this function as is but instead use δs[0] and δs[2] as is
             // and make δs[1] include all the rest of the beziers around the 
             // loop. This check, for instance, would be eliminated completely.
@@ -76,7 +92,7 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
         x = upds.newX;
         poss = upds.newPoss;
         const V = len(vectorToZeroV); // The 'potential'
-        tolerance = Math.abs(V - upds.newV);
+        tolerance = abs(V - upds.newV);
     }
     const radius = (distanceBetween(x, poss[0].p) +
         distanceBetween(x, poss[1].p) +
@@ -85,7 +101,7 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
     //-------------------------------------------------------------------------
     // Calculate the unit tangent vector at 3-prong circle points - they should 
     // be very close to tangent to the boundary piece tangents at those points 
-    // (up to sign). Sharp corners are a common special case.
+    // (up to sign). Dull corners is a common special case.
     //-------------------------------------------------------------------------
     let totalAngleError = 0;
     for (let i = 0; i < 3; i++) {
@@ -98,12 +114,12 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
         //-----------------------------------
         // Check if point is on dull crorner
         //-----------------------------------
-        if (isPosCorner(pos) && getPosCorner(pos).isDull) {
+        if (isPosCorner(pos) && getPosCorner$(pos).isDull) {
             const corner = getCorner(pos.curve.ps, pos.curve.next.ps);
             const tans = corner.tangents;
             const perps = tans.map(rotate90Degrees);
-            const angleError1 = Math.asin(cross(perps[0], v));
-            const angleError2 = Math.asin(cross(v, perps[1]));
+            const angleError1 = asin(cross(perps[0], v));
+            const angleError2 = asin(cross(v, perps[1]));
             let angleError = 0;
             if (angleError1 > 0) {
                 angleError += angleError1;
@@ -119,11 +135,11 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
             //---------------------------
             const v2 = toUnitVector(tangent(pos.curve.ps, pos.t));
             // Cross is more numerically stable than Vector.dot at angles a
-            // multiple of Math.PI **and** is close to the actual angle value
+            // multiple of `Math.PI` **and** is close to the actual angle value
             // and can thus just be added to cone method of looking at 
             // tolerance.
             // Should be close to zero and is close to the actual angle.
-            const cross_ = Math.abs(Math.asin(cross(v1, v2)));
+            const cross_ = abs(asin(cross(v1, v2)));
             totalAngleError += cross_;
         }
     }
@@ -134,17 +150,16 @@ function find3ProngForDelta3s(δs, idx, k, curvePiecess, maxCoordinate) {
     //-------------------------------------------------------------------------
     const closestDs = [];
     for (let i = 0; i < curvePiecess.length; i++) {
-        const p = getCloseBoundaryPointsCertified(5, // TODO - see find-2-prong
-        curvePiecess[i], x)[0];
-        closestDs.push(distanceBetween(p.p, x));
+        const pos = getCloseBoundaryPointsCertified(curvePiecess[i], x)[0];
+        closestDs.push(distanceBetween(pos.p, x));
     }
-    const closestD = Math.min(...closestDs);
-    const radiusDelta = Math.abs(radius - closestD);
+    const closestD = min(...closestDs);
+    const radiusDelta = abs(radius - closestD);
     // Weights below still need to be optimized.
     const W1 = 1;
     const W2 = 1;
     const error = W1 * radiusDelta + W2 * totalAngleError;
-    return { poss: poss, circle, error, δ3s };
+    return { threeProngInfo: { poss, circle, δ3s }, error };
 }
 export { find3ProngForDelta3s };
 //# sourceMappingURL=find-3-prong-for-delta3s.js.map

package/node/find-3-prong/find-3-prong-for-delta3s.js.map

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

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

@@ -0,0 +1,13 @@
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { ThreeProngInfo } from './three-prong-info.js';
+/**
+ * Find and return a 3-prong from the given boundary piece.
+ *
+ * @param δs A boundary piece
+ * @param maxCoordPowerOf2 The maximum coordinate power of 2 value used to
+ * calculate floating point tolerances.
+ *
+ * @internal
+ */
+declare function find3Prong(δs: CpNode[][], maxCoordPowerOf2: number): ThreeProngInfo;
+export { find3Prong };