flo-mat 3.0.1 → 3.0.2

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

@@ -1 +1 @@
-{"version":3,"file":"find-3-prong.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/find-3-prong.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"find-3-prong.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/find-3-prong.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAG/E;;;;;;GAMG;AACH,SAAS,UAAU,CACjB,EAAc,EAAE,OAAe;IAEhC,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAEtD,2EAA2E;IAC3E,IAAI,UAIA,CAAC;IACL,IAAI,aAAa,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC7C,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,EAAE,CAAC,MAAM,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACxB,MAAM,cAAc,GACnB,oBAAoB,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;YACxD,IAAI,CAAC,cAAc,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAElC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;YAE1D,IAAI,KAAK,GAAG,aAAa,EAAE,CAAC;gBAC3B,aAAa,GAAG,KAAK,CAAC;gBAEtB,UAAU,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAsB,EAAE,GAAG,EAAE,CAAC;YAC5D,CAAC;QACF,CAAC;IACF,CAAC;IAGD,OAAO,UAAW,CAAC;AACpB,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}

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

@@ -0,0 +1,15 @@
+import { CpNode } from '../cp-node/cp-node.js';
+import { MatMeta } from '../mat/mat-meta.js';
+/**
+ * @internal
+ * Finds and add a 3-prong MAT circle to the given shape.
+ * @param cpTrees
+ * @param visitedCps
+ * @param extreme The maximum coordinate value used to calculate floating point
+ * tolerances.
+ */
+declare function findAndAdd3Prong(meta: MatMeta, visitedCps: CpNode[]): {
+    closeBysFor3Prong: CpNode[];
+    cpNodes: CpNode[];
+};
+export { findAndAdd3Prong };

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

@@ -0,0 +1,43 @@
+import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
+import { find3Prong } from './find-3-prong.js';
+import { addToCpTree } from '../mat/add-to-cp-tree.js';
+import { getCloseByCpIfExist } from '../mat/get-closeby-cp-if-exist.js';
+import { getProngCount } from '../cp-node/fs/get-prong-count.js';
+/**
+ * @internal
+ * Finds and add a 3-prong MAT circle to the given shape.
+ * @param cpTrees
+ * @param visitedCps
+ * @param extreme The maximum coordinate value used to calculate floating point
+ * tolerances.
+ */
+function findAndAdd3Prong(meta, visitedCps) {
+    const δs = [];
+    for (const visitedCp of visitedCps) {
+        δs.push([visitedCp, visitedCp.next]);
+    }
+    const threeProngInfo = find3Prong(δs, meta.maxCoordinate);
+    const { circle, poss, δ3s } = threeProngInfo;
+    const orders = [];
+    for (let i = 0; i < 3; i++) {
+        orders.push(calcPosOrder(circle, poss[i]));
+    }
+    const closeBysFor3Prong = [];
+    for (let i = 0; i < poss.length; i++) {
+        const pos = poss[i];
+        const order = orders[i];
+        const closeBy = getCloseByCpIfExist(meta, pos, circle, order, 0, 3);
+        if (closeBy !== undefined) {
+            const prongCount = getProngCount(closeBy);
+            if (prongCount <= 2 && !closeBy.isHoleClosing) {
+                closeBysFor3Prong.push(closeBy);
+            }
+        }
+    }
+    const cpNodes = closeBysFor3Prong.length === 0
+        ? addToCpTree(true, false, circle, orders, meta.cpTrees, poss, δ3s.map(v => v[0])).cpNodes
+        : [];
+    return { closeBysFor3Prong, cpNodes: cpNodes };
+}
+export { findAndAdd3Prong };
+//# sourceMappingURL=find-and-add-3-prong.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"find-and-add-3-prong.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/find-and-add-3-prong.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAGjE;;;;;;;GAOG;AACH,SAAS,gBAAgB,CACvB,IAAa,EACb,UAAoB;IAErB,MAAM,EAAE,GAAuB,EAAE,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,cAAc,GAAG,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAE1D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IAE7C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACpE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;gBAC/C,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAC7C,CAAC,CAAC,WAAW,CACZ,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACnE,CAAC,OAAO;QACT,CAAC,CAAC,EAAE,CAAC;IAEN,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAmB,EAAE,CAAC;AAC5D,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/find-3-prong.ts/find-and-add-3-prongs-on-loop.d.ts

