flo-mat 3.0.0 → 3.0.2

package/node/mat/{is-another-cp-closeby.js → get-closeby-cp-if-exist.js}

@@ -1,30 +1,29 @@
 import { distanceBetween, toUnitVector, fromTo, dot } from 'flo-vector2d';
-import { getNeighbouringPoints } from './get-neighboring-cps.js';
+import { getCpNodeToLeftOrSame } from './get-cp-node-to-left-or-same.js';
 /** @internal */
-const DEGREES = 3;
+const DEGREES = 1;
 const ANGLE_THRESHOLD = Math.cos(DEGREES * (Math.PI / 180));
 /**
  * @internal
  * If another `CpNode` is close by (to the given implied (via `pos`, `order` and
  * `order2`) then return it, else return `undefined`.
  *
- * @param cpTrees
+ * @param meta
  * @param pos
  * @param circle
  * @param order
  * @param order2
- * @param extreme The maximum coordinate value used to calculate floating point
- * tolerances.
- * @param color Used for debugging only
  */
-function isAnotherCpCloseby(cpTrees, pos, circle, order, order2, extreme) {
-    const DISTANCE_THRESHOLD = extreme * 2e-14;
+function getCloseByCpIfExist(meta, pos, circle, order, order2, forProngCount) {
+    const { cpTrees, maxCoordinate } = meta;
+    const DISTANCE_THRESHOLD = maxCoordinate * 2e-14;
     const DISTANCE_THRESHOLD_2 = DISTANCE_THRESHOLD * 2e-2;
     const cpTree = cpTrees.get(pos.curve.loop);
-    const cpNodes = getNeighbouringPoints(cpTree, pos, order, order2);
-    if (!cpNodes[0]) {
+    const cur = getCpNodeToLeftOrSame(cpTree, pos, order, order2);
+    if (!cur) {
         return undefined;
     }
+    const cpNodes = [cur, cur.next];
     const { p, t } = pos;
     for (const cpNode of cpNodes) {
         const pos2 = cpNode.cp.pointOnShape;
@@ -38,11 +37,16 @@ function isAnotherCpCloseby(cpTrees, pos, circle, order, order2, extreme) {
         const cosTheta = dot(v1, v2);
         if (cosTheta > ANGLE_THRESHOLD ||
             (d < DISTANCE_THRESHOLD_2 && t !== 0 && t !== 1)) {
-            // console.log(d, DISTANCE_THRESHOLD2)
+            if (forProngCount === 3) {
+                // console.log(cosTheta, d);
+                // console.log(t);
+                // console.log(d, DISTANCE_THRESHOLD_2)
+                // console.log(p,p2);
+            }
             return cpNode;
         }
     }
     return undefined;
 }
-export { isAnotherCpCloseby };
-//# sourceMappingURL=is-another-cp-closeby.js.map
+export { getCloseByCpIfExist };
+//# sourceMappingURL=get-closeby-cp-if-exist.js.map

package/node/mat/get-closeby-cp-if-exist.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-closeby-cp-if-exist.js","sourceRoot":"","sources":["../../src/mat/get-closeby-cp-if-exist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAK1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAIzE,gBAAgB;AAChB,MAAM,OAAO,GAAG,CAAC,CAAC;AAClB,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;AAG5D;;;;;;;;;;GAUG;AACH,SAAS,mBAAmB,CACpB,IAAa,EACb,GAAiB,EACjB,MAAc,EACd,KAAa,EACb,MAAc,EACd,aAAsB;IAE1B,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAExC,MAAM,kBAAkB,GAAG,aAAa,GAAG,KAAK,CAAC;IACjD,MAAM,oBAAoB,GAAG,kBAAkB,GAAG,IAAI,CAAC;IAEvD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;QAAC,OAAO,SAAS,CAAC;IAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IACrB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAClB,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC;YACzB,SAAS;QACb,CAAC;QAED,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7D,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;QAE5B,IAAI,QAAQ,GAAG,eAAe;YAC1B,CAAC,CAAC,GAAG,oBAAoB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAEnD,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;gBACtB,4BAA4B;gBAC5B,kBAAkB;gBAClB,uCAAuC;gBACvC,qBAAqB;YACzB,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/node/mat/get-cp-node-to-left-or-same.d.ts

@@ -0,0 +1,18 @@
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { CpNode } from '../cp-node/cp-node.js';
+/**
+ * @internal
+ *
+ * Returns the predecessor `CpNode` in the `CpTree` or the same one if they fall
+ * on top of each other.
+ *
+ * * returns `undefined` if the tree is still empty
+ *
+ * @param cpTree
+ * @param pos
+ * @param order
+ * @param order2
+ */
+declare function getCpNodeToLeftOrSame(cpTree: LlRbTree<CpNode>, pos: PointOnShape, order: number, order2: number): CpNode | undefined;
+export { getCpNodeToLeftOrSame };

package/node/mat/get-cp-node-to-left-or-same.js

@@ -0,0 +1,29 @@
+/**
+ * @internal
+ *
+ * Returns the predecessor `CpNode` in the `CpTree` or the same one if they fall
+ * on top of each other.
+ *
+ * * returns `undefined` if the tree is still empty
+ *
+ * @param cpTree
+ * @param pos
+ * @param order
+ * @param order2
+ */
+function getCpNodeToLeftOrSame(cpTree, pos, order, order2) {
+    const cp = { pointOnShape: pos, order, order2 };
+    const cps = cpTree.findBounds({ cp });
+    if (cps[0] === undefined && cps[1] === undefined) {
+        // The tree is still empty
+        return undefined;
+    }
+    if (cps[0] === undefined || cps[1] === undefined) {
+        // Smaller than all -> cptree.min() === cps[1].data OR
+        // Larger  than all -> cptree.max() === cps[0].data
+        return cpTree.max(cpTree.root);
+    }
+    return cps[0].datum;
+}
+export { getCpNodeToLeftOrSame };
+//# sourceMappingURL=get-cp-node-to-left-or-same.js.map

package/node/mat/get-cp-node-to-left-or-same.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-cp-node-to-left-or-same.js","sourceRoot":"","sources":["../../src/mat/get-cp-node-to-left-or-same.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,SAAS,qBAAqB,CACtB,MAAwB,EACxB,GAAiB,EACjB,KAAa,EACb,MAAc;IAElB,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,EAAuB,CAAC,CAAC;IAE3D,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC/C,0BAA0B;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC/C,sDAAsD;QACtD,mDAAmD;QACnD,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACxB,CAAC;AAGD,OAAO,EAAE,qBAAqB,EAAE,CAAA"}

package/node/mat/get-largest-vertex.d.ts

@@ -1,4 +1,4 @@
 import { CpNode } from '../cp-node/cp-node.js';
 /** @internal */
-declare function getLargestVertex(cpNodes: CpNode[]): CpNode;
+declare function getLargestVertex(cpNode: CpNode): CpNode;
 export { getLargestVertex };

package/node/mat/get-largest-vertex.js

@@ -1,5 +1,7 @@
+import { getAllOnLoop } from '../cp-node/fs/get-all-on-loop.js';
 /** @internal */
-function getLargestVertex(cpNodes) {
+function getLargestVertex(cpNode) {
+    const cpNodes = getAllOnLoop(cpNode);
     return cpNodes.reduce(function (maxCpNode, cpNode) {
         return maxCpNode.cp.circle.radius >= cpNode.cp.circle.radius
             ? maxCpNode

package/node/mat/get-largest-vertex.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-largest-vertex.js","sourceRoot":"","sources":["../../src/mat/get-largest-vertex.ts"],"names":[],"mappings":"AAGA,gBAAgB;AAChB,SAAS,gBAAgB,CAAC,OAAiB;IAC1C,OAAO,OAAO,CAAC,MAAM,CAAC,UAAS,SAAiB,EAAE,MAAc;QAC/D,OAAO,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM;YAC3D,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAA;IACV,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"get-largest-vertex.js","sourceRoot":"","sources":["../../src/mat/get-largest-vertex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,gBAAgB;AAChB,SAAS,gBAAgB,CAAC,MAAc;IACvC,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAErC,OAAO,OAAO,CAAC,MAAM,CAAC,UAAS,SAAiB,EAAE,MAAc;QAC/D,OAAO,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM;YAC3D,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAA;IACV,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

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

@@ -0,0 +1,24 @@
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Loop } from 'flo-boolean';
+import { CpNode } from '../cp-node/cp-node.js';
+import { Curve } from '../curve/curve.js';
+import { TriMap } from '../utils/tri-map.js';
+interface MatMeta {
+    readonly maxCoordinate: number;
+    readonly squaredDiagonalLength: number;
+    readonly looseBoundingBoxes: number[][][];
+    readonly tightBoundingBoxes: number[][][];
+    readonly boundingHulls: number[][][];
+    readonly sharpCorners: Curve[];
+    readonly dullCorners: Curve[];
+    readonly loops: Loop[];
+    /**
+     * Primarily for internal use. A tree structure storing the
+     * [[CpNode]]s of the MAT by their compare order, i.e. their cyclic order
+     * around the shape boundary.
+     */
+    readonly cpTrees: Map<Loop, LlRbTree<CpNode>>;
+    /** A map from a bezier and t value to a `PointOnShape` */
+    readonly pointToCpNode: TriMap<Loop, number, number, CpNode>;
+}
+export { MatMeta };

package/node/mat/mat-meta.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mat-meta.js.map

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

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

package/node/mat/mat.d.ts

@@ -1,6 +1,5 @@
-import { LlRbTree } from 'flo-ll-rb-tree';
 import { CpNode } from '../cp-node/cp-node.js';
-import { Loop } from 'flo-boolean';
+import { MatMeta } from './mat-meta.js';
 /**
  * Represents a complete Medial Axis Transform (MAT).
  *
@@ -13,10 +12,11 @@ interface Mat {
     /** A complete representation of the MAT. See [[CpNode]]. */
     cpNode: CpNode;
     /**
-     * Primarily for internal use. A tree structure storing the
-     * [[CpNode]]s of the MAT by their compare order, i.e. their cyclic order
-     * around the shape boundary.
+     * Stores additional info about the shape that could be useful for various
+     * purposes in post-processing.
+     *
+     * Most meta items have a CpNode property to link back to the MAT.
      */
-    cpTrees: Map<Loop, LlRbTree<CpNode>>;
+    meta: MatMeta;
 }
 export { Mat };

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

@@ -6,9 +6,9 @@ import { Mat } from './mat.js';
  * @param anlgeTolerance Tolerance given as the degrees difference of the unit
  * direction vectors at the interface between curves. A tolerance of zero means
  * perfect smoothness is required - defaults to 15.
-  * @param hausdorffTolerance The approximate maximum Hausdorff Distance tolerance -
+ * @param hausdorffTolerance The approximate maximum Hausdorff Distance tolerance -
  * defaults to `2**-3`
  * @param maxIterations The max iterations, defaults to `50`
  */
-declare function simplifyMat(mat: Mat, anlgeTolerance?: number, hausdorffTolerance?: number, maxIterations?: number): Mat;
+declare function simplifyMat(mat: Mat, hausdorffTolerance?: number, maxIterations?: number): Mat;
 export { simplifyMat };

package/node/mat/simplify-mat.js

@@ -1,8 +1,15 @@
-import { hausdorffDistance } from 'flo-bezier3';
-import { getCpNodesOnCircle, isTerminating, removeCpNode } from '../cp-node/cp-node.js';
+import { hausdorffDistanceOneSided } from 'flo-bezier3';
+import { removeVertex } from '../vertex/remove-vertex.js';
 import { getBranches } from './get-branches.js';
-import { getCurveToNext } from '../cp-node/get-curve-to-next.js';
-import { getCurveBetween } from '../get-curve/get-curve-between.js';
+import { getMatCurveToNext } from '../cp-node/fs/get-mat-curve-to-next.js';
+import { getMatCurveBetween } from '../cp-node/fs/get-mat-curve-between.js';
+import { createNewCpTree } from './create-new-cp-tree.js';
+import { clone } from '../cp-node/fs/clone.js';
+import { findFirst } from '../cp-node/fs/find-first.js';
+import { isTerminating } from '../cp-node/fs/is-terminating.js';
+import { isVertex } from '../cp-node/fs/is-vertex.js';
+import { getProngCount } from '../cp-node/fs/get-prong-count.js';
+// TODO2 could be made faster by binary "search" on hausdorff curves
 /**
  * Simplifies the given MAT by replacing the piecewise quad beziers composing
  * the MAT with fewer ones to within a given tolerance.
@@ -10,18 +17,18 @@ import { getCurveBetween } from '../get-curve/get-curve-between.js';
  * @param anlgeTolerance Tolerance given as the degrees difference of the unit
  * direction vectors at the interface between curves. A tolerance of zero means
  * perfect smoothness is required - defaults to 15.
-  * @param hausdorffTolerance The approximate maximum Hausdorff Distance tolerance -
+ * @param hausdorffTolerance The approximate maximum Hausdorff Distance tolerance -
  * defaults to `2**-3`
  * @param maxIterations The max iterations, defaults to `50`
  */
-function simplifyMat(mat, anlgeTolerance = 15, hausdorffTolerance = 2 ** -3, maxIterations = 50) {
-    let cpNode = mat.cpNode;
+function simplifyMat(mat, hausdorffTolerance = 2 ** -3, maxIterations = 50) {
+    let cpNode = clone(mat.cpNode);
     // Start from a leaf
     while (!isTerminating(cpNode)) {
         cpNode = cpNode.next;
     }
-    const branches = getBranches(cpNode, anlgeTolerance);
-    const canDeletes = [];
+    const branches = getBranches(cpNode);
+    const canDeletes = new Set();
     for (let k = 0; k < branches.length; k++) {
         const branch = branches[k];
         // Try to remove some
@@ -38,31 +45,35 @@ function simplifyMat(mat, anlgeTolerance = 15, hausdorffTolerance = 2 ** -3, max
                     break;
                 }
                 else {
-                    canDeletes.push(branch[j]);
+                    canDeletes.add(branch[j]);
                 }
             }
             if (i + 1 === j) {
                 // no simplification occured
-                break;
+                continue;
             }
         }
     }
+    cpNode = findFirst(cpNode_ => isTerminating(cpNode_) ? cpNode_ : undefined, cpNode);
     for (const cpNode of canDeletes) {
-        const isTerminating_ = isTerminating(cpNode);
-        const onCircleCount = getCpNodesOnCircle(cpNode).length;
-        if (isTerminating_ || onCircleCount !== 2) {
-            continue;
+        if (!isVertex(cpNode => (getProngCount(cpNode) !== 2) &&
+            !cpNode.isHoleClosing)(cpNode)) {
+            removeVertex(cpNode, mat.meta.cpTrees);
         }
-        removeCpNode(cpNode);
     }
-    //return { cpNode, cpTrees: createNewCpTree(cpNode) }; 
-    return { cpNode, cpTrees: undefined };
+    return {
+        cpNode,
+        meta: {
+            ...mat.meta,
+            cpTrees: createNewCpTree(cpNode)
+        }
+    };
 }
 function getTotalHausdorffDistance(i, j, branch, hausdorffSpacing) {
     const hds = [];
-    const longCurve = getCurveBetween(branch[i], branch[j].next);
+    const longCurve = getMatCurveBetween(branch[i], branch[j].next);
     for (; i < j + 1; i++) {
-        hds.push(hausdorffDistance(getCurveToNext(branch[i]), longCurve, hausdorffSpacing));
+        hds.push(hausdorffDistanceOneSided(getMatCurveToNext(branch[i]), longCurve, hausdorffSpacing));
     }
     return Math.max(...hds);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"simplify-mat.js","sourceRoot":"","sources":["../../src/mat/simplify-mat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAU,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAIpE;;;;;;;;;;GAUG;AACH,SAAS,WAAW,CACZ,GAAQ,EACR,cAAc,GAAG,EAAE,EACnB,kBAAkB,GAAG,CAAC,IAAE,CAAC,CAAC,EAC1B,aAAa,GAAG,EAAE;IAEtB,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAExB,oBAAoB;IACpB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;QAAE,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;KAAE;IAExD,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAErD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE3B,qBAAqB;QACrB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;YACtB,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,OAAO,IAAI,EAAE;gBACT,CAAC,EAAE,CAAC;gBAEJ,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE;oBAAE,MAAM;iBAAE;gBAEnC,MAAM,EAAE,GAAG,yBAAyB,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBAElE,IAAI,EAAE,GAAG,kBAAkB,EAAE;oBACzB,MAAM;iBACT;qBAAM;oBACH,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC9B;aACJ;YAED,IAAI,CAAC,GAAC,CAAC,KAAK,CAAC,EAAE;gBACX,4BAA4B;gBAC5B,MAAM;aACT;SACJ;KACJ;IAED,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;QAC7B,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QACxD,IAAI,cAAc,IAAI,aAAa,KAAK,CAAC,EAAE;YACvC,SAAS;SACZ;QAED,YAAY,CAAC,MAAM,CAAC,CAAC;KACxB;IAED,uDAAuD;IACvD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAU,EAAE,CAAC;AAC3C,CAAC;AAGD,SAAS,yBAAyB,CAC1B,CAAS,EACT,CAAS,EACT,MAAgB,EAChB,gBAAwB;IAE5B,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAC,CAAC,GAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACf,GAAG,CAAC,IAAI,CAAC,iBAAiB,CACtB,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EACzB,SAAS,EACT,gBAAgB,CACnB,CAAC,CAAC;KACN;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;AAC5B,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"simplify-mat.js","sourceRoot":"","sources":["../../src/mat/simplify-mat.ts"],"names":[],"mappings":"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"}

package/node/mat/trim-mat.js

@@ -1,6 +1,6 @@
 import { createNewCpTree } from './create-new-cp-tree.js';
 import { cullNonCycles } from '../sat/cull-non-cycles.js';
-import { clone } from '../cp-node/clone.js';
+import { clone } from '../cp-node/fs/clone.js';
 /**
  * Trims the given Medial Axis Transform so that only cycles remain. Similar to
  * toScaleAxis(mat, Number.POSITIVE_INFINITY).
@@ -11,7 +11,13 @@ function trimMat(mat) {
     if (!cpNode) {
         return undefined;
     }
-    return { cpNode, cpTrees: createNewCpTree(cpNode) };
+    return {
+        cpNode,
+        meta: {
+            ...mat.meta,
+            cpTrees: createNewCpTree(cpNode)
+        }
+    };
 }
 export { trimMat };
 //# sourceMappingURL=trim-mat.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"trim-mat.js","sourceRoot":"","sources":["../../src/mat/trim-mat.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAG5C;;;;GAIG;AACH,SAAS,OAAO,CAAC,GAAQ;IACxB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE;QAAE,OAAO,SAAU,CAAC;KAAE;IAEnC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;AACxD,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"trim-mat.js","sourceRoot":"","sources":["../../src/mat/trim-mat.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAG/C;;;;GAIG;AACH,SAAS,OAAO,CAAC,GAAQ;IACxB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;QAAC,OAAO,SAAU,CAAC;IAAC,CAAC;IAEnC,OAAO;QACH,MAAM;QACN,IAAI,EAAE;YACF,GAAG,GAAG,CAAC,IAAI;YACX,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC;SACnC;KACJ,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/node/memoize-primitive.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Memoize (by reference on the input parameter) the given arity 1 function.
+ *
+ * * also works with primitive keys
+ * * keys will *never* be garbage collected (even if they're not
+ * primitive); this may or may not be ok, depending on the use case
+ * * will also work with `object`s but since this will hold a reference and
+ * prevent garbage collection, rather use `memoize` instead
+ */
+declare function memoizePrimitive<T, U>(f: (a: T) => U): (a: T) => U;
+export { memoizePrimitive };

package/node/memoize-primitive.js

@@ -0,0 +1,25 @@
+/**
+ * Memoize (by reference on the input parameter) the given arity 1 function.
+ *
+ * * also works with primitive keys
+ * * keys will *never* be garbage collected (even if they're not
+ * primitive); this may or may not be ok, depending on the use case
+ * * will also work with `object`s but since this will hold a reference and
+ * prevent garbage collection, rather use `memoize` instead
+ */
+function memoizePrimitive(f) {
+    const results = new Map();
+    return function (a) {
+        let result = results.get(a);
+        if (result !== undefined) {
+            //console.log('cache hit');
+            return result;
+        }
+        //console.log('cache miss');
+        result = f(a);
+        results.set(a, result);
+        return result;
+    };
+}
+export { memoizePrimitive };
+//# sourceMappingURL=memoize-primitive.js.map

package/node/memoize-primitive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memoize-primitive.js","sourceRoot":"","sources":["../src/memoize-primitive.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,SAAS,gBAAgB,CAAO,CAAc;IAC7C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAO,CAAC;IAE/B,OAAO,UAAS,CAAI;QACnB,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,2BAA2B;YAC3B,OAAO,MAAM,CAAC;QACf,CAAC;QAED,4BAA4B;QAC5B,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAEvB,OAAO,MAAM,CAAC;IACf,CAAC,CAAA;AACF,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/point-on-shape/calc-pos-order.js

@@ -1,6 +1,5 @@
 import { dot, fromTo, rotateNeg90Degrees, toUnitVector } from "flo-vector2d";
 import { isPosCorner } from './is-pos-corner.js';
-import { isPosDullCorner } from "./is-pos-dull-corner.js";
 import { getPosCorner } from './get-pos-corner.js';
 /**
  * @internal
@@ -15,7 +14,7 @@ function calcPosOrder(circle, pos) {
     if (!isPosCorner(pos)) {
         return 0;
     }
-    if (!isPosDullCorner(pos)) {
+    if (!getPosCorner(pos).isDull) {
         return 0;
     }
     const corner = getPosCorner(pos);

package/node/point-on-shape/calc-pos-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"calc-pos-order.js","sourceRoot":"","sources":["../../src/point-on-shape/calc-pos-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD;;;;;;;;GAQG;AACH,SAAS,YAAY,CACb,MAAc,EACd,GAAiB;IAErB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC;KAAE;IACpC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC;KAAE;IAExC,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAEjC,MAAM,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,YAAY,CAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAE,CAAC;IAEvD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACtB,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"calc-pos-order.js","sourceRoot":"","sources":["../../src/point-on-shape/calc-pos-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD;;;;;;;;GAQG;AACH,SAAS,YAAY,CACb,MAAc,EACd,GAAiB;IAErB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,CAAC,CAAC;IAAC,CAAC;IACpC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QAAC,OAAO,CAAC,CAAC;IAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAEjC,MAAM,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,YAAY,CAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAE,CAAC;IAEvD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACtB,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/point-on-shape/compare-poss.js.map

@@ -1 +1 @@
-{"version":3,"file":"compare-poss.js","sourceRoot":"","sources":["../../src/point-on-shape/compare-poss.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,SAAS,WAAW,CACZ,CAAe,EACf,CAAe;IAEnB,IAAI,GAAG,CAAC;IAER,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IAChC,IAAI,GAAG,KAAK,CAAC,EAAE;QAAE,OAAO,GAAG,CAAC;KAAE;IAE9B,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEhB,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"compare-poss.js","sourceRoot":"","sources":["../../src/point-on-shape/compare-poss.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,SAAS,WAAW,CACZ,CAAe,EACf,CAAe;IAEnB,IAAI,GAAG,CAAC;IAER,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;IAChC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QAAC,OAAO,GAAG,CAAC;IAAC,CAAC;IAE9B,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEhB,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/point-on-shape/create-pos.d.ts

@@ -1,4 +1,4 @@
 import { Curve } from "../curve/curve.js";
 import { PointOnShape } from "./point-on-shape.js";
-declare function createPos(curve: Curve, t: number, source: boolean): PointOnShape;
+declare function createPos(curve: Curve, t: number, isSource?: boolean): PointOnShape;
 export { createPos };

package/node/point-on-shape/create-pos.js

@@ -1,11 +1,10 @@
 import { evalDeCasteljauDd } from "flo-bezier3";
-function createPos(curve, t, source) {
+function createPos(curve, t, isSource) {
     return {
         curve,
         t,
         p: evalDeCasteljauDd(curve.ps, [0, t]).map(c => c[1]),
-        // angle
-        source
+        isSource: isSource === undefined ? false : isSource
     };
 }
 export { createPos };

package/node/point-on-shape/create-pos.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-pos.js","sourceRoot":"","sources":["../../src/point-on-shape/create-pos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAK/C,SAAS,SAAS,CACV,KAAY,EACZ,CAAS,EACT,MAAe;IAEnB,OAAO;QACH,KAAK;QACL,CAAC;QACD,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,QAAQ;QACR,MAAM;KACT,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"create-pos.js","sourceRoot":"","sources":["../../src/point-on-shape/create-pos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAK/C,SAAS,SAAS,CACV,KAAY,EACZ,CAAS,EACT,QAAkB;IAEtB,OAAO;QACH,KAAK;QACL,CAAC;QACD,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,QAAQ,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ;KACtD,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/point-on-shape/get-osculating-circle.d.ts

@@ -2,9 +2,11 @@ import { Circle } from '../geometry/circle.js';
 import { PointOnShape } from './point-on-shape.js';
 /**
  * Returns the osculating circle at this point of the curve.
- * @param maxOsculatingCircleRadius If not Number.POSITIVE_INFINITY then the
+ *
+ * @param minCurvature If not Number.POSITIVE_INFINITY then the
  * circle radius will be limited to this value.
  * @param pos The [[PointOnShape]] identifying the point.
+ * @param useMaxRadius
  */
 declare function getOsculatingCircle(minCurvature: number, pos: PointOnShape, useMaxRadius?: boolean): Circle;
 export { getOsculatingCircle };

package/node/point-on-shape/get-osculating-circle.js

@@ -1,11 +1,15 @@
 import { tangentExact, ddCurvature } from 'flo-bezier3';
 /**
  * Returns the osculating circle at this point of the curve.
- * @param maxOsculatingCircleRadius If not Number.POSITIVE_INFINITY then the
+ *
+ * @param minCurvature If not Number.POSITIVE_INFINITY then the
  * circle radius will be limited to this value.
  * @param pos The [[PointOnShape]] identifying the point.
+ * @param useMaxRadius
  */
-function getOsculatingCircle(minCurvature, pos, useMaxRadius = false) {
+function getOsculatingCircle(minCurvature, pos, 
+// pos: { p: number[], t: number },
+useMaxRadius = false) {
     const ps = pos.curve.ps;
     const { p, t } = pos;
     let k = -ddCurvature(ps, t);

package/node/point-on-shape/get-osculating-circle.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-osculating-circle.js","sourceRoot":"","sources":["../../src/point-on-shape/get-osculating-circle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAMxD;;;;;GAKG;AACH,SAAS,mBAAmB,CACpB,YAAoB,EACpB,GAAiB,EACjB,YAAY,GAAG,KAAK;IAExB,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;IACxB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IAErB,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5B,IAAI,CAAC,GAAG,YAAY,IAAI,YAAY,EAAE;QAClC,CAAC,GAAG,YAAY,CAAC;KACpB;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG;QACjB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC;KAC1B,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC;AACjD,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"get-osculating-circle.js","sourceRoot":"","sources":["../../src/point-on-shape/get-osculating-circle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAMxD;;;;;;;GAOG;AACH,SAAS,mBAAmB,CACpB,YAAoB,EACpB,GAAiB;AACjB,mCAAmC;AACnC,YAAY,GAAG,KAAK;IAExB,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;IACxB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IAErB,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5B,IAAI,CAAC,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;QACnC,CAAC,GAAG,YAAY,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG;QACjB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC;KAC1B,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC;AACjD,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/node/point-on-shape/get-pos-corner.js

@@ -1,9 +1,11 @@
-import { getCornerAtEnd } from "../curve/curve.js";
+import { getCorner } from "../corner/get-corner.js";
 /**
  * @internal
  */
+// const getPosCorner$ = memoize(
 function getPosCorner(pos) {
-    return getCornerAtEnd(pos.t === 1 ? pos.curve : pos.curve.prev);
+    return getCorner(pos.t === 1 ? pos.curve.ps : pos.curve.prev.ps, pos.t === 1 ? pos.curve.next.ps : pos.curve.ps);
 }
+// );
 export { getPosCorner };
 //# sourceMappingURL=get-pos-corner.js.map

package/node/point-on-shape/get-pos-corner.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-pos-corner.js","sourceRoot":"","sources":["../../src/point-on-shape/get-pos-corner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKnD;;GAEG;AACH,SAAS,YAAY,CAAC,GAAiB;IACnC,OAAO,cAAc,CACjB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAC3C,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"get-pos-corner.js","sourceRoot":"","sources":["../../src/point-on-shape/get-pos-corner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD;;GAEG;AACH,iCAAiC;AAC7B,SAAS,YAAY,CAAC,GAAiB;IACnC,OAAO,SAAS,CACZ,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAC9C,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACjD,CAAC;AACN,CAAC;AACL,KAAK;AAGL,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/point-on-shape/is-pos-quite-sharp-corner.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-pos-quite-sharp-corner.js","sourceRoot":"","sources":["../../src/point-on-shape/is-pos-quite-sharp-corner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD;;GAEG;AACH,MAAM,qBAAqB,GAAG,OAAO,CAAC,CAAC,GAAiB,EAAE,EAAE;IACxD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;KAAE;IAExC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;AAC1C,CAAC,CAAC,CAAC;AAGH,OAAO,EAAE,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"is-pos-quite-sharp-corner.js","sourceRoot":"","sources":["../../src/point-on-shape/is-pos-quite-sharp-corner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD;;GAEG;AACH,MAAM,qBAAqB,GAAG,OAAO,CAAC,CAAC,GAAiB,EAAE,EAAE;IACxD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,KAAK,CAAC;IAAC,CAAC;IAExC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;AAC1C,CAAC,CAAC,CAAC;AAGH,OAAO,EAAE,qBAAqB,EAAE,CAAA"}

package/node/point-on-shape/is-pos-sharp-corner.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-pos-sharp-corner.js","sourceRoot":"","sources":["../../src/point-on-shape/is-pos-sharp-corner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD;;GAEG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,GAAiB,EAAE,EAAE;IACnD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;KAAE;IAExC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;AACrC,CAAC,CAAC,CAAC;AAGH,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"is-pos-sharp-corner.js","sourceRoot":"","sources":["../../src/point-on-shape/is-pos-sharp-corner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD;;GAEG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,GAAiB,EAAE,EAAE;IACnD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,KAAK,CAAC;IAAC,CAAC;IAExC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;AACrC,CAAC,CAAC,CAAC;AAGH,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/point-on-shape/point-on-shape.d.ts

@@ -6,6 +6,6 @@ interface PointOnShape {
     t: number;
     p: number[];
     /** just for debugging */
-    source: boolean;
+    isSource?: boolean;
 }
 export { PointOnShape };

package/node/sat/add-debug-info.d.ts

@@ -1,7 +1,6 @@
-import { Mat } from '../mat/mat.js';
 /**
  * @internal
  * @param sat
  */
-declare function addDebugInfo(sat: Mat, timingStart: number): void;
+declare function addDebugInfo(timingStart: number): void;
 export { addDebugInfo };

package/node/sat/add-debug-info.js

@@ -2,11 +2,10 @@
  * @internal
  * @param sat
  */
-function addDebugInfo(sat, timingStart) {
+function addDebugInfo(timingStart) {
     if (typeof _debug_ === 'undefined') {
         return;
     }
-    _debug_.generated.elems.sat.push(sat);
     const timing = _debug_.generated.timing;
     timing.sats = performance.now() - timingStart;
 }

package/node/sat/add-debug-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-debug-info.js","sourceRoot":"","sources":["../../src/sat/add-debug-info.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,SAAS,YAAY,CACnB,GAAQ,EACR,WAAmB;IAEpB,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAAE,OAAO;KAAE;IAE/C,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;IACxC,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC;AAC/C,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"add-debug-info.js","sourceRoot":"","sources":["../../src/sat/add-debug-info.ts"],"names":[],"mappings":"AAKA;;;GAGG;AACH,SAAS,YAAY,CACnB,WAAmB;IAEpB,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;QAAC,OAAO;IAAC,CAAC;IAE/C,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;IACxC,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC;AAC/C,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/sat/cull-non-cycles.js

@@ -1,5 +1,6 @@
 import { getLeaves } from './get-leaves.js';
-import { getProngCount, isOnSameCircle, isTerminating } from '../cp-node/cp-node.js';
+import { CpNodeFs } from '../cp-node/cp-node-fs.js';
+const { getProngCount, isOnSameCircle, isTerminating } = CpNodeFs;
 /**
  * @internal
  * Cull all edges not part of a cycle in the MAT planar graph.
@@ -23,7 +24,6 @@ function cullNonCycles(cpStart) {
             if (getProngCount(cpNode) > 2) {
                 //const cp2 = cp1.prevOnCircle;
                 const cp2 = cpNode.nextOnCircle;
-                //if (cpStart === cpNode || cpStart === cp1 || cpStart === cp2) {
                 if (isOnSameCircle(cpNode, cpStart)) {
                     cut = true; // We are at the max disk - cut whole edge
                 }

package/node/sat/cull-non-cycles.js.map

@@ -1 +1 @@
-{"version":3,"file":"cull-non-cycles.js","sourceRoot":"","sources":["../../src/sat/cull-non-cycles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAU,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG7F;;;;;GAKG;AACH,SAAS,aAAa,CAAC,OAAe;IAElC,IAAI,UAAU,GAAG,OAAO,CAAC;IAEzB,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAGlC,OAAO,MAAM,CAAC,MAAM,EAAE;QAClB,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,EAAG,CAAC;QAE3B,mCAAmC;QACnC,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;YAAE,SAAS;SAAE;QAE5D,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc;QAEtC,OAAO,IAAI,EAAE;YACT,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;YACrB,IAAI,GAAG,GAAG,KAAK,CAAC;YAChB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;YAEhC,IAAI,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;gBAC3B,+BAA+B;gBAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEhC,iEAAiE;gBACjE,IAAI,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;oBACjC,GAAG,GAAG,IAAI,CAAC,CAAC,0CAA0C;iBACzD;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;oBAC5B,MAAM,GAAG,GAAG,CAAC;iBAChB;qBAAM,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;oBACzB,GAAG,GAAG,IAAI,CAAC,CAAC,iBAAiB;iBAChC;aACJ;iBAAM,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;gBACxD,UAAU,GAAG,MAAM,CAAC;gBACpB,OAAO,SAAS,CAAC;aACpB;YAED,IAAI,GAAG,EAAE;gBACL,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;gBAClB,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC;gBAElB,UAAU,GAAG,MAAM,CAAC;gBACpB,MAAM;aACT;SACJ;KACJ;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}
+{"version":3,"file":"cull-non-cycles.js","sourceRoot":"","sources":["../../src/sat/cull-non-cycles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;AAGlE;;;;;GAKG;AACH,SAAS,aAAa,CAAC,OAAe;IAElC,IAAI,UAAU,GAAG,OAAO,CAAC;IAEzB,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAGlC,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,EAAG,CAAC;QAE3B,mCAAmC;QACnC,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAE5D,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc;QAEtC,OAAO,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;YACrB,IAAI,GAAG,GAAG,KAAK,CAAC;YAChB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;YAEhC,IAAI,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,+BAA+B;gBAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEhC,IAAI,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;oBAClC,GAAG,GAAG,IAAI,CAAC,CAAC,0CAA0C;gBAC1D,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;oBAC7B,MAAM,GAAG,GAAG,CAAC;gBACjB,CAAC;qBAAM,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;oBAC1B,GAAG,GAAG,IAAI,CAAC,CAAC,iBAAiB;gBACjC,CAAC;YACL,CAAC;iBAAM,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;gBACzD,UAAU,GAAG,MAAM,CAAC;gBACpB,OAAO,SAAS,CAAC;YACrB,CAAC;YAED,IAAI,GAAG,EAAE,CAAC;gBACN,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;gBAClB,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC;gBAElB,UAAU,GAAG,MAAM,CAAC;gBACpB,MAAM;YACV,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/node/sat/cull.d.ts

@@ -1,5 +1,5 @@
-import { Circle } from '../geometry/circle.js';
 import { CpNode } from '../cp-node/cp-node.js';
+import { DualSet } from '../utils/dual-set.js';
 /**
  * @internal
  * Returns the set of Vertices passing the following test: walk the MAT tree and
@@ -8,5 +8,5 @@ import { CpNode } from '../cp-node/cp-node.js';
  * @param culls The CpNodes (referred to by circles) that should be culled.
  * @param maxCpNode The start CpNode which must reprsesent the maximal vertex.
  */
-declare function cull(culls: Set<Circle>, maxCpNode: CpNode): void;
+declare function cull(culls: DualSet<number, number>, maxCpNode: CpNode): void;
 export { cull };