flo-mat 3.0.14 → 4.0.1

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

@@ -1,27 +1,32 @@
 import { find3ProngForDelta3s } from './find-3-prong-for-delta3s.js';
 import { getBoundaryPieceBeziers } from '../mat/get-boundary-piece-beziers.js';
 /**
- * @internal
  * Find and return a 3-prong from the given boundary piece.
+ *
  * @param δs A boundary piece
- * @param extreme The maximum coordinate value used to calculate floating point
- * tolerances.
+ * @param maxCoordPowerOf2 The maximum coordinate power of 2 value used to
+ * calculate floating point tolerances.
+ *
+ * @internal
  */
-function find3Prong(δs, extreme) {
+function find3Prong(δs, maxCoordPowerOf2) {
+    // FUTURE if `δs.length > (some threshold (say 4 or 5))` then add two-prongs
+    // to reduced the number of permutations required
+    // if (δs.length > 3) { console.log(δs.length); }
     const curvePiecess = δs.map(getBoundaryPieceBeziers);
     // The best candidate amongst the different 'permutations' of the given δs.
     let threeProng;
-    let smallestError = Number.POSITIVE_INFINITY;
+    let smallestError = Infinity;
     for (let i = 1; i < δs.length - 1; i++) {
         for (let k = 0; k < 3; k++) {
-            const threeProngInfo = find3ProngForDelta3s(δs, i, k, curvePiecess, extreme);
-            if (!threeProngInfo) {
+            const r = find3ProngForDelta3s(δs, i, k, curvePiecess, maxCoordPowerOf2);
+            if (r === undefined) {
                 continue;
             }
-            const { circle, poss: poss, error, δ3s } = threeProngInfo;
+            const { error, threeProngInfo } = r;
             if (error < smallestError) {
                 smallestError = error;
-                threeProng = { circle, poss: poss, δ3s };
+                threeProng = threeProngInfo;
             }
         }
     }

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

@@ -0,0 +1 @@
+{"version":3,"file":"find-3-prong.js","sourceRoot":"","sources":["../../src/find-3-prong/find-3-prong.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAI/E;;;;;;;;GAQG;AACH,SAAS,UAAU,CACX,EAAc,EACd,gBAAwB;IAE5B,4EAA4E;IAC5E,iDAAiD;IACjD,iDAAiD;IAEjD,MAAM,YAAY,GAAG,EAAE,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAErD,2EAA2E;IAC3E,IAAI,UAA0B,CAAC;IAE/B,IAAI,aAAa,GAAG,QAAQ,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACjC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACrB,MAAM,CAAC,GAAG,oBAAoB,CAC1B,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,gBAAgB,CAC3C,CAAC;YAEF,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAElC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;YAEpC,IAAI,KAAK,GAAG,aAAa,EAAE,CAAC;gBACxB,aAAa,GAAG,KAAK,CAAC;gBACtB,UAAU,GAAG,cAAc,CAAC;YAChC,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,UAAW,CAAC;AACvB,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}

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

@@ -16,11 +16,11 @@ function findAndAdd3Prong(meta, visitedCps) {
     for (const visitedCp of visitedCps) {
         δs.push([visitedCp, visitedCp.next]);
     }
-    const threeProngInfo = find3Prong(δs, meta.maxCoordinate);
+    const threeProngInfo = find3Prong(δs, meta.maxCoordPowerOf2);
     const { circle, poss, δ3s } = threeProngInfo;
     const orders = [];
     for (let i = 0; i < 3; i++) {
-        orders.push(calcPosOrder(circle, poss[i]));
+        orders.push(calcPosOrder(circle.center, poss[i]));
     }
     const closeBysFor3Prong = [];
     for (let i = 0; i < poss.length; i++) {

package/node/find-3-prong/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/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,CACjB,IAAa,EACb,UAAoB;IAExB,MAAM,EAAE,GAAuB,EAAE,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,cAAc,GAAG,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAE7D,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;QACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,iBAAiB,GAAa,EAAE,CAAC;IACvC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/B,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;YACxB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;gBAC5C,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAC1C,CAAC,CAAC,WAAW,CACT,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9D,CAAC,OAAO;QACT,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAmB,EAAE,CAAC;AAC/D,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/find-3-prong/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/find-and-add-3-prongs-on-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,6CAA6C;AAC7C,sCAAsC;AACtC,qCAAqC;AACrC,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,EAAE,iBAAiB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;YACvE,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;AAChB,uCAAuC;AACvC,IAAa,EACb,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,IAAI,CAAC,CAAC;IAChC,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}

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

@@ -17,7 +17,7 @@ let ii = 0;
  * @internal
  */
 function findAndAdd3Prongs(meta, cpStart) {
-    if (isPosSharpCorner(cpStart.cp.pointOnShape)) {
+    if (isPosSharpCorner(cpStart.pointOnShape)) {
         return { closeBysFor3Prong: undefined, addedCpNodes: [] };
     }
     const addedCpNodes = [];

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

@@ -0,0 +1 @@
+{"version":3,"file":"find-and-add-3-prongs.js","sourceRoot":"","sources":["../../src/find-3-prong/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,CAClB,IAAa,EACb,OAAe;IAEnB,IAAI,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAC9D,CAAC;IAED,MAAM,YAAY,GAAe,EAAE,CAAC;IACpC,IAAI,iBAAiB,GAAyB,SAAS,CAAC;IACxD,GAAG,CAAC;QACA,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;YAC/B,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;QAC/C,CAAC;QAED,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;gBACtD,OAAO,SAAU,CAAC;YACtB,CAAC;QACL,CAAC;IACL,CAAC,QAAQ,IAAI,EAAE;IAEf,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC;AAC/C,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

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

@@ -0,0 +1,10 @@
+import type { CurvePiece } from '../mat/curve-piece.js';
+/**
+ * @param maxCoordPowerOf2
+ * @param x
+ * @param curvePiece3s
+ *
+ * @internal
+ */
+declare function getClosestPoints(maxCoordPowerOf2: number, x: number[], curvePiece3s: CurvePiece[][]): import("../point-on-shape/point-on-shape.js").PrePointOnShape[];
+export { getClosestPoints };

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

@@ -1,14 +1,14 @@
 import { getCloseBoundaryPointsCertified } from '../closest-boundary-point/get-close-boundary-points-certified.js';
 /**
- * @internal
+ * @param maxCoordPowerOf2
  * @param x
  * @param curvePiece3s
- * @param extreme
+ *
+ * @internal
  */
-function getClosestPoints(x, curvePiece3s) {
+function getClosestPoints(maxCoordPowerOf2, x, curvePiece3s) {
     return curvePiece3s.map(curvePieces => {
-        return getCloseBoundaryPointsCertified(5, // TODO - see find-2-prong
-        curvePieces, x)[0];
+        return getCloseBoundaryPointsCertified(maxCoordPowerOf2, curvePieces, x)[0];
     });
 }
 export { getClosestPoints };

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

@@ -0,0 +1 @@
+{"version":3,"file":"get-closest-points.js","sourceRoot":"","sources":["../../src/find-3-prong/get-closest-points.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AAGnH;;;;;;GAMG;AACH,SAAS,gBAAgB,CACjB,gBAAwB,EACxB,CAAW,EACX,YAA4B;IAEhC,OAAO,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAClC,OAAO,+BAA+B,CAClC,gBAAgB,EAChB,WAAW,EACX,CAAC,CACJ,CAAC,CAAC,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;AACP,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

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

@@ -0,0 +1,9 @@
+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';
+interface ThreeProngInfo {
+    readonly circle: Circle;
+    readonly poss: PrePointOnShape[];
+    readonly δ3s: CpNode[][];
+}
+export type { ThreeProngInfo };

package/node/find-3-prong/three-prong-info.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=three-prong-info.js.map

package/node/find-3-prong/three-prong-info.js.map

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

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

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

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

@@ -1,15 +1,12 @@
 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));
+function clipOptions(maxCoordPowerOf2, options) {
     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;
+        const key = k;
+        let o = options_[key];
+        const c = matOptionRanges[key];
+        const { range, scaleByMaxCoordinate } = c;
         if (o < range[0]) {
             o = range[0];
         }
@@ -18,13 +15,9 @@ function clipOptions(maxCoordinate, maxRadius, options) {
         }
         // Adjust length tolerance according to a reference max coordinate
         if (!!scaleByMaxCoordinate) {
-            o = o * (2 ** expMaxCoord * 2 ** (-scaleSigBits));
+            o *= 2 ** (maxCoordPowerOf2 - scaleSigBits);
         }
-        else if (!!scaleByMaxRadius) {
-            o = o * (2 ** expMaxRadius * 2 ** (-scaleSigBits));
-        }
-        // @ts-ignore
-        options_[k] = o;
+        options_[key] = o;
     }
     return options_;
 }

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

@@ -1 +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"}
+{"version":3,"file":"clip-options.js","sourceRoot":"","sources":["../../src/find-mat/clip-options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAmB,MAAM,kBAAkB,CAAC;AAGpE,SAAS,WAAW,CACZ,gBAAwB,EACxB,OAA6B;IAEjC,MAAM,YAAY,GAAG,EAAE,CAAC,CAAE,cAAc;IAExC,MAAM,QAAQ,GAAkC,EAAE,GAAG,OAAO,EAAE,CAAC;IAE/D,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,CAAiC,CAAC;QAC9C,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC;QAC1C,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,IAAI,CAAC,IAAE,CAAC,gBAAgB,GAAG,YAAY,CAAC,CAAC;QAC9C,CAAC;QAED,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/find-mat/create-initial-cp-tree.d.ts

@@ -1,19 +1,20 @@
+import type { Loop } from 'flo-boolean';
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
 import { LlRbTree } from 'flo-ll-rb-tree';
-import { Loop } from 'flo-boolean';
-import { CpNode } from '../cp-node/cp-node.js';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
 /**
- * @internal
  * Creates the initial ContactPoint loops from the given sharp corners.
  *
- * * modifies `cpTrees` and `lastInsertId` of `meta`
+ * * ❗Modifies❗`cpTrees` and `lastInsertId`
  *
  * @param loops
  * @param cpTrees
  * @param sharpCornerss
  * @param lastInsertId
+ *
+ * @internal
  */
-declare function createInitialCpTree(loops: Loop[], cpTrees: Map<Loop, LlRbTree<CpNode>>, sharpCornerss: PointOnShape[][], lastInsertId: {
+declare function createInitialCpTree(loops: Loop[], sharpCornerss: PrePointOnShape[][], lastInsertId: {
     id: number;
-}): CpNode | undefined;
+}): Map<Loop, LlRbTree<CpNode>>;
 export { createInitialCpTree };

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

@@ -1,43 +1,40 @@
 import { LlRbTree } from 'flo-ll-rb-tree';
-import { CpNodeFs } from '../cp-node/cp-node-fs.js';
 import { insertCpNode } from '../cp-node/fs/insert-cp-node.js';
-const { cpNodeComparator } = CpNodeFs;
+import { cpNodeComparator } from '../cp-node/fs/cp-node-comparator.js';
 /**
- * @internal
  * Creates the initial ContactPoint loops from the given sharp corners.
  *
- * * modifies `cpTrees` and `lastInsertId` of `meta`
+ * * ❗Modifies❗`cpTrees` and `lastInsertId`
  *
  * @param loops
  * @param cpTrees
  * @param sharpCornerss
  * @param lastInsertId
+ *
+ * @internal
  */
-function createInitialCpTree(loops, cpTrees, sharpCornerss, lastInsertId) {
-    let cpNode;
+function createInitialCpTree(loops, sharpCornerss, lastInsertId) {
+    const cpTrees = new Map();
     for (let k = 0; k < sharpCornerss.length; k++) {
-        const sharpCorners = sharpCornerss[k];
         const cpTree = new LlRbTree(cpNodeComparator, false);
+        cpTrees.set(loops[k], cpTree);
+        const sharpCorners = sharpCornerss[k];
         let cpNode1 = undefined;
         let cpNode2 = undefined;
-        for (const pos of sharpCorners) {
-            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(true, false, false, cpTree, cp1, cpNode2, lastInsertId);
-            cpNode2 = insertCpNode(true, false, false, cpTree, cp2, cpNode1, lastInsertId);
+        for (const ppos of sharpCorners) {
+            const circle = { center: ppos.p, radius: 0 };
+            const { curve } = ppos;
+            const pos1 = { ...ppos, curve, t: 1, circle, order: -1, order2: 0 };
+            const pos2 = { ...ppos, curve: curve.next, t: 0, circle, order: +1, order2: 0 };
+            cpNode1 = insertCpNode(true, false, false, cpTree, pos1, cpNode2, lastInsertId);
+            cpNode2 = insertCpNode(true, false, false, cpTree, pos2, cpNode1, lastInsertId);
             cpNode1.prevOnCircle = cpNode2;
             cpNode2.prevOnCircle = cpNode1;
             cpNode1.nextOnCircle = cpNode2;
             cpNode2.nextOnCircle = cpNode1;
         }
-        if (!cpNode) {
-            cpNode = cpNode1;
-        }
-        const loop = loops[k];
-        cpTrees.set(loop, cpTree);
     }
-    return cpNode;
+    return cpTrees;
 }
 export { createInitialCpTree };
 //# sourceMappingURL=create-initial-cp-tree.js.map

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

@@ -1 +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;AAG/D,MAAM,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;AAGtC;;;;;;;;;;GAUG;AACH,SAAS,mBAAmB,CACpB,KAAa,EACb,OAAoC,EACpC,aAA+B,EAC/B,YAA4B;IAEhC,IAAI,MAA0B,CAAC;IAC/B,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,EAAE,YAAY,CAAE,CAAC;YAChF,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,CAAE,CAAC;YAEhF,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"}
+{"version":3,"file":"create-initial-cp-tree.js","sourceRoot":"","sources":["../../src/find-mat/create-initial-cp-tree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGvE;;;;;;;;;;;GAWG;AACH,SAAS,mBAAmB,CACpB,KAAa,EACb,aAAkC,EAClC,YAA4B;IAEhC,MAAM,OAAO,GAAgC,IAAI,GAAG,EAAE,CAAC;IAEvD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE9B,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAEtC,IAAI,OAAO,GAAgC,SAAS,CAAC;QACrD,IAAI,OAAO,GAAgC,SAAS,CAAC;QACrD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,KAAK,EAAc,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC9F,MAAM,IAAI,GAAiB,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAE9F,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAE,CAAC;YACjF,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAE,CAAC;YAEjF,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;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

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

@@ -8,7 +8,7 @@ import { MatMeta } from '../mat/mat-meta.js';
  * @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[], maxCoordinate: number, options: Required<MatOptions>): {
+declare function findMat(loops: Loop[], maxCoordPowerOf2: number, options: Required<MatOptions>): {
     cpNode: CpNode;
     meta: MatMeta;
 };

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

@@ -1,6 +1,6 @@
-import { findAndAdd3ProngsOnLoop } from '../find-3-prong.ts/find-and-add-3-prongs-on-loop.js';
+import { findAndAdd3ProngsOnLoop } from '../find-3-prong/find-and-add-3-prongs-on-loop.js';
 import { createInitialCpTree } from './create-initial-cp-tree.js';
-import { getPointToCpNode, getPartialMeta, addDebugInfo2, addDebugInfo3, addDebugInfo4 } from './get-meta.js';
+import { /*getPointToCpNode,*/ getPartialMeta, addDebugInfo2, addDebugInfo3, addDebugInfo4, getPointToCpNode } from './get-meta.js';
 import { getSharpCornersOnLoop } from './get-sharp-corners.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';
@@ -14,29 +14,24 @@ import { getShapeBounds } from '../svg/get-shape-bounds.js';
  * @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, maxCoordinate, options) {
+function findMat(loops, maxCoordPowerOf2, 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 bounds = getShapeBounds(loops);
     const squaredDiagonalLength = (bounds.maxX.p[0] - bounds.minX.p[0]) ** 2 +
         (bounds.maxY.p[1] - bounds.minY.p[1]) ** 2;
-    const cpTrees = new Map();
+    const sharpCornersPerLoop = loops.map(getSharpCornersOnLoop_);
     const lastInsertId = { id: 0 };
-    createInitialCpTree(loops, cpTrees, sharpCornersPerLoop, lastInsertId);
+    const cpTrees = createInitialCpTree(loops, sharpCornersPerLoop, lastInsertId);
     const _meta = getPartialMeta(loops);
     const pointToCpNode = getPointToCpNode(loops, cpTrees);
     const meta = {
-        maxCoordinate, squaredDiagonalLength, loops, cpTrees, pointToCpNode,
+        maxCoordPowerOf2, squaredDiagonalLength, loops, cpTrees, // pointToCpNode,
         lastInsertId, ..._meta
     };
-    // const cpTrees: Map<Loop, LlRbTree<CpNode>> = new Map();
-    // const lastInsertId = { id: 0 };
-    // createInitialCpTree(loops, cpTrees, sharpCornersPerLoop, lastInsertId);
-    // const meta = getMeta(maxCoordinate, squaredDiagonalLength, loops, cpTrees, lastInsertId);
     let cpNode;
     cpNode = findAndAddHoleClosing2Prongs(meta);
     if (typeof _debug_ !== 'undefined') {
@@ -66,7 +61,6 @@ function findMat(loops, maxCoordinate, options) {
             return { cpNode: cpNode, meta };
         }
     }
-    // if (cpNode !== undefined) { add2rongsByError(options, 0.1, meta, cpNode); }
     // if (cpNode !== undefined) { checkOrdering(cpTrees, cpNode); }
     const mat = { cpNode, meta };
     addDebugInfo4();

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":"AAOA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9G,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,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;AACrG,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAK5D;;;;;GAKG;AACH,SAAS,OAAO,CACR,KAAa,EACb,aAAqB,EACrB,OAA6B;IAEjC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAE1E,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACnE,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IACjE,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IACxF,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAE/D,MAAM,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,qBAAqB,GACvB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC;QACxC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAgC,IAAI,GAAG,EAAE,CAAC;IACvD,MAAM,YAAY,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;IAC/B,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAAC;IAEvE,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,IAAI,GAAY;QAClB,aAAa,EAAE,qBAAqB,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa;QACnE,YAAY,EAAE,GAAG,KAAK;KACzB,CAAC;IACF,0DAA0D;IAC1D,kCAAkC;IAClC,0EAA0E;IAE1E,4FAA4F;IAG5F,IAAI,MAA0B,CAAC;IAE/B,MAAM,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAE5C,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,MAAO,EAAE,IAAI,EAAE,CAAC;QAAC,CAAC;IACtF,CAAC;IACD,aAAa,EAAE,CAAC;IAEhB,MAAM,kBAAkB,GAAG,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAC5D,MAAM,GAAG,2BAA2B,CAAC,IAAI,EAAE,cAAc,EAAE,kBAAkB,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC;IAEhG,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC1D,MAAM,GAAG,2BAA2B,CAAC,IAAI,EAAE,cAAc,EAAE,iBAAiB,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC;IAE9F,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC1D,MAAM,GAAG,2BAA2B,CAAC,IAAI,EAAE,cAAc,EAAE,iBAAiB,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC;IAE/F,aAAa,EAAE,CAAC;IAEhB,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,MAAO,EAAE,IAAI,EAAE,CAAC;QAAC,CAAC;IACpF,CAAC;IAED,MAAM,GAAG,uBAAuB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,SAAU,CAAC;IAAC,CAAC;IAEhD,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,MAAO,EAAE,IAAI,EAAE,CAAC;QAAC,CAAC;IACtF,CAAC;IAED,8EAA8E;IAE9E,gEAAgE;IAEhE,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAE7B,aAAa,EAAE,CAAC;IAEhB,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAA;AAIlB,wCAAwC;AACxC,mDAAmD;AACnD,8CAA8C"}
+{"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.js

@@ -5,6 +5,7 @@ import { toScaleAxis } from '../sat/to-scale-axis.js';
 import { clipOptions } from './clip-options.js';
 import { findMat } from './find-mat.js';
 import { defaultMatOptions } from './mat-options.js';
+const { ceil, log2 } = Math;
 /**
  * Finds and returns the Medial Axis Transforms (MATs) from the given array of
  * bezier loops representing shape boundaries.
@@ -31,21 +32,18 @@ import { defaultMatOptions } from './mat-options.js';
  */
 function findMats(bezierLoops, options) {
     // if (typeof _debug_ !== 'undefined') { var timingStart = performance.now(); }
-    const { maxCoordinate, maxRadius } = getLoopsMetrics(bezierLoops);
-    const options_ = clipOptions(maxCoordinate, maxRadius, {
+    const { maxCoordinate } = getLoopsMetrics(bezierLoops);
+    const maxCoordPowerOf2 = ceil(log2(maxCoordinate));
+    const options_ = clipOptions(maxCoordPowerOf2, {
         ...defaultMatOptions,
         ...(options || {})
     });
     const { applySat, simplify, satScale, simplifyTolerance } = options_;
-    const loopss = simplifyPaths(bezierLoops);
+    const loopss = simplifyPaths(bezierLoops, undefined, { forceOrientationNegative: true });
     // console.log(loopsToSvgPathStr(bezierLoops));
-    // const loopss = [bezierLoops.map(loop => loopFromBeziers(loop,0))];
-    // console.log(loopsToSvgPathStr(bezierLoops.map(v => v.map(v => v.map(v => v.map(v => v*2**4))))));
-    // console.log(loopsToSvgPathStr(bezierLoops.map(v => v.map(v => v.map(v => [-v[0],v[1]])))));
-    // console.log(loopsToSvgPathStr(loopss[0].map(loop => loop.beziers)));
     const mats = [];
     for (const loops of loopss) {
-        let mat = findMat(loops, maxCoordinate, options_);
+        let mat = findMat(loops, maxCoordPowerOf2, options_);
         if (mat === undefined) {
             continue;
         }
@@ -57,6 +55,8 @@ function findMats(bezierLoops, options) {
         }
         mats.push(mat);
     }
+    // console.log(structuredClone(find3Prong.getStats()));
+    // find3Prong.resetStats();
     return mats;
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"find-mats.js","sourceRoot":"","sources":["../../src/find-mat/find-mats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAG,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAc,MAAM,kBAAkB,CAAC;AAGjE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,SAAS,QAAQ,CACT,WAA2B,EAC3B,OAAoB;IAExB,+EAA+E;IAC/E,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IAElE,MAAM,QAAQ,GAAyB,WAAW,CAC9C,aAAa,EACb,SAAS,EAAE;QACX,GAAG,iBAAiB;QACpB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACrB,CAAC,CAAC;IAEH,MAAM,EACF,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,iBAAiB,EAC9B,GAAG,QAAQ,CAAC;IAGb,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC1C,+CAA+C;IAC/C,qEAAqE;IACrE,oGAAoG;IACpG,8FAA8F;IAC9F,uEAAuE;IAEvE,MAAM,IAAI,GAAU,EAAE,CAAC;IACvB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAClD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAEpC,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;QACjD,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAID;;;;GAIG;AACH,SAAS,iBAAiB,CAClB,KAAqB;IAEzB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,GAAG,GAAG,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjD,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,QAAQ,EAAE,CAAA"}
+{"version":3,"file":"find-mats.js","sourceRoot":"","sources":["../../src/find-mat/find-mats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAG,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAc,MAAM,kBAAkB,CAAC;AAEjE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;AAG5B;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,SAAS,QAAQ,CACT,WAA2B,EAC3B,OAAoB;IAExB,+EAA+E;IAC/E,MAAM,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAEnD,MAAM,QAAQ,GAAyB,WAAW,CAC9C,gBAAgB,EAAE;QAClB,GAAG,iBAAiB;QACpB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACrB,CAAC,CAAC;IAEH,MAAM,EACF,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,iBAAiB,EAC9B,GAAG,QAAQ,CAAC;IAGb,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,wBAAwB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzF,+CAA+C;IAE/C,MAAM,IAAI,GAAU,EAAE,CAAC;IACvB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAEpC,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACX,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAA;QACjD,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,uDAAuD;IACvD,2BAA2B;IAE3B,OAAO,IAAI,CAAC;AAChB,CAAC;AAID;;;;GAIG;AACH,SAAS,iBAAiB,CAClB,KAAqB;IAEzB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,GAAG,GAAG,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjD,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,QAAQ,EAAE,CAAA"}

package/node/find-mat/get-dull-corners-on-loop.d.ts

@@ -1,5 +1,5 @@
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { Loop } from 'flo-boolean';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { Loop } from 'flo-boolean';
 /** @internal */
-declare function getDullCornersOnLoop(minBezLength: number): (loop: Loop) => PointOnShape[];
+declare function getDullCornersOnLoop(minBezLength: number): (loop: Loop) => PrePointOnShape[];
 export { getDullCornersOnLoop };

package/node/find-mat/get-dull-corners-on-loop.js

@@ -1,4 +1,3 @@
-import { createPos } from '../point-on-shape/create-pos.js';
 import { controlPointLinesLength } from 'flo-bezier3';
 import { getCorner } from '../corner/get-corner.js';
 /** @internal */
@@ -10,9 +9,11 @@ function getDullCornersOnLoop(minBezLength) {
             if (controlPointLinesLength(curve.ps) < minBezLength) {
                 continue;
             }
-            if (getCorner(curve.ps, curve.next.ps).isQuiteDull) {
-                dullCorners.push(createPos(curve, 1, true));
-                dullCorners.push(createPos(curve.next, 0, true));
+            const { next, ps } = curve;
+            if (getCorner(ps, next.ps).isQuiteDull) {
+                const p = ps[ps.length - 1];
+                dullCorners.push({ curve, t: 1, isSource: true, p });
+                dullCorners.push({ curve: next, t: 0, isSource: true, p });
             }
         }
         return dullCorners;

package/node/find-mat/get-dull-corners-on-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-dull-corners-on-loop.js","sourceRoot":"","sources":["../../src/find-mat/get-dull-corners-on-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAgC,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,gBAAgB;AAChB,SAAS,oBAAoB,CACrB,YAAoB;IAExB,OAAO,CAAC,IAAU,EAAE,EAAE;QAClB,MAAM,WAAW,GAAmB,EAAE,CAAC;QAEvC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAE7B,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC;gBACnD,SAAS;YACb,CAAC;YAED,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC5C,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC,CAAA;AACL,CAAC;AAID,OAAO,EAAE,oBAAoB,EAAE,CAAA"}
+{"version":3,"file":"get-dull-corners-on-loop.js","sourceRoot":"","sources":["../../src/find-mat/get-dull-corners-on-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,gBAAgB;AAChB,SAAS,oBAAoB,CACrB,YAAoB;IAExB,OAAO,CAAC,IAAU,EAAqB,EAAE;QACrC,MAAM,WAAW,GAAsB,EAAE,CAAC;QAE1C,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAE7B,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC;gBACnD,SAAS;YACb,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;YAE3B,IAAI,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAE5B,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;gBACrD,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,oBAAoB,EAAE,CAAA"}

package/node/find-mat/get-for-1-prongs-on-loop.d.ts

@@ -1,11 +1,11 @@
-import { Loop } from 'flo-boolean';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { Loop } from 'flo-boolean';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
 /**
- * @internal
- * Get useful points on the shape - these incude points of maximum curvature and
- * points at the bezier-bezier interfaces.
+ * Get points of maximum curvature.
+ *
  * @param loop
- * @param additionalPointCount
+ *
+ * @internal
  */
-declare function getFor1ProngsOnLoop(minBezLength: number): (loop: Loop) => PointOnShape[];
+declare function getFor1ProngsOnLoop(minBezLength: number): (loop: Loop) => PrePointOnShape[];
 export { getFor1ProngsOnLoop };

package/node/find-mat/get-for-1-prongs-on-loop.js

@@ -1,35 +1,23 @@
 import { getCurvatureExtremaDd, controlPointLinesLength } from 'flo-bezier3';
-import { createPos } from '../point-on-shape/create-pos.js';
+import { toP } from '../point-on-shape/to-p.js';
 /**
- * @internal
- * Get useful points on the shape - these incude points of maximum curvature and
- * points at the bezier-bezier interfaces.
+ * Get points of maximum curvature.
+ *
  * @param loop
- * @param additionalPointCount
+ *
+ * @internal
  */
 function getFor1ProngsOnLoop(minBezLength) {
     return function (loop) {
-        const for1Prongs = [];
-        const poss = getCurvatureExtremaPoss(minBezLength)(loop);
-        for1Prongs.push(...poss.minima, ...poss.maxima);
-        return for1Prongs;
-    };
-}
-function getCurvatureExtremaPoss(minBezLength) {
-    return function (loop) {
-        const poss = {
-            minima: [],
-            maxima: []
-        };
+        const poss = [];
         for (let i = 0; i < loop.curves.length; i++) {
             const curve = loop.curves[i];
             if (controlPointLinesLength(curve.ps) < minBezLength) {
                 continue;
             }
-            const { minima, maxima } = getCurvatureExtremaDd(curve.ps);
-            // const maxAbsCurvatures = [...minima, ...maxima].map(t => createPos(curve, t, true));
-            poss.minima.push(...minima.map(t => createPos(curve, t, true)));
-            poss.maxima.push(...maxima.map(t => createPos(curve, t, true)));
+            poss.push(...getCurvatureExtremaDd(curve.ps).maxima.map(t => ({
+                curve, t, isSource: true, p: toP(curve.ps, t)
+            })));
         }
         return poss;
     };

package/node/find-mat/get-for-1-prongs-on-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-for-1-prongs-on-loop.js","sourceRoot":"","sources":["../../src/find-mat/get-for-1-prongs-on-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAG7E,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D;;;;;;GAMG;AACH,SAAS,mBAAmB,CACpB,YAAoB;IAExB,OAAO,UAAS,IAAU;QACtB,MAAM,UAAU,GAAmB,EAAE,CAAC;QAEtC,MAAM,IAAI,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC;QACzD,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhD,OAAO,UAAU,CAAC;IACtB,CAAC,CAAA;AACL,CAAC;AAGD,SAAS,uBAAuB,CACxB,YAAoB;IAExB,OAAO,UAAS,IAAU;QACtB,MAAM,IAAI,GAGN;YACA,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,EAAE;SACb,CAAC;QAEF,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAE7B,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC;gBACnD,SAAS;YACb,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3D,uFAAuF;YAEvF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"get-for-1-prongs-on-loop.js","sourceRoot":"","sources":["../../src/find-mat/get-for-1-prongs-on-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAGhD;;;;;;GAMG;AACH,SAAS,mBAAmB,CACpB,YAAoB;IAExB,OAAO,UAAS,IAAU;QACtB,MAAM,IAAI,GAAsB,EAAE,CAAC;QAEnC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAE7B,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC;gBACnD,SAAS;YACb,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC1D,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;aAChD,CAAC,CAAC,CAAC,CAAC;QACT,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/node/find-mat/get-for-2-prongs-on-loop.d.ts

@@ -1,11 +1,12 @@
-import { Loop } from 'flo-boolean';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { Loop } from 'flo-boolean';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
 /**
- * @internal
  * Get useful points on the shape - these incude points of maximum curvature and
  * points at the bezier-bezier interfaces.
  * @param loop
  * @param additionalPointCount
+ *
+ * @internal
  */
-declare function getFor2ProngsOnLoop(minBezLength: number, maxCurviness: number, maxLength: number): (loop: Loop) => PointOnShape[];
+declare function getFor2ProngsOnLoop(minBezLength: number, maxCurviness: number, maxLength: number): (loop: Loop) => PrePointOnShape[];
 export { getFor2ProngsOnLoop };

package/node/find-mat/get-for-2-prongs-on-loop.js

@@ -1,11 +1,12 @@
 import { splitByCurvatureAndLength, controlPointLinesLength, getInflections } from 'flo-bezier3';
-import { createPos } from '../point-on-shape/create-pos.js';
+import { toP } from '../point-on-shape/to-p.js';
 /**
- * @internal
  * Get useful points on the shape - these incude points of maximum curvature and
  * points at the bezier-bezier interfaces.
  * @param loop
  * @param additionalPointCount
+ *
+ * @internal
  */
 function getFor2ProngsOnLoop(minBezLength, maxCurviness, maxLength) {
     return function (loop) {
@@ -18,13 +19,10 @@ function getFor2ProngsOnLoop(minBezLength, maxCurviness, maxLength) {
                 continue;
             }
             let ts = splitByCurvatureAndLength(ps, maxCurviness, maxLength);
-            // let ts = [0,0.25,0.5,0.75,1];
-            // let ts = [0,0.5 + 2**-20,1];
-            // let ts = ps.length <= 3 ? [0,1] : fitQuadsToCubicTsOnly(ps, 1);
             ts = ts.length === 2 ? [0.5] : ts;
             ts.push(...getInflections(ps));
             ts = ts.filter(t => t !== 0 && t !== 1);
-            const byCurvatureAndLength = ts.map(t => createPos(curve, t, true));
+            const byCurvatureAndLength = ts.map(t => ({ curve, t, isSource: true, p: toP(curve.ps, t) }));
             for2Prongs.push(...byCurvatureAndLength);
         }
         return for2Prongs;

package/node/find-mat/get-for-2-prongs-on-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-for-2-prongs-on-loop.js","sourceRoot":"","sources":["../../src/find-mat/get-for-2-prongs-on-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAmB,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlH,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAI5D;;;;;;GAMG;AACH,SAAS,mBAAmB,CACpB,YAAoB,EACpB,YAAoB,EACpB,SAAiB;IAErB,OAAO,UAAS,IAAU;QACtB,MAAM,UAAU,GAAmB,EAAE,CAAC;QAEtC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YAEpB,IAAI,uBAAuB,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC;gBAC7C,SAAS;YACb,CAAC;YAED,IAAI,EAAE,GAAG,yBAAyB,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;YAChE,gCAAgC;YAChC,+BAA+B;YAC/B,kEAAkE;YAElE,EAAE,GAAG,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClC,EAAE,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAExC,MAAM,oBAAoB,GACtB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;YAE3C,UAAU,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;QAC7C,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"get-for-2-prongs-on-loop.js","sourceRoot":"","sources":["../../src/find-mat/get-for-2-prongs-on-loop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAGhD;;;;;;;GAOG;AACH,SAAS,mBAAmB,CACpB,YAAoB,EACpB,YAAoB,EACpB,SAAiB;IAErB,OAAO,UAAS,IAAU;QACtB,MAAM,UAAU,GAAsB,EAAE,CAAC;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;YAEpB,IAAI,uBAAuB,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC;gBAC7C,SAAS;YACb,CAAC;YAED,IAAI,EAAE,GAAG,yBAAyB,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;YAEhE,EAAE,GAAG,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClC,EAAE,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAExC,MAAM,oBAAoB,GACtB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAErE,UAAU,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;QAC7C,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}