@@ -0,0 +1,11 @@
+import { CpNode } from '../cp-node/cp-node.js';
+import { MatMeta } from '../mat/mat-meta.js';
+/**
+ * @internal
+ * Finds and adds all 3-prongs on a loop.
+ *
+ * @param meta
+ * @param cpStart The CpNode to start traversing from.
+  */
+declare function findAndAdd3ProngsOnLoop(meta: MatMeta, cpStart: CpNode | undefined): CpNode | undefined;
+export { findAndAdd3ProngsOnLoop };

package/node/find-3-prong.ts/find-and-add-3-prongs-on-loop.js

@@ -0,0 +1,63 @@
+import { findAndAdd3Prongs } from './find-and-add-3-prongs.js';
+import { getAllOnLoop } from '../cp-node/fs/get-all-on-loop.js';
+import { removeVertex } from '../vertex/remove-vertex.js';
+import { getAllOnCircle } from '../cp-node/fs/get-all-on-circle.js';
+/**
+ * @internal
+ * Finds and adds all 3-prongs on a loop.
+ *
+ * @param meta
+ * @param cpStart The CpNode to start traversing from.
+  */
+function findAndAdd3ProngsOnLoop(meta, cpStart) {
+    if (cpStart === undefined) {
+        return undefined;
+    }
+    const cpNodeGoodSet = new Set();
+    let reLoop = true;
+    while (reLoop) {
+        reLoop = false;
+        const cpNodeSet = new Set(getAllOnLoop(cpStart));
+        for (const cpNode of cpNodeSet) {
+            const { closeBysFor3Prong, addedCpNodes } = findAndAdd3Prongs(meta, cpNode);
+            if (addedCpNodes.length > 0) {
+                reLoop = true;
+            }
+            if (closeBysFor3Prong === undefined) {
+                cpNodeGoodSet.add(cpNode);
+            }
+            else {
+                reLoop = true;
+                replaceCloseBys(meta.cpTrees, closeBysFor3Prong, cpNodeSet, cpNodeGoodSet);
+            }
+            addedCpNodes.forEach(cpNodes => cpNodes.forEach(cpNode => cpNodeGoodSet.add(cpNode)));
+        }
+        cpStart = getFirstItemOfSet(cpNodeGoodSet);
+    }
+    return getFirstItemOfSet(cpNodeGoodSet);
+}
+// From https://stackoverflow.com/a/73281564/2010061
+function getFirstItemOfSet(set) {
+    for (const item of set) {
+        return item;
+    }
+    return undefined;
+}
+// Unfortunately O(n) until Javascript gives us the simple ability to
+// retrieve the first or last item of a set
+function getLastItemOfSet(set) {
+    let item;
+    for (item of set) { }
+    return item;
+}
+function replaceCloseBys(cpTrees, closeBysFor3Prong, cpNodeSet, cpNodeGoodSet) {
+    for (const closeBy of [closeBysFor3Prong[0]]) {
+        getAllOnCircle(closeBy).forEach(v => {
+            cpNodeSet.delete(v);
+            cpNodeGoodSet.delete(v);
+        });
+        removeVertex(closeBy, cpTrees);
+    }
+}
+export { findAndAdd3ProngsOnLoop };
+//# sourceMappingURL=find-and-add-3-prongs-on-loop.js.map

package/node/find-3-prong.ts/find-and-add-3-prongs-on-loop.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-and-add-3-prongs-on-loop.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/find-and-add-3-prongs-on-loop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE;;;;;;IAMI;AACJ,SAAS,uBAAuB,CACxB,IAAa,EACb,OAA2B;IAE/B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,SAAU,CAAC;IAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,OAAO,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,KAAK,CAAC;QACf,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACjD,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;YAE7B,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,GACrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAEpC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAAC,MAAM,GAAG,IAAI,CAAC;YAAC,CAAC;YAE/C,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBAClC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,IAAI,CAAC;gBACd,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;YAC/E,CAAC;YAED,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,GAAG,iBAAiB,CAAC,aAAa,CAAE,CAAC;IAChD,CAAC;IAED,OAAO,iBAAiB,CAAC,aAAa,CAAC,CAAC;AAC5C,CAAC;AAGD,oDAAoD;AACpD,SAAS,iBAAiB,CAAI,GAAW;IACrC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACjB,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,qEAAqE;AACrE,2CAA2C;AAC3C,SAAS,gBAAgB,CAAI,GAAW;IACpC,IAAI,IAAI,CAAC;IACT,KAAK,IAAI,IAAI,GAAG,EAAE,CAAC,CAAA,CAAC;IAEpB,OAAO,IAAI,CAAC;AAChB,CAAC;AAGD,SAAS,eAAe,CAChB,OAAmC,EACnC,iBAA2B,EAC3B,SAAsB,EACtB,aAA0B;IAE9B,KAAK,MAAM,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAChC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}

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

