flo-mat 3.0.15 → 4.0.2

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

@@ -1,10 +1,10 @@
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { MatMeta } from '../mat/mat-meta.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { MatMeta } from '../mat/mat-meta.js';
 /**
  * @hidden
  * Add a 1-prong to the MAT.
  * @param cpTrees
  * @param pos
  */
-declare function add1Prong(meta: MatMeta, radius: number, center: number[], pos: PointOnShape): void;
+declare function add1Prong(meta: MatMeta, radius: number, center: number[], pos: PrePointOnShape): void;
 export { add1Prong };

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

@@ -2,7 +2,7 @@ import { addToCpTree } from '../mat/add-to-cp-tree.js';
 import { getCloseByCpIfExist } from '../mat/get-closeby-cp-if-exist.js';
 import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
 import { isPosCorner } from '../point-on-shape/is-pos-corner.js';
-import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
+import { getPosCorner$ } from '../point-on-shape/get-pos-corner.js';
 /**
  * @hidden
  * Add a 1-prong to the MAT.
@@ -10,9 +10,9 @@ import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
  * @param pos
  */
 function add1Prong(meta, radius, center, pos) {
-    if (isPosCorner(pos) && getPosCorner(pos).isDull) {
+    if (isPosCorner(pos) && getPosCorner$(pos).isDull) {
         // This is a 1-prong at a dull corner.
-        // TODO IMPORTANT 
+        // FUTURE
         // Remove this line, uncomment piece below it and implement the 
         // following strategy to find the 3-prongs: if deltas are conjoined due 
         // to dull corner, split the conjoinment by inserting successively 
@@ -27,7 +27,7 @@ function add1Prong(meta, radius, center, pos) {
         return;
     }
     const circle = { radius, center };
-    const order = calcPosOrder(circle, pos);
+    const order = calcPosOrder(circle.center, pos);
     // Make sure there isn't already a ContactPoint close by - it can cause
     // floating point stability issues.
     if (getCloseByCpIfExist(meta, pos, circle, order, 0, 1)) {

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

@@ -1 +1 @@
-{"version":3,"file":"add-1-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-1-prong.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE;;;;;GAKG;AACH,SAAS,SAAS,CACV,IAAa,EACb,MAAc,EACd,MAAgB,EAChB,GAAiB;IAErB,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QAC/C,sCAAsC;QAEtC,kBAAkB;QAClB,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QACrE,kEAAkE;QAClE,oEAAoE;QAEpE,kCAAkC;QAElC,yCAAyC;QACrC,0DAA0D;QAC9D,IAAI;QAEJ,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAE1C,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxC,uEAAuE;IACvE,mCAAmC;IACnC,IAAI,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO;IACX,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAEjG,yCAAyC;IACzC,sDAAsD;IACtD,IAAI;AACR,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"add-1-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-1-prong.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAGpE;;;;;GAKG;AACH,SAAS,SAAS,CACV,IAAa,EACb,MAAc,EACd,MAAgB,EAChB,GAAoB;IAExB,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QAChD,sCAAsC;QAEtC,SAAS;QACT,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QACrE,kEAAkE;QAClE,oEAAoE;QAEpE,kCAAkC;QAElC,yCAAyC;QACrC,0DAA0D;QAC9D,IAAI;QAEJ,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAE1C,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/C,uEAAuE;IACvE,mCAAmC;IACnC,IAAI,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO;IACX,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAEjG,yCAAyC;IACzC,sDAAsD;IACtD,IAAI;AACR,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

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

@@ -1,18 +1,17 @@
-import { CpNode } from '../cp-node/cp-node.js';
-import { Circle } from '../geometry/circle.js';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { MatMeta } from '../mat/mat-meta.js';
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { Circle } from '../geometry/circle.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { MatMeta } from '../mat/mat-meta.js';
 /**
- * @internal
  * Adds a 2-prong contact circle to the shape.
  *
- * @param cpTrees
+ * @param meta
  * @param circle Circle containing the 2 contact points
- * @param posSource The source point on shape
- * @param posAntipode The found antipodal point on shape
+ * @param pposSource The source point on shape
+ * @param pposAntipode The found antipodal point on shape
  * @param isHoleClosing True if this is a hole-closing 2-prong, false otherwise
- * @param maxCoordinate The maximum coordinate value used to calculate floating point
- * tolerances.
+ *
+ * @internal
  */
-declare function add2Prong(meta: MatMeta, circle: Circle, poss: PointOnShape[], isHoleClosing: boolean): CpNode | undefined;
+declare function add2Prong(meta: MatMeta, circle: Circle, pposSource: PrePointOnShape, pposAntipode: PrePointOnShape, isHoleClosing: boolean): CpNode | undefined;
 export { add2Prong };

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

@@ -1,34 +1,40 @@
 import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
-import { createPos } from '../point-on-shape/create-pos.js';
 import { getCloseByCpIfExist } from '../mat/get-closeby-cp-if-exist.js';
 import { insertCpNode } from '../cp-node/fs/insert-cp-node.js';
 import { addToCpTree } from '../mat/add-to-cp-tree.js';
 import { removeCpNode } from '../cp-node/fs/remove-cp-node.js';
 /**
- * @internal
  * Adds a 2-prong contact circle to the shape.
  *
- * @param cpTrees
+ * @param meta
  * @param circle Circle containing the 2 contact points
- * @param posSource The source point on shape
- * @param posAntipode The found antipodal point on shape
+ * @param pposSource The source point on shape
+ * @param pposAntipode The found antipodal point on shape
  * @param isHoleClosing True if this is a hole-closing 2-prong, false otherwise
- * @param maxCoordinate The maximum coordinate value used to calculate floating point
- * tolerances.
+ *
+ * @internal
  */
-function add2Prong(meta, circle, poss, isHoleClosing) {
-    poss[0] = poss[0].t === 0
-        ? createPos(poss[0].curve.prev, 1, true)
-        : poss[0];
-    const orders = poss.map(pos => calcPosOrder(circle, pos));
+function add2Prong(meta, circle, pposSource, pposAntipode, isHoleClosing) {
+    pposSource = pposSource.t === 0
+        ? { ...pposSource, curve: pposSource.curve.prev, t: 1 }
+        : pposSource;
+    const orderSource = calcPosOrder(circle.center, pposSource);
+    const orderAntipode = calcPosOrder(circle.center, pposAntipode);
+    const posAntipode = {
+        ...pposAntipode, circle, order: orderAntipode, order2: 0
+    };
+    const posSource = {
+        ...pposSource, circle, order: orderSource, order2: 0
+    };
     // Make sure there isn't already a ContactPoint close by - it can cause
     // floating point stability issues.
-    for (let i = 0; i < poss.length; i++) {
-        if (!!getCloseByCpIfExist(meta, poss[i], circle, orders[i], 0, 2)) {
-            return undefined;
-        }
+    if (!!getCloseByCpIfExist(meta, pposSource, circle, orderSource, 0, 2)) {
+        return undefined;
+    }
+    if (!!getCloseByCpIfExist(meta, pposAntipode, circle, orderAntipode, 0, 2)) {
+        return undefined;
     }
-    const { anyFailed, cpNodes } = addToCpTree(isHoleClosing, isHoleClosing, circle, orders, meta, poss);
+    const { anyFailed, cpNodes } = addToCpTree(isHoleClosing, isHoleClosing, circle, [orderSource, orderAntipode], meta, [posSource, posAntipode]);
     if (anyFailed) {
         cpNodes.forEach(cpNode => {
             if (cpNode !== undefined) {
@@ -37,8 +43,6 @@ function add2Prong(meta, circle, poss, isHoleClosing) {
         });
         return undefined;
     }
-    // Get points ordered according to their angle with the x-axis
-    // joinSpokes(circle, cpNodes);
     if (isHoleClosing) {
         closeHole(meta, cpNodes);
     }
@@ -46,25 +50,26 @@ function add2Prong(meta, circle, poss, isHoleClosing) {
 }
 function closeHole(meta, cpNodes) {
     const { cpTrees } = meta;
-    const [cpNodeA, cpNodeB] = cpNodes;
-    // Duplicate ContactPoints
-    // const antipodeCpNode = cpNodeB[0];
-    const cpAntipode = cpNodeB.cp;
-    const cpNodeB2 = insertCpNode(true, true, false, cpTrees.get(cpAntipode.pointOnShape.curve.loop), { ...cpAntipode, order2: +1 }, cpNodeB, meta.lastInsertId);
-    cpNodeB2.holeCloserTwin = cpNodeB;
-    cpNodeB.holeCloserTwin = cpNodeB2;
-    const cpNodeB1 = insertCpNode(true, true, false, cpTrees.get(cpNodeA.cp.pointOnShape.curve.loop), { ...cpNodeA.cp, order2: -1 }, cpNodeA.prev, meta.lastInsertId);
-    cpNodeB1.holeCloserTwin = cpNodeA;
-    cpNodeA.holeCloserTwin = cpNodeB1;
+    const [cpNodeSource, cpNodeAntipode] = cpNodes;
+    // Antipode - create and insert twin
+    const posAntipode = cpNodeAntipode.pointOnShape;
+    const cpNodeAntipodeTwin = insertCpNode(true, true, false, cpTrees.get(posAntipode.curve.loop), { ...posAntipode, order2: +1 }, cpNodeAntipode, meta.lastInsertId);
+    cpNodeAntipodeTwin.holeCloserTwin = cpNodeAntipode;
+    cpNodeAntipode.holeCloserTwin = cpNodeAntipodeTwin;
+    // Source - create and insert twin
+    const posSource = cpNodeSource.pointOnShape;
+    const cpNodeSourceTwin = insertCpNode(true, true, false, cpTrees.get(posSource.curve.loop), { ...cpNodeSource.pointOnShape, order2: -1 }, cpNodeSource.prev, meta.lastInsertId);
+    cpNodeSourceTwin.holeCloserTwin = cpNodeSource;
+    cpNodeSource.holeCloserTwin = cpNodeSourceTwin;
     // Connect graph
-    cpNodeB1.prevOnCircle = cpNodeB2;
-    cpNodeB1.nextOnCircle = cpNodeB2;
-    cpNodeB2.prevOnCircle = cpNodeB1;
-    cpNodeB2.nextOnCircle = cpNodeB1;
-    cpNodeB.next = cpNodeA;
-    cpNodeA.prev = cpNodeB;
-    cpNodeB1.next = cpNodeB2;
-    cpNodeB2.prev = cpNodeB1;
+    cpNodeSourceTwin.prevOnCircle = cpNodeAntipodeTwin;
+    cpNodeSourceTwin.nextOnCircle = cpNodeAntipodeTwin;
+    cpNodeAntipodeTwin.prevOnCircle = cpNodeSourceTwin;
+    cpNodeAntipodeTwin.nextOnCircle = cpNodeSourceTwin;
+    cpNodeAntipode.next = cpNodeSource;
+    cpNodeSource.prev = cpNodeAntipode;
+    cpNodeSourceTwin.next = cpNodeAntipodeTwin;
+    cpNodeAntipodeTwin.prev = cpNodeSourceTwin;
 }
 export { add2Prong };
 //# sourceMappingURL=add-2-prong.js.map

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

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

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

@@ -1,12 +1,9 @@
-import { ddAddDd, ddMultDd, twoSum, twoProduct, ddDiffDd, ddDivDd, twoDiff, ddMultDouble1 } from 'double-double';
-const ts = twoSum;
+import { ddAddDd, twoProduct, ddDiffDd, ddDivDd, twoDiff, ddMultDouble1 } from 'double-double';
 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;
+const { acos } = Math;
 /**
  * Calculates and returns an appropriate seperation tolerance between `CpNode`s.
  *
@@ -17,7 +14,7 @@ const { asin, acos, cos, sqrt, PI: π } = Math;
 function calcSeperationTolerance(R, r, δ) {
     const a = r + δ;
     if (a >= R) {
-        return Number.POSITIVE_INFINITY;
+        return Infinity;
     }
     const R_r_ = twoDiff(R, r);
     const A_ = qmd(r, R_r_);
@@ -51,7 +48,7 @@ export { calcSeperationTolerance };
 //         δ: number) {
 //     const a = r + δ;
 //     if (a >= R) {
-//         return Number.POSITIVE_INFINITY;
+//         return Infinity;
 //     }
 //     const b = R - r;
 //     const c = R;    

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

@@ -1 +1 @@
-{"version":3,"file":"calc-seperation-tolerance.js","sourceRoot":"","sources":["../../src/find-2-prong/calc-seperation-tolerance.ts"],"names":[],"mappings":"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"}
+{"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,11 +1,13 @@
-import { CurvePiece } from '../mat/curve-piece.js';
+import type { CurvePiece } from '../mat/curve-piece.js';
 /**
- * @internal
- * Cull all curvePieces not within given radius of a given point.
+ * Cull all `curvePieces` not within the given radius of a given point.
+ *
  * @param extreme
  * @param curvePieces
- * @param p
- * @param rSquared
+ * @param xO
+ * @param xy2
+ *
+ * @internal
  */
-declare function cullCurvePieces2(curvePieces: CurvePiece[], p: number[], rSquared: number): CurvePiece[];
-export { cullCurvePieces2 };
+declare function cullCurvePieces(curvePieces: CurvePiece[], xO: number[], xy2: number): CurvePiece[];
+export { cullCurvePieces };

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

@@ -1,28 +1,43 @@
 import { getClosestSquareDistanceToRect } from '../geometry/get-closest-square-distance-to-rect.js';
 import { getBoundingBox$ } from '../geometry/get-bounding-box-.js';
+import { memoize } from 'flo-memoize';
+import { getBoundingBoxTight } from 'flo-bezier3';
+import { getClosestSquaredDistanceToRotatedRect } from '../geometry/get-closest-squared-distance-to-rotated-rect.js';
+const TOLERANCE = 1 + 2 ** -20;
+const getBoundingBoxTight$ = memoize(getBoundingBoxTight);
 /**
- * @internal
- * Cull all curvePieces not within given radius of a given point.
+ * Cull all `curvePieces` not within the given radius of a given point.
+ *
  * @param extreme
  * @param curvePieces
- * @param p
- * @param rSquared
+ * @param xO
+ * @param xy2
+ *
+ * @internal
  */
-function cullCurvePieces2(curvePieces, p, rSquared) {
-    const TOLERANCE = 1 + 2 ** -10;
-    if (curvePieces.length <= 1) {
+function cullCurvePieces(curvePieces, xO, xy2) {
+    if (curvePieces.length <= 2) {
+        // Curve pieces can never be less than 2 at this stage since a curve
+        // endpoint will be shared between 2 curves
         return curvePieces;
     }
-    const newPieces = [];
-    for (const curvePiece of curvePieces) {
-        const ps = curvePiece.curve.ps;
+    let lastIdx = 0;
+    for (let i = 0; i < curvePieces.length; i++) {
+        const curvePiece = curvePieces[i];
+        const { ps } = curvePiece.curve;
         const rect = getBoundingBox$(ps);
-        const bd = getClosestSquareDistanceToRect(rect, p);
-        if (bd <= TOLERANCE * rSquared) {
-            newPieces.push(curvePiece);
+        const d = getClosestSquareDistanceToRect(rect, xO);
+        if (d <= TOLERANCE * xy2) {
+            const tightBoundingBox = getBoundingBoxTight$(ps);
+            const d2 = getClosestSquaredDistanceToRotatedRect(tightBoundingBox, xO);
+            if (d2 <= TOLERANCE * xy2) {
+                curvePieces[lastIdx] = curvePiece;
+                lastIdx++;
+            }
         }
     }
-    return newPieces;
+    curvePieces.length = lastIdx;
+    return curvePieces;
 }
-export { cullCurvePieces2 };
+export { cullCurvePieces };
 //# sourceMappingURL=cull-bezier-pieces.js.map

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,gBAAgB,CACjB,WAAyB,EACzB,CAAW,EACX,QAAgB;IAEpB,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,CAAC;IAE7B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAC1B,OAAO,WAAW,CAAC;IACvB,CAAC;IAGD,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAE/B,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,UAAU,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"cull-bezier-pieces.js","sourceRoot":"","sources":["../../src/find-2-prong/cull-bezier-pieces.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oDAAoD,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,sCAAsC,EAAE,MAAM,6DAA6D,CAAC;AAGrH,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,IAAE,CAAC,EAAE,CAAC;AAC7B,MAAM,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAG1D;;;;;;;;;GASG;AACH,SAAS,eAAe,CAChB,WAAyB,EACzB,EAAY,EACZ,GAAW;IAEf,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAC1B,oEAAoE;QACpE,2CAA2C;QAC3C,OAAO,WAA2B,CAAC;IACvC,CAAC;IAED,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,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,EAAE,EAAE,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;QAEhC,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,8BAA8B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,SAAS,GAAC,GAAG,EAAE,CAAC;YACrB,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC;YAClD,MAAM,EAAE,GAAG,sCAAsC,CAC7C,gBAAgB,EAChB,EAAE,CACL,CAAC;YAEF,IAAI,EAAE,IAAI,SAAS,GAAC,GAAG,EAAE,CAAC;gBACtB,WAAW,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC;gBAClC,OAAO,EAAE,CAAC;YACd,CAAC;QACL,CAAC;IACL,CAAC;IAED,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC;IAE7B,OAAO,WAAW,CAAC;AACvB,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}

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

@@ -1,8 +1,7 @@
-import { Circle } from '../geometry/circle.js';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { MatMeta } from '../mat/mat-meta.js';
+import type { Circle } from '../geometry/circle.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { MatMeta } from '../mat/mat-meta.js';
 /**
- * @internal
  * Adds a 2-prong to the MAT. The first point on the shape boundary is given and
  * the second one is found by the algorithm.
  *
@@ -17,16 +16,16 @@ import { MatMeta } from '../mat/mat-meta.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 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 loopIdx The loop array index
+ * @param meta
+ * @param isHoleClosing `true` if this is a hole-closing two-prong, `false` otherwise
+ * @param for1Prong
+ * @param angle
+ * @param yPos the source point of the 2-prong to be found
+ *
+ * @internal
  */
-declare function find2Prong(meta: MatMeta, isHoleClosing: boolean, for1Prong: boolean, angle: number, y: PointOnShape): {
+declare function find2Prong(meta: MatMeta): (isHoleClosing: boolean, for1Prong: boolean, angle: number, yPos: PrePointOnShape) => {
     circle: Circle;
-    zs: PointOnShape[];
+    z: PrePointOnShape;
 } | undefined;
 export { find2Prong };

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

@@ -1,17 +1,16 @@
-import { distanceBetween, fromTo, interpolate, rotate, translate } from 'flo-vector2d';
-import { getOsculatingCircle } from '../point-on-shape/get-osculating-circle.js';
-import { findEquidistantPointOnLineDd } from './find-equidistant-point-on-line-dd.js';
 import { getInitialCurvePieces } from './get-initial-bezier-pieces.js';
-import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
+import { getAntipodalPoints } from './get-medial/get-antipodal-points.js';
 import { reduceRadius } from './reduce-radius.js';
 import { squaredDistanceBetweenDd } from './squared-distance-between-dd.js';
-import { cullCurvePieces2 } from './cull-bezier-pieces.js';
+import { cullCurvePieces } from './cull-bezier-pieces.js';
 import { add1Prong } from './add-1-prong.js';
-import { createPos } from '../point-on-shape/create-pos.js';
+import { toP } from '../point-on-shape/to-p.js';
 import { calcSeperationTolerance } from './calc-seperation-tolerance.js';
-const { ceil, log2, max, sqrt, abs, sin, cos } = Math;
+import { getInitialX } from './get-initial-x.js';
+import { ddNormal } from 'flo-bezier3';
+import { rotate } from 'flo-vector2d';
+const { sin, cos, max, sqrt } = Math;
 /**
- * @internal
  * Adds a 2-prong to the MAT. The first point on the shape boundary is given and
  * the second one is found by the algorithm.
  *
@@ -26,131 +25,89 @@ const { ceil, log2, max, 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 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 loopIdx The loop array index
+ * @param meta
+ * @param isHoleClosing `true` if this is a hole-closing two-prong, `false` otherwise
+ * @param for1Prong
+ * @param angle
+ * @param yPos the source point of the 2-prong to be found
+ *
+ * @internal
  */
-function find2Prong(meta, isHoleClosing, for1Prong, angle, y) {
-    const { loops, maxCoordinate, squaredDiagonalLength } = meta;
-    const loop = y.curve.loop;
-    const MAX_ITERATIONS = 25;
-    const minSquaredSeperationTolerance = ((2 ** -21) * maxCoordinate) ** 2;
-    const errorTolerance = (2 ** -46) * maxCoordinate;
-    // const errorTolerance = (2**-28)*maxCoordinate;
+function find2Prong(meta) {
+    const { loops, maxCoordPowerOf2, squaredDiagonalLength } = meta;
+    //----------------------------
+    // Initialize some tolerances
+    //----------------------------
+    const minSquaredSeperationTolerance = (2 ** (maxCoordPowerOf2 - 21)) ** 2;
+    const errorTolerance = 2 ** (maxCoordPowerOf2 - 46);
     const maxOsculatingCircleRadius = sqrt(squaredDiagonalLength);
-    const minCurvature = 1 / maxOsculatingCircleRadius;
-    const oneProngTolerance = (2 ** -16) * maxCoordinate;
-    const [xO, rO] = getO(angle, isHoleClosing, maxOsculatingCircleRadius, minCurvature, y);
-    const p = y.p;
-    // The boundary piece that should contain the other point of 
-    // the 2-prong circle. (Defined by start and end points).
-    let curvePieces = getInitialCurvePieces(angle, isHoleClosing, loop, loops, meta, y, { center: xO, radius: rO });
-    // console.log(curvePieces.length);
-    /** The center of the two-prong (successively refined) */
-    let x = xO;
-    // The lines below is an optimization.
-    const r_ = sqrt(reduceRadius(maxCoordinate, curvePieces, p, xO));
-    if (rO > r_) {
-        x = interpolate(p, xO, r_ / rO);
-    }
-    /** The antipode of the two-prong (successively refined) */
-    let zs = undefined;
-    let z = undefined;
-    let i = 0;
-    while (i < MAX_ITERATIONS) {
-        const xy = squaredDistanceBetweenDd(x, y.p);
-        if (i < 2) {
-            curvePieces = cullCurvePieces2(curvePieces, x, xy);
-        }
-        const pow = max(0, ceil(log2(maxCoordinate / xy))) + 1; // determines accuracy
-        // console.log(pow);
-        const _zs = getCloseBoundaryPointsCertified(pow, curvePieces, 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;
+    const oneProngTolerance = 2 ** (maxCoordPowerOf2 - 32);
+    return function find2ProngInner(isHoleClosing, for1Prong, angle, yPos) {
+        const { curve: { loop, ps }, t, p: y } = yPos;
+        const normDd = ddNormal(ps, t);
+        const _nnorm = [-normDd[0][1], -normDd[1][1]]; // Left-handed system (sorry)
+        const nnorm = isHoleClosing
+            ? [0, -maxOsculatingCircleRadius]
+            : (angle !== 0 ? rotate(sin(angle), cos(angle))(_nnorm) : _nnorm);
+        // Get initial kissing circle guess
+        let [xO, rO] = getInitialX(angle, isHoleClosing, maxOsculatingCircleRadius, yPos, nnorm);
+        // The boundary piece that should contain the other point of 
+        // the 2-prong circle. (Defined by start and end points).
+        const curvePieces = getInitialCurvePieces(angle, isHoleClosing, loop, loops, meta, yPos, xO);
+        // The lines below is an optimization.
+        const xy2 = reduceRadius(maxCoordPowerOf2, curvePieces, y, nnorm);
+        const xy = sqrt(xy2);
+        const l = sqrt(nnorm[0] ** 2 + nnorm[1] ** 2);
+        xO = [y[0] + nnorm[0] / l * xy, y[1] + nnorm[1] / l * xy];
+        cullCurvePieces(curvePieces, xO, xy2);
+        const antipodalPoints = getAntipodalPoints(maxCoordPowerOf2, nnorm, yPos, for1Prong, angle, curvePieces);
+        if (antipodalPoints.length !== 1) {
+            if (antipodalPoints.length === 0) {
+                return undefined;
             }
-            if (_yz !== 0) {
-                zs.push(z);
+            if (!areAllAntipodesSame(antipodalPoints)) {
+                // At this point there is multiple antipodal points (zs) for the given
+                // source point so do not add the 2-prong, it will be caught when 
+                // adding 3+-prongs.
+                return undefined;
             }
         }
-        // z = zs[0];
-        const yz = maxD;
-        z = maxPos;
-        if (z === undefined || yz === 0) {
-            // addDebugInfo2(isHoleClosing);
+        const { x, d, curve, s } = antipodalPoints[0];
+        if (for1Prong && rO < (1 - oneProngTolerance) * d) {
+            add1Prong(meta, rO, xO, yPos);
             return undefined;
         }
+        const z = {
+            curve, t: s, isSource: false,
+            p: toP(curve.ps, s)
+        };
+        const circle = { center: x, radius: d };
+        const yz = squaredDistanceBetweenDd(yPos.p, z.p);
         const xz = squaredDistanceBetweenDd(x, z.p);
-        // if on first try
-        if (i === 0) {
-            if (rO < (1 - oneProngTolerance) * sqrt(xz)) {
-                // console.log('1prong');
-                add1Prong(meta, rO, xO, y);
+        if (!isHoleClosing) {
+            if (yz === 0) {
                 return undefined;
             }
-        }
-        // 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);
+            // The lines below eliminate cases where the found 2-prong is too
+            // close to a one-prong
+            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;
             }
         }
-        // Find the point on the line connecting y with x that is
-        // equidistant from y and z. This will be our next x.
-        const nextX = findEquidistantPointOnLineDd(x, y.p, z.p);
-        const error = abs(sqrt(xy) - sqrt(xz));
-        // if (xy < xz) { return undefined; }
-        x = nextX;
-        if (error < errorTolerance) {
-            break;
-        }
-        i++;
-        if (i === MAX_ITERATIONS) {
-            // Convergence was too slow.
-            // if (typeof _debug_ !== 'undefined') { console.log('failed (slow): max iterations reached'); }
-            return undefined;
-        }
-    }
-    const circle = { center: x, radius: distanceBetween(x, z.p) };
-    // if (typeof _debug_ !== 'undefined') { addDebugInfo(curvePieces, false, x, y, z, circle!, δ!, xs, isHoleClosing); }
-    // return { circle, zs };
-    // zs = zs.filter(z => z !== undefined)
-    return { circle, zs: [z] };
+        return { circle, z };
+    };
 }
-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_);
+/** @internal */
+function areAllAntipodesSame(app) {
+    const { curve, s: t } = app[0];
+    for (let i = 1; i < app.length; i++) {
+        const { curve: curve_, s: t_ } = app[i];
+        if (curve !== curve_ || t !== t_) {
+            return false;
         }
     }
-    return [xO, rO];
+    return true;
 }
 export { find2Prong };
 //# sourceMappingURL=find-2-prong.js.map