@@ -1,5 +1,24 @@
-import { LlRbTree } from 'flo-ll-rb-tree';
 import { CpNode } from '../cp-node/cp-node.js';
-import { Loop } from 'flo-boolean';
-declare function findAndAdd3Prongs(cpGraphs: Map<Loop, LlRbTree<CpNode>>, cpStart: CpNode, extreme: number): CpNode[];
+import { MatMeta } from '../mat/mat-meta.js';
+/**
+  * Starting from some `CpNode`, traverses the shape going around Vertices
+ * and if more than two Vertices have been visited in total then recursively
+ * adds 3-prongs until only one or two Vertices have been visited.
+ *
+ * This process further subdivides the shape.
+ *
+ * @param cpTrees
+ * @param cpStart The ContactPoint from where to start the process.
+ * @param extreme The maximum coordinate value used to calculate floating point
+ * tolerances.
+ *
+ * @internal
+ */
+declare function findAndAdd3Prongs(meta: MatMeta, cpStart: CpNode): {
+    closeBysFor3Prong: CpNode[];
+    addedCpNodes: CpNode[][];
+} | {
+    closeBysFor3Prong: undefined;
+    addedCpNodes: CpNode[][];
+};
 export { findAndAdd3Prongs };

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

@@ -1,74 +1,47 @@
-import { traverseCp } from '../cp-node/traverse-cp.js';
-import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
-import { find3Prong } from './find-3-prong.js';
-import { add3Prong } from './add-3-prong.js';
+import { traverseCp } from '../cp-node/fs/traverse-cp.js';
+import { isPosSharpCorner } from '../point-on-shape/is-pos-sharp-corner.js';
+import { findAndAdd3Prong } from './find-and-add-3-prong.js';
+let ii = 0;
 /**
- * @internal
- * Starting from some ContactPoint, traverses the shape going around Vertices
+  * Starting from some `CpNode`, traverses the shape going around Vertices
  * and if more than two Vertices have been visited in total then recursively
  * adds 3-prongs until only one or two Vertices have been visited.
  *
  * This process further subdivides the shape.
  *
- * @param cpGraphs
+ * @param cpTrees
  * @param cpStart The ContactPoint from where to start the process.
  * @param extreme The maximum coordinate value used to calculate floating point
  * tolerances.
+ *
+ * @internal
  */
-let ii = 0;
-function findAndAdd3Prongs(cpGraphs, cpStart, extreme) {
-    let visitedCps;
+function findAndAdd3Prongs(meta, cpStart) {
+    if (isPosSharpCorner(cpStart.cp.pointOnShape)) {
+        return { closeBysFor3Prong: undefined, addedCpNodes: [] };
+    }
+    const addedCpNodes = [];
+    let closeBysFor3Prong = undefined;
     do {
-        visitedCps = traverseCp(cpStart);
-        if (visitedCps.length > 2) {
-            const newCpNodes = findAndAdd3Prong(cpGraphs, visitedCps, extreme);
-            if (newCpNodes.length === 1) {
-                // There was another closeby cpNode
-                const closeCpNode = newCpNodes[0];
-            }
-            ii++;
+        if (cpStart === undefined) {
+            continue;
+        }
+        const visitedCps = traverseCp(cpStart);
+        if (visitedCps.length <= 2) {
+            break;
+        }
+        const { closeBysFor3Prong, cpNodes } = findAndAdd3Prong(meta, visitedCps);
+        addedCpNodes.push(cpNodes);
+        if (closeBysFor3Prong.length > 0) {
+            return { closeBysFor3Prong, addedCpNodes };
         }
         if (typeof _debug_ !== 'undefined') {
-            if (ii === _debug_.directives.stopAfterThreeProngsNum) {
+            if (++ii === _debug_.directives.stopAfterThreeProngsNum) {
                 return undefined;
             }
         }
-    } while (visitedCps.length > 2);
-    return visitedCps;
-}
-/**
- * @internal
- * Finds and add a 3-prong MAT circle to the given shape.
- * @param cpGraphs
- * @param visitedCps
- * @param extreme The maximum coordinate value used to calculate floating point
- * tolerances.
- */
-function findAndAdd3Prong(cpGraphs, visitedCps, extreme) {
-    const δs = [];
-    for (const visitedCp of visitedCps) {
-        δs.push([visitedCp, visitedCp.next]);
-    }
-    const threeProng = find3Prong(δs, extreme);
-    const orders = [];
-    for (let i = 0; i < 3; i++) {
-        orders.push(calcPosOrder(threeProng.circle, threeProng.ps[i]));
-    }
-    const newCpNodes = add3Prong(cpGraphs, orders, threeProng);
-    if (typeof _debug_ !== 'undefined') {
-        if (newCpNodes.length === 3) {
-            add3ProngDebugInfo(newCpNodes[0].cp.circle, visitedCps);
-        }
-    }
-    return newCpNodes;
-}
-/** @internal */
-function add3ProngDebugInfo(circle, visitedCps) {
-    const threeProngs = _debug_.generated.elems.threeProng;
-    const len = threeProngs.length;
-    const data = threeProngs[len - 1];
-    data.visitedCps = visitedCps;
-    data.circle = circle;
+    } while (true);
+    return { closeBysFor3Prong, addedCpNodes };
 }
 export { findAndAdd3Prongs };
 //# sourceMappingURL=find-and-add-3-prongs.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"find-and-add-3-prongs.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/find-and-add-3-prongs.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAG,MAAM,kBAAkB,CAAC;AAG9C;;;;;;;;;;;;GAYG;AACH,IAAI,EAAE,GAAG,CAAC,CAAC;AACX,SAAS,iBAAiB,CACxB,QAAoC,EACpC,OAAe,EACf,OAAe;IAEhB,IAAI,UAAoB,CAAC;IAEzB,GAAG;QACF,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAEjC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;YACnE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5B,mCAAmC;gBACnC,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;aAClC;YACD,EAAE,EAAE,CAAC;SACL;QAED,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAC1B,IAAI,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,uBAAuB,EAAE;gBACnD,OAAO,SAAU,CAAC;aACrB;SACJ;KACP,QAAQ,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;IAEhC,OAAO,UAAU,CAAC;AACnB,CAAC;AAGD;;;;;;;GAOG;AACH,SAAS,gBAAgB,CACvB,QAAoC,EACpC,UAAoB,EACpB,OAAe;IAEhB,MAAM,EAAE,GAAuB,EAAE,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QACnC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;KACrC;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACvB,MAAM,CAAC,IAAI,CACV,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CACjD,CAAC;KACF;IAED,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAE3D,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QACnC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;SACxD;KACD;IAED,OAAO,UAAU,CAAC;AACnB,CAAC;AAGD,gBAAgB;AAChB,SAAS,kBAAkB,CACzB,MAAc,EACd,UAAoB;IAErB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC;IACvD,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC;IAC/B,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,GAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;AACtB,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"find-and-add-3-prongs.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/find-and-add-3-prongs.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,IAAI,EAAE,GAAG,CAAC,CAAC;AACX;;;;;;;;;;;;;GAaG;AACH,SAAS,iBAAiB,CACxB,IAAa,EACb,OAAe;IAEhB,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAC3D,CAAC;IAED,MAAM,YAAY,GAAe,EAAE,CAAC;IACpC,IAAI,iBAAiB,GAAyB,SAAS,CAAC;IACxD,GAAG,CAAC;QACH,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAAC,MAAM;QAAC,CAAC;QAEtC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAE1E,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;QAC5C,CAAC;QAED,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACpC,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;gBACzD,OAAO,SAAU,CAAC;YACnB,CAAC;QACF,CAAC;IACF,CAAC,QAAQ,IAAI,EAAE;IAEf,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;AAC5C,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

package/node/find-3-prong.ts/get-closest-points.d.ts

@@ -1,9 +1,9 @@
-import { BezierPiece } from '../mat/bezier-piece.js';
+import { CurvePiece } from '../mat/curve-piece.js';
 /**
  * @internal
  * @param x
  * @param bezierPiece3s
  * @param extreme
  */
-declare function getClosestPoints(x: number[], bezierPiece3s: BezierPiece[][]): import("../point-on-shape/point-on-shape.js").PointOnShape[];
+declare function getClosestPoints(x: number[], bezierPiece3s: CurvePiece[][]): import("../index.js").PointOnShape[];
 export { getClosestPoints };

package/node/find-3-prong.ts/get-closest-points.js

@@ -7,7 +7,8 @@ import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-c
  */
 function getClosestPoints(x, bezierPiece3s) {
     return bezierPiece3s.map(bezierPieces => {
-        return getCloseBoundaryPointsCertified(bezierPieces, x)[0];
+        return getCloseBoundaryPointsCertified(5, // TODO - see find-2-prong
+        bezierPieces, x)[0];
     });
 }
 export { getClosestPoints };

package/node/find-3-prong.ts/get-closest-points.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/get-closest-points.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAInH;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,CAAW,EACX,aAA8B;IAElC,OAAO,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QACpC,OAAO,+BAA+B,CAClC,YAAY,EAAE,CAAC,CAClB,CAAC,CAAC,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;AACP,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../src/find-3-prong.ts/get-closest-points.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,CAAW,EACX,aAA6B;IAEjC,OAAO,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QACpC,OAAO,+BAA+B,CAClC,CAAC,EAAG,0BAA0B;QAC9B,YAAY,EAAE,CAAC,CAClB,CAAC,CAAC,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;AACP,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/find-mat/clip-options.d.ts

@@ -0,0 +1,3 @@
+import { MatOptions } from './mat-options.js';
+declare function clipOptions(maxCoordinate: number, maxRadius: number, options: Required<MatOptions>): Required<MatOptions>;
+export { clipOptions };

package/node/find-mat/clip-options.js

@@ -0,0 +1,32 @@
+import { matOptionRanges } from './mat-options.js';
+function clipOptions(maxCoordinate, maxRadius, options) {
+    const expMaxCoord = Math.ceil(Math.log2(maxCoordinate));
+    const expMaxRadius = Math.ceil(Math.log2(maxRadius));
+    const scaleSigBits = 10; // 1024 x 1024
+    const options_ = { ...options };
+    for (const k in matOptionRanges) {
+        // @ts-ignore
+        let o = options_[k];
+        // @ts-ignore
+        const c = matOptionRanges[k];
+        const { range, scaleByMaxCoordinate, scaleByMaxRadius } = c;
+        if (o < range[0]) {
+            o = range[0];
+        }
+        if (o > range[1]) {
+            o = range[1];
+        }
+        // Adjust length tolerance according to a reference max coordinate
+        if (!!scaleByMaxCoordinate) {
+            o = o * (2 ** expMaxCoord * 2 ** (-scaleSigBits));
+        }
+        else if (!!scaleByMaxRadius) {
+            o = o * (2 ** expMaxRadius * 2 ** (-scaleSigBits));
+        }
+        // @ts-ignore
+        options_[k] = o;
+    }
+    return options_;
+}
+export { clipOptions };
+//# sourceMappingURL=clip-options.js.map

package/node/find-mat/clip-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clip-options.js","sourceRoot":"","sources":["../../src/find-mat/clip-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,eAAe,EAAc,MAAM,kBAAkB,CAAC;AAG9E,SAAS,WAAW,CACZ,aAAqB,EACrB,SAAiB,EACjB,OAA6B;IAEjC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,EAAE,CAAC,CAAE,cAAc;IAExC,MAAM,QAAQ,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAChC,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;QAC9B,aAAa;QACb,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACpB,aAAa;QACb,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,CAAkB,CAAC;QAC9C,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACnC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAEnC,kEAAkE;QAClE,IAAI,CAAC,CAAC,oBAAoB,EAAE,CAAC;YACzB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAE,WAAW,GAAG,CAAC,IAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,CAAC,CAAC,gBAAgB,EAAE,CAAC;YAC5B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAE,YAAY,GAAG,CAAC,IAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,aAAa;QACb,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/find-mat/{create-initial-cp-graph.d.ts → create-initial-cp-tree.d.ts}

@@ -5,8 +5,11 @@ import { PointOnShape } from '../point-on-shape/point-on-shape.js';
 /**
  * @internal
  * Creates the initial ContactPoint loops from the given sharp corners.
+ *
+ * * modifies `cpTrees`
+ *
  * @param shape
  * @param sharpCornerss
  */
-declare function createInitialCpGraph(loops: Loop[], cpTrees: Map<Loop, LlRbTree<CpNode>>, sharpCornerss: PointOnShape[][]): CpNode | undefined;
-export { createInitialCpGraph };
+declare function createInitialCpTree(loops: Loop[], cpTrees: Map<Loop, LlRbTree<CpNode>>, sharpCornerss: PointOnShape[][]): CpNode | undefined;
+export { createInitialCpTree };

package/node/find-mat/{create-initial-cp-graph.js → create-initial-cp-tree.js}

@@ -1,13 +1,17 @@
 import { LlRbTree } from 'flo-ll-rb-tree';
-import { cpNodeComparator, insertCpNode } from '../cp-node/cp-node.js';
+import { CpNodeFs } from '../cp-node/cp-node-fs.js';
+import { insertCpNode } from '../cp-node/fs/insert-cp-node.js';
+const { cpNodeComparator } = CpNodeFs;
 /**
  * @internal
  * Creates the initial ContactPoint loops from the given sharp corners.
+ *
+ * * modifies `cpTrees`
+ *
  * @param shape
  * @param sharpCornerss
  */
-function createInitialCpGraph(loops, cpTrees, sharpCornerss /*,
-xMap: Map<number[][],{ ps: number[][] }>*/) {
+function createInitialCpTree(loops, cpTrees, sharpCornerss) {
     let cpNode;
     for (let k = 0; k < sharpCornerss.length; k++) {
         const sharpCorners = sharpCornerss[k];
@@ -15,14 +19,11 @@ xMap: Map<number[][],{ ps: number[][] }>*/) {
         let cpNode1 = undefined;
         let cpNode2 = undefined;
         for (const pos of sharpCorners) {
-            const ps = pos.curve.next.ps;
-            //const x = xMap.get(ps);
-            //const isIntersection = !!x;
             const circle = { center: pos.p, radius: 0 };
             const cp1 = { pointOnShape: pos, circle, order: -1, order2: 0 };
             const cp2 = { pointOnShape: pos, circle, order: +1, order2: 0 };
-            cpNode1 = insertCpNode(false, /*isIntersection*/ false, cpTree, cp1, cpNode2);
-            cpNode2 = insertCpNode(false, /*isIntersection*/ false, cpTree, cp2, cpNode1);
+            cpNode1 = insertCpNode(true, false, false, cpTree, cp1, cpNode2);
+            cpNode2 = insertCpNode(true, false, false, cpTree, cp2, cpNode1);
             cpNode1.prevOnCircle = cpNode2;
             cpNode2.prevOnCircle = cpNode1;
             cpNode1.nextOnCircle = cpNode2;
@@ -36,5 +37,5 @@ xMap: Map<number[][],{ ps: number[][] }>*/) {
     }
     return cpNode;
 }
-export { createInitialCpGraph };
-//# sourceMappingURL=create-initial-cp-graph.js.map
+export { createInitialCpTree };
+//# sourceMappingURL=create-initial-cp-tree.js.map

package/node/find-mat/create-initial-cp-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-initial-cp-tree.js","sourceRoot":"","sources":["../../src/find-mat/create-initial-cp-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;AAGtC;;;;;;;;GAQG;AACH,SAAS,mBAAmB,CACpB,KAAa,EACb,OAAoC,EACpC,aAA+B;IAEnC,IAAI,MAAM,CAAC;IACX,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAErD,IAAI,OAAO,GAAuB,SAAS,CAAC;QAC5C,IAAI,OAAO,GAAuB,SAAS,CAAC;QAC5C,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAE5C,MAAM,GAAG,GAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC9E,MAAM,GAAG,GAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAE9E,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAE,CAAC;YAClE,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAE,CAAC;YAElE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;YAC/B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;QACnC,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YAAC,MAAM,GAAG,OAAO,CAAC;QAAC,CAAC;QAElC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/node/find-mat/find-mat.d.ts

@@ -1,10 +1,15 @@
+import { CpNode } from '../cp-node/cp-node.js';
 import { Loop } from 'flo-boolean';
-import { Mat } from '../mat/mat.js';
+import { MatOptions } from './mat-options.js';
 /**
  * @internal
  * Find the MAT of the given loops.
  * @param loops The loops (that as a precondition must be ordered from highest
  * (i.e. smallest y-value) topmost point loops to lowest)
  */
-declare function findMat(loops: Loop[], minBezLength: number, maxCurviness: number, maxLength: number, maxCoordinate: number): Mat;
+declare function findMat(loops: Loop[], maxCoordinate: number, options: Required<MatOptions>): {
+    cpNode: CpNode;
+    meta: import("../index.js").MatMeta;
+};
 export { findMat };
+/** Curvilinear Shape Features (CSFs) */

package/node/find-mat/find-mat.js

@@ -1,57 +1,69 @@
-import { findAndAddAll3Prongs } from '../find-3-prong.ts/find-and-add-all-3-prongs.js';
-import { createInitialCpGraph } from './create-initial-cp-graph.js';
-import { addDebugInfo1, addDebugInfo2, addDebugInfo3, addDebugInfo4 } from './add-debug-info.js';
+import { findAndAdd3ProngsOnLoop } from '../find-3-prong.ts/find-and-add-3-prongs-on-loop.js';
+import { createInitialCpTree } from './create-initial-cp-tree.js';
+import { getMeta, addDebugInfo2, addDebugInfo3, addDebugInfo4 } from './get-meta.js';
 import { getSharpCornersOnLoop } from './get-sharp-corners.js';
-import { getDullCornersOnLoop } from './get-dull-corners.js';
-import { findAndAdd2ProngsOnAllPaths } from '../find-2-prong/find-and-add-2-prongs-on-all-paths.js';
+import { getDullCornersOnLoop } from './get-dull-corners-on-loop.js';
+import { findAndAdd2ProngsOnAllLoops } from '../find-2-prong/find-and-add-2-prongs-on-all-loops.js';
 import { getFor2ProngsOnLoop } from './get-for-2-prongs-on-loop.js';
 import { getFor1ProngsOnLoop } from './get-for-1-prongs-on-loop.js';
 import { findAndAddHoleClosing2Prongs } from '../find-2-prong/find-and-add-hole-closing-2-prongs.js';
+import { getShapeBounds } from '../svg/get-shape-bounds.js';
 /**
  * @internal
  * Find the MAT of the given loops.
  * @param loops The loops (that as a precondition must be ordered from highest
  * (i.e. smallest y-value) topmost point loops to lowest)
  */
-function findMat(loops, minBezLength, maxCurviness, maxLength, maxCoordinate) {
-    addDebugInfo1(loops);
+function findMat(loops, maxCoordinate, options) {
+    const { minBezLength, maxCurviness, maxLength, angleIncrement } = options;
     const getSharpCornersOnLoop_ = getSharpCornersOnLoop(minBezLength);
     const getDullCornersOnLoop_ = getDullCornersOnLoop(minBezLength);
+    const getFor2ProngsOnLoop_ = getFor2ProngsOnLoop(minBezLength, maxCurviness, maxLength);
+    const getFor1ProngsOnLoop_ = getFor1ProngsOnLoop(minBezLength);
     const sharpCornersPerLoop = loops.map(getSharpCornersOnLoop_);
-    const dullCornersPerLoop = loops.map(getDullCornersOnLoop_);
     const cpTrees = new Map();
-    createInitialCpGraph(loops, cpTrees, sharpCornersPerLoop);
-    findAndAddHoleClosing2Prongs(loops, cpTrees, maxCoordinate);
+    createInitialCpTree(loops, cpTrees, sharpCornersPerLoop);
+    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 meta = getMeta(maxCoordinate, squaredDiagonalLength, loops, cpTrees);
+    let cpNode;
+    cpNode = findAndAddHoleClosing2Prongs(meta);
     if (typeof _debug_ !== 'undefined') {
         if (_debug_.directives.stopAfterHoleClosers) {
-            return undefined;
+            return { cpNode: cpNode, meta };
         }
     }
     addDebugInfo2();
-    const for1ProngsPerLoop = loops.map(getFor1ProngsOnLoop(minBezLength));
-    const for2ProngsPerLoop = loops.map(getFor2ProngsOnLoop(minBezLength, maxCurviness, maxLength));
-    let cpNode;
-    cpNode = findAndAdd2ProngsOnAllPaths(cpNode, loops, cpTrees, dullCornersPerLoop, maxCoordinate, false);
-    cpNode = findAndAdd2ProngsOnAllPaths(cpNode, loops, cpTrees, for1ProngsPerLoop, maxCoordinate, true);
-    cpNode = findAndAdd2ProngsOnAllPaths(cpNode, loops, cpTrees, for2ProngsPerLoop, maxCoordinate, false);
+    const dullCornersPerLoop = loops.map(getDullCornersOnLoop_);
+    cpNode = findAndAdd2ProngsOnAllLoops(meta, angleIncrement, dullCornersPerLoop, false) || cpNode;
+    const for1ProngsPerLoop = loops.map(getFor1ProngsOnLoop_);
+    cpNode = findAndAdd2ProngsOnAllLoops(meta, angleIncrement, for1ProngsPerLoop, true) || cpNode;
+    const for2ProngsPerLoop = loops.map(getFor2ProngsOnLoop_);
+    cpNode = findAndAdd2ProngsOnAllLoops(meta, angleIncrement, for2ProngsPerLoop, false) || cpNode;
     addDebugInfo3();
     if (typeof _debug_ !== 'undefined') {
         if (_debug_.directives.stopAfterTwoProngs) {
-            return undefined;
+            return { cpNode: cpNode, meta };
         }
     }
+    cpNode = findAndAdd3ProngsOnLoop(meta, cpNode);
     if (cpNode === undefined) {
         return undefined;
     }
-    findAndAddAll3Prongs(cpTrees, cpNode, maxCoordinate);
     if (typeof _debug_ !== 'undefined') {
         if (_debug_.directives.stopAfterThreeProngs) {
-            return undefined;
+            return { cpNode: cpNode, meta };
         }
     }
-    const mat = { cpNode, cpTrees };
-    addDebugInfo4(mat);
+    // if (cpNode !== undefined) { add2rongsByError(options, 0.1, meta, cpNode); }
+    // if (cpNode !== undefined) { checkOrdering(cpTrees, cpNode); }
+    const mat = { cpNode, meta };
+    addDebugInfo4();
     return mat;
 }
 export { findMat };
+/** Curvilinear Shape Features (CSFs) */
+// const csfs = getCsfs(meta, minBezLength, loops);
+// const ligatures = getLigatures(meta, csfs);
 //# sourceMappingURL=find-mat.js.map

package/node/find-mat/find-mat.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-mat.js","sourceRoot":"","sources":["../../src/find-mat/find-mat.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,uDAAuD,CAAC;AAGrG;;;;;GAKG;AACH,SAAS,OAAO,CACR,KAAa,EACb,YAAoB,EACpB,YAAoB,EACpB,SAAiB,EACjB,aAAqB;IAEzB,aAAa,CAAC,KAAK,CAAC,CAAC;IAErB,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACnE,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IACjE,MAAM,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC9D,MAAM,kBAAkB,GAAG,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAE5D,MAAM,OAAO,GAAgC,IAAI,GAAG,EAAE,CAAC;IACvD,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAE1D,4BAA4B,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAE5D,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAChC,IAAI,OAAO,CAAC,UAAU,CAAC,oBAAoB,EAAE;YAAE,OAAO,SAAU,CAAC;SAAE;KACtE;IACD,aAAa,EAAE,CAAC;IAEhB,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAC/B,mBAAmB,CAAC,YAAY,CAAC,CACpC,CAAC;IACF,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAC/B,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,CAAC,CAC7D,CAAC;IAEF,IAAI,MAA0B,CAAC;IAC/B,MAAM,GAAG,2BAA2B,CAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,KAAK,CACnE,CAAC;IACF,MAAM,GAAG,2BAA2B,CAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,IAAI,CACjE,CAAC;IACF,MAAM,GAAG,2BAA2B,CAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,KAAK,CAClE,CAAC;IAEF,aAAa,EAAE,CAAC;IAChB,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAChC,IAAI,OAAO,CAAC,UAAU,CAAC,kBAAkB,EAAE;YAAE,OAAO,SAAU,CAAC;SAAE;KACpE;IAED,IAAI,MAAM,KAAK,SAAS,EAAE;QAAE,OAAO,SAAU,CAAC;KAAE;IAEhD,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAErD,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAChC,IAAI,OAAO,CAAC,UAAU,CAAC,oBAAoB,EAAE;YAAE,OAAO,SAAU,CAAC;SAAE;KACtE;IAED,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAEhC,aAAa,CAAC,GAAG,CAAC,CAAC;IAEnB,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAA"}
+{"version":3,"file":"find-mat.js","sourceRoot":"","sources":["../../src/find-mat/find-mat.ts"],"names":[],"mappings":"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"}

package/node/find-mat/find-mats.d.ts

@@ -1,4 +1,5 @@
 import { Mat } from '../mat/mat.js';
+import { MatOptions } from './mat-options.js';
 /**
  * Finds and returns the Medial Axis Transforms (MATs) from the given array of
  * bezier loops representing shape boundaries.
@@ -14,7 +15,8 @@ import { Mat } from '../mat/mat.js';
  * before an additional MAT point is inserted in between. Defaults to 0.4.
  * (Curviness is measured as the total angle in radians between the consecutive
  * vectors formed by the ordered control points of th bezier curve). The value
- * is clipped in the range `[0.05,3]`.
+ * is clipped in the range `[0.01,3]`.
+ *
  * @param maxLength The maximum length a curve can have before an additional MAT
  * point is inserted. This value is scaled to a reference 1024 x 1024
  * grid (e.g. if the shape fits in a 512 x 512 axis-aligned box the value will be
@@ -22,5 +24,5 @@ import { Mat } from '../mat/mat.js';
  * tolerance for the accuracy of the MAT. Defaults to 4. The value is clipped
  * in [1,100].
  */
-declare function findMats(bezierLoops: number[][][][], maxCurviness?: number, maxLength?: number): Mat[];
+declare function findMats(bezierLoops: number[][][][], options?: MatOptions): Mat[];
 export { findMats };