flo-mat 4.1.2 → 4.1.4

package/node/mat/add-to-cp-tree.d.ts

@@ -3,6 +3,9 @@ import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
 import type { CpNode } from '../cp-node/cp-node.js';
 import type { MatMeta } from '../mat/mat-meta.js';
 /**
+ * Insert the given `poss` into the `cpTree` (within `meta`) and returns the
+ * newly inserted `CpNode`s.
+ *
  * @param circle
  * @param orders
  * @param cpTrees
@@ -11,7 +14,7 @@ import type { MatMeta } from '../mat/mat-meta.js';
  *
  * @internal
  */
-declare function addToCpTree(insertIfOrderIsWrong: boolean, isHoleClosing: boolean, circle: Circle, orders: number[], meta: MatMeta, poss: PrePointOnShape[], neighbors?: CpNode[]): {
+declare function addToCpTree(insertIfOrderIsWrong: boolean, isHoleClosing: boolean, circle: Circle, orders: number[], meta: MatMeta, poss: PrePointOnShape[], neighbors?: [CpNode, CpNode][]): {
     anyFailed: boolean;
     cpNodes: (CpNode | undefined)[];
 };

package/node/mat/add-to-cp-tree.js

@@ -1,7 +1,10 @@
-import { getCpNodeToLeftOrSame } from './get-cp-node-to-left-or-same.js';
+import { getCpNodeNeighbors } from './get-cp-node-neighbors.js';
 import { insertCpNode } from '../cp-node/fs/insert-cp-node.js';
 import { joinSpokes } from '../add-n-prong.ts/join-spokes.js';
 /**
+ * Insert the given `poss` into the `cpTree` (within `meta`) and returns the
+ * newly inserted `CpNode`s.
+ *
  * @param circle
  * @param orders
  * @param cpTrees
@@ -17,10 +20,14 @@ function addToCpTree(insertIfOrderIsWrong, isHoleClosing, circle, orders, meta,
         const order = orders[i];
         const cpTree = cpTrees.get(ppos.curve.loop);
         const pos = { ...ppos, circle, order, order2: 0 };
-        const pred = neighbors === undefined
-            ? getCpNodeToLeftOrSame(cpTree, ppos, order, 0)
+        const r = neighbors === undefined
+            ? getCpNodeNeighbors(cpTree, ppos, order, 0)
             : neighbors[i];
-        const cpNode = insertCpNode(insertIfOrderIsWrong, isHoleClosing, false, cpTree, pos, pred, meta.lastInsertId);
+        const pred = r?.[0];
+        const succ = r?.[1];
+        const cpNode = insertCpNode(insertIfOrderIsWrong, isHoleClosing, false, cpTree, pos, pred, 
+        // pred?.next,
+        succ, meta.lastInsertId);
         if (cpNode === undefined) {
             anyFailed = true;
         }

package/node/mat/add-to-cp-tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-to-cp-tree.js","sourceRoot":"","sources":["../../src/mat/add-to-cp-tree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAG9D;;;;;;;;GAQG;AACH,SAAS,WAAW,CACZ,oBAA6B,EAC7B,aAAsB,EACtB,MAAc,EACd,MAAgB,EAChB,IAAa,EACb,IAAuB,EACvB,SAAoB;IAExB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAC,CAAC,EAAE,EAAE;QAChC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;QAC7C,MAAM,GAAG,GAAiB,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAEhE,MAAM,IAAI,GAAG,SAAS,KAAK,SAAS;YAChC,CAAC,CAAC,qBAAqB,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/C,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEnB,MAAM,MAAM,GAAG,YAAY,CACvB,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,MAAM,EACN,GAAG,EACH,IAAI,EACJ,IAAI,CAAC,YAAY,CACpB,CAAC;QAEF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS,GAAG,IAAI,CAAC;QAAC,CAAC;QAE/C,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,UAAU,CAAC,MAAM,EAAE,OAAmB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AAClC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"add-to-cp-tree.js","sourceRoot":"","sources":["../../src/mat/add-to-cp-tree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAG9D;;;;;;;;;;;GAWG;AACH,SAAS,WAAW,CACZ,oBAA6B,EAC7B,aAAsB,EACtB,MAAc,EACd,MAAgB,EAChB,IAAa,EACb,IAAuB,EACvB,SAA6B;IAEjC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAC,CAAC,EAAE,EAAE;QAChC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;QAC7C,MAAM,GAAG,GAAiB,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAEhE,MAAM,CAAC,GAAG,SAAS,KAAK,SAAS;YAC7B,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5C,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEnB,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpB,MAAM,MAAM,GAAG,YAAY,CACvB,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,MAAM,EACN,GAAG,EACH,IAAI;QACJ,cAAc;QACd,IAAI,EACJ,IAAI,CAAC,YAAY,CACpB,CAAC;QAEF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAAC,SAAS,GAAG,IAAI,CAAC;QAAC,CAAC;QAE/C,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,UAAU,CAAC,MAAM,EAAE,OAAmB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AAClC,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/mat/get-boundary-piece-beziers.d.ts

@@ -1,12 +1,12 @@
 import type { CpNode } from '../cp-node/cp-node.js';
 import type { CurvePiece } from './curve-piece.js';
 /**
- * Returns the ordered bezier pieces between from the given boundary piece.
+ * Returns the ordered bezier pieces between the two given `CpNode`s.
  *
  * @param cpNodes - An ordered pair that represents the start and end points of
  * the boundary piece
  *
  * @internal
  */
-declare function getBoundaryPieceBeziers(cpNodes: CpNode[]): CurvePiece[];
+declare function getBoundaryPieceBeziers(cpNodes: [CpNode, CpNode]): CurvePiece[];
 export { getBoundaryPieceBeziers };

package/node/mat/get-boundary-piece-beziers.js

@@ -1,6 +1,6 @@
 import { comparePoss } from '../point-on-shape/compare-poss.js';
 /**
- * Returns the ordered bezier pieces between from the given boundary piece.
+ * Returns the ordered bezier pieces between the two given `CpNode`s.
  *
  * @param cpNodes - An ordered pair that represents the start and end points of
  * the boundary piece

package/node/mat/get-boundary-piece-beziers.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-boundary-piece-beziers.js","sourceRoot":"","sources":["../../src/mat/get-boundary-piece-beziers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-boundary-piece-beziers.js","sourceRoot":"","sources":["../../src/mat/get-boundary-piece-beziers.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
 import { distanceBetween, toUnitVector, fromTo, dot } from 'flo-vector2d';
-import { getCpNodeToLeftOrSame } from './get-cp-node-to-left-or-same.js';
+import { getCpNodeNeighbors } from './get-cp-node-neighbors.js';
 /** @internal */
 const DEGREES = 1;
 const ANGLE_THRESHOLD = Math.cos(DEGREES * (Math.PI / 180));
@@ -19,7 +19,7 @@ function getCloseByCpIfExist(meta, pos, circle, order, order2, forProngCount) {
     const DISTANCE_THRESHOLD = 2 ** (maxCoordPowerOf2 - 40); // approx. 1e-9 for 1024 x 1024 shapes
     const DISTANCE_THRESHOLD_2 = 2 ** (maxCoordPowerOf2 - 46);
     const cpTree = cpTrees.get(pos.curve.loop);
-    const cur = getCpNodeToLeftOrSame(cpTree, pos, order, order2);
+    const cur = getCpNodeNeighbors(cpTree, pos, order, order2)?.[0];
     if (!cur) {
         return undefined;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"get-closeby-cp-if-exist.js","sourceRoot":"","sources":["../../src/mat/get-closeby-cp-if-exist.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,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,GAAoB,EACpB,MAAc,EACd,KAAa,EACb,MAAc,EACd,aAAsB;IAE1B,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAE3C,MAAM,kBAAkB,GAAG,CAAC,IAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC,CAAE,sCAAsC;IAC9F,MAAM,oBAAoB,GAAG,CAAC,IAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;IAExD,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,YAAY,CAAC;QACjC,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;QACD,iBAAiB;QAEjB,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACvE,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"}
+{"version":3,"file":"get-closeby-cp-if-exist.js","sourceRoot":"","sources":["../../src/mat/get-closeby-cp-if-exist.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE,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,GAAoB,EACpB,MAAc,EACd,KAAa,EACb,MAAc,EACd,aAAsB;IAE1B,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAE3C,MAAM,kBAAkB,GAAG,CAAC,IAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC,CAAE,sCAAsC;IAC9F,MAAM,oBAAoB,GAAG,CAAC,IAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;IAExD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChE,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,YAAY,CAAC;QACjC,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;QACD,iBAAiB;QAEjB,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACvE,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 → get-cp-node-neighbors.d.ts}

@@ -14,5 +14,5 @@ import { RbTree } from 'flo-ll-rb-tree';
  * @param order
  * @param order2
  */
-declare function getCpNodeToLeftOrSame(cpTree: RbTree<CpNode>, pos: PrePointOnShape, order: number, order2: number): CpNode | undefined;
-export { getCpNodeToLeftOrSame };
+declare function getCpNodeNeighbors(cpTree: RbTree<CpNode>, pos: PrePointOnShape, order: number, order2: number): [CpNode, CpNode] | undefined;
+export { getCpNodeNeighbors };

package/node/mat/get-cp-node-neighbors.js

@@ -0,0 +1,31 @@
+/**
+ * @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 getCpNodeNeighbors(cpTree, pos, order, order2) {
+    const pointOnShape = { ...pos, order, order2 };
+    const cps = cpTree.findBounds({ pointOnShape });
+    const [cp0, cp1] = cps;
+    if (cp0 === undefined && cp1 === undefined) {
+        // The tree is still empty
+        return undefined;
+    }
+    if (cp0 === undefined || cp1 === undefined) {
+        // Smaller than all OR larger than all
+        const minNode = cpTree.getMinNode()?.datum;
+        const maxNode = cpTree.getMaxNode()?.datum;
+        return [maxNode, minNode];
+    }
+    return [cp0.datum, cp1.datum];
+}
+export { getCpNodeNeighbors };
+//# sourceMappingURL=get-cp-node-neighbors.js.map

package/node/mat/get-cp-node-neighbors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-cp-node-neighbors.js","sourceRoot":"","sources":["../../src/mat/get-cp-node-neighbors.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,SAAS,kBAAkB,CACnB,MAAsB,EACtB,GAAoB,EACpB,KAAa,EACb,MAAc;IAElB,MAAM,YAAY,GAAG,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,YAAY,EAAY,CAAC,CAAC;IAC1D,MAAM,CAAC,GAAG,EAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAEtB,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACzC,0BAA0B;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACzC,sCAAsC;QACtC,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,EAAE,KAAM,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,EAAE,KAAM,CAAC;QAE5C,OAAO,CAAC,OAAO,EAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAGD,OAAO,EAAE,kBAAkB,EAAE,CAAA"}

package/package.json

@@ -2,7 +2,7 @@
     "name": "flo-mat",
     "sideEffects": false,
     "description": "Medial / Scale Axis Transform (MAT/SAT) Library.",
-    "version": "4.1.2",
+    "version": "4.1.4",
     "author": {
         "name": "Floris Steenkamp"
     },
@@ -33,10 +33,10 @@
     "dependencies": {
         "big-float-ts": "^4.0.4",
         "double-double": "^3.0.4",
-        "flo-bezier3": "^8.0.14",
+        "flo-bezier3": "^8.1.1",
         "flo-boolean": "^6.0.2",
         "flo-gauss-quadrature": "^2.1.4",
-        "flo-ll-rb-tree": "^1.0.1",
+        "flo-ll-rb-tree": "^1.0.4",
         "flo-memoize": "^2.0.1",
         "flo-poly": "^8.1.4",
         "flo-vector2d": "^4.0.6"
@@ -44,20 +44,20 @@
     "devDependencies": {
         "squares-rng": "^2.0.4",
         "@jest/globals": "^30.5.1",
-        "@swc/core": "^1.16.1",
+        "@swc/core": "^1.16.2",
         "@swc/jest": "^0.2.39",
         "@types/jest": "^30.0.0",
-        "@types/node": "^26.4.1",
+        "jest": "^30.5.1",
+        "jest-ts-webcompat-resolver": "^1.0.1",
+        "ts-node": "^10.9.2",
+        "@types/node": "^26.6.0",
         "c8": "^12.0.0",
         "cheerio": "^1.2.0",
         "circular-dependency-plugin": "^5.2.2",
-        "jest": "^30.5.1",
-        "jest-ts-webcompat-resolver": "^1.0.1",
         "rimraf": "^6.1.3",
         "ts-loader": "^9.6.2",
-        "ts-node": "^10.9.2",
         "typescript": "^6.0.3",
-        "webpack": "^5.110.3",
+        "webpack": "^5.111.0",
         "webpack-cli": "^7.2.3"
     },
     "scripts": {
@@ -68,8 +68,8 @@
         "test-package": "npm pack"
     },
     "allowScripts": {
-        "@swc/core@1.16.1": true,
         "unrs-resolver@1.12.2": true,
-        "@parcel/watcher@2.6.0": true
+        "@parcel/watcher@2.6.0": true,
+        "@swc/core@1.16.2": true
     }
 }

package/src/cp-node/fs/insert-cp-node.ts

@@ -5,19 +5,34 @@ import { RbTree } from "flo-ll-rb-tree";
 import { isOrderCorrect } from "./is-order-correct.js";
 
 
+/**
+ * 
+ * @param insertIfOrderWrong order cannot be checked for hole-closers since they're on different loops
+ * @param isHoleClosing 
+ * @param isIntersection 
+ * @param cpTree 
+ * @param pos 
+ * @param pred predecessor (to `pos`) on sampe loop (found via `cpTree`)
+ * @param succ successor (to `pos`) on sampe loop (found via `cpTree`)
+ * @param lastInsertId 
+ */
 function insertCpNode(
         insertIfOrderWrong: boolean,
         isHoleClosing: boolean,
         isIntersection: boolean,
         cpTree: RbTree<CpNode>,
         pos: PointOnShape,
-        _prev: CpNode | undefined,
+        pred: CpNode | undefined,
+        succ: CpNode | undefined,
         lastInsertId: { id: number }): CpNode | undefined {
 
-    if (_prev !== undefined &&
-        !isOrderCorrect(cpTree, pos, _prev.next)) {
-
-        if (!insertIfOrderWrong) {
+    if (pred !== undefined && succ !== undefined) {
+        // !isOrderCorrect(cpTree, pos, pred.next, false)) {
+        const orderCorrect = isOrderCorrect(cpTree, pred, pos, succ, false);
+        // if (!orderCorrect) {
+        //     console.log('aaaaa');
+        // }
+        if (!insertIfOrderWrong && !orderCorrect) {
             return undefined;
         }
     }
@@ -34,8 +49,8 @@ function insertCpNode(
     };
     lastInsertId.id++;
 
-    const prev = _prev === undefined ? cpNode : _prev;
-    const next = _prev === undefined ? cpNode : prev.next;
+    const prev = pred === undefined ? cpNode : pred;
+    const next = pred === undefined ? cpNode : prev.next;
 
     (next as Mutable<CpNode>).prev = cpNode;
     (prev as Mutable<CpNode>).next = cpNode;

package/src/cp-node/fs/is-order-correct copy.ts

@@ -0,0 +1,60 @@
+import type { CpNode } from "../cp-node.js";
+import { RbTree } from "flo-ll-rb-tree";
+import { PointOnShape } from "../../point-on-shape/point-on-shape.js";
+import { comparePoss } from "../../point-on-shape/compare-poss.js";
+
+
+/**
+ * 
+ * @param cpTree 
+ * @param pos 
+ * @param succ 
+ * @param alreadyInserted set to `true` if the given `pos` has already been
+ * inserted, `false` otherwise.
+ */
+function isOrderCorrect(
+        cpTree: RbTree<CpNode>,
+        pred: CpNode,
+        pos: PointOnShape,
+        succ: CpNode,
+        alreadyInserted: boolean): boolean {
+
+    if (cpTree.size <= (alreadyInserted ? 2 : 1)) {
+        return true;
+    }
+
+    const c = comparePoss(pos, succ.pointOnShape);
+
+
+    if (c < 0) { return true; }
+    if (c === 0) { return false; }
+
+    const minNode = cpTree.getMinNode()!.datum;
+    const maxNode = cpTree.getMaxNode()!.datum;
+
+    // larger than all -> crossing zero on loop
+    const largerThanAll = comparePoss(pos, maxNode.pointOnShape!) >= 0;
+    const r = 
+        largerThanAll &&
+        minNode === succ;
+
+
+    // const r = (pos === max.pointOnShape) && (next === min);
+
+    if (!r) {
+        console.log(c);
+        console.log(cpTree.toArr().map(v => {
+            return {
+                curveIdx: v.pointOnShape.curve.idx,
+                t: v.pointOnShape.t,
+                order: v.pointOnShape.order,
+                order2: v.pointOnShape.order2
+            }
+        }));
+    }
+
+    return r;
+}
+
+
+export { isOrderCorrect }

package/src/cp-node/fs/is-order-correct.ts

@@ -4,27 +4,75 @@ import { PointOnShape } from "../../point-on-shape/point-on-shape.js";
 import { comparePoss } from "../../point-on-shape/compare-poss.js";
 
 
+/**
+ * 
+ * @param cpTree 
+ * @param pos 
+ * @param succ 
+ * @param alreadyInserted set to `true` if the given `pos` has already been
+ * inserted, `false` otherwise.
+ */
 function isOrderCorrect(
         cpTree: RbTree<CpNode>,
+        pred: CpNode,
         pos: PointOnShape,
-        next: CpNode): boolean {
+        succ: CpNode,
+        alreadyInserted: boolean): boolean {
 
-    const c = comparePoss(pos, next.pointOnShape);
-    if (c < 0) { return true; }
-    if (c === 0) {
-        return false;
-    }
-
-    const minNode = cpTree.getMinNode();
-    if (minNode === undefined) {  // if tree not empty
+    if (cpTree.size <= (alreadyInserted ? 2 : 1)) {
         return true;
     }
 
-    const min = minNode.datum;
-    const max = cpTree.getMaxNode()!.datum;
+    const a = pred.pointOnShape;
+    const b = pos;
+    const c = succ.pointOnShape;
+
+    // Let a = pred, b = pos, and c = succ.
+    // For a cyclic order we need:
+    // `(a < b && b < c)` || `(b < c && c < a)` || `(c < a && a < b)`
+    // Let `X = a < b, Y = b < c, Z = c < a` then
+    // `(X && Y)` || `(Y && Z)` || `(Z && X)`
+
+    const _X = comparePoss(a, b);
+    if (_X === 0) {  // two points must have different order
+        // console.log('aaa');
+        // throw 'a';
+        return false;
+    }  
+    const _Y = comparePoss(b, c);
+    if (_Y === 0) {  // two points must have different order
+        // console.log('bbb');
+        // throw 'b';
+        return false;
+    }  
+    const _Z = comparePoss(c, a);
+    if (_Z === 0) {
+        // console.log('bbb');
+        // throw 'c';
+        return false;
+    }  // impossible anyway at this point
+
+    // Now neither `_X` nor `_Y` nor `_Z` === `0`
+    const X = _X < 0;
+    const Y = _Y < 0;
+    const Z = _Z < 0;
+
+    // Cyclic order condition
+    if ((X && Y) || (Y && Z) || (Z && X)) { return true; }
+
+    // throw 'd';
+
+    // console.log(_X, _Y, _Z);
+    // console.log(cpTree.toArr().map(v => {
+    //     return {
+    //         curveIdx: v.pointOnShape.curve.idx,
+    //         t: v.pointOnShape.t,
+    //         order: v.pointOnShape.order,
+    //         order2: v.pointOnShape.order2
+    //     }
+    // }));
 
-    // larger than all -> crossing zero on loop
-    return (comparePoss(max.pointOnShape!, pos) < 0 && min === next);
+    return false;
 }
 
 

package/src/cp-node/fs/remove-cp-node.ts

@@ -15,7 +15,7 @@ function removeCpNode(
     (next as Mutable<CpNode>).prev = prev;
 
     const cpTree = cpTrees.get(cpNode.pointOnShape.curve.loop)!;
-    cpTree.remove(cpNode, false); 
+    cpTree.remove(cpNode); 
 }
 
 

package/src/cp-node/stringification/from-stringifyable.ts

@@ -10,6 +10,7 @@ function fromStringifyable(
 
     const { cpNodes: _cpNodes, loops: _loops } = cpNodesStringifyable;
     const loops = _loops.map(loopFromStringifyable);
+    const loopsByIdx = new Map(loops.map(loop => [loop.idx, loop]));
 
     //--------------------------------------------------------------------------
     // First pass: build all CpNode objects with proper `cp`.
@@ -20,7 +21,7 @@ function fromStringifyable(
         const { circle, order, order2 } = pointOnShape;
         const { curveIdx, loopIdx, p, pDd, t, isSource } = pointOnShape;
 
-        const curve = loops[loopIdx].curves[curveIdx];
+        const curve = loopsByIdx.get(loopIdx)!.curves[curveIdx];
 
         const pointOnShape_: PointOnShape = {
             circle,

package/src/cp-node/stringification/to-stringifyable.ts

@@ -35,8 +35,8 @@ function toStringifyable(
         }
 
         const posSimplified: PointOnShapeSimplified = {
-            curveIdx, loopIdx: loop.idx!, p, t, isSource,
-            circle, order, order2, pDd,
+            curveIdx, loopIdx: loop.idx!, p, pDd, t, isSource,
+            circle, order, order2 
         };
 
         cpNodes_.push({

package/src/debug/functions/check-ordering.ts

@@ -4,7 +4,18 @@ import { CpNode } from "../../cp-node/cp-node.js";
 import { getAllOnLoop } from "../../cp-node/fs/get-all-on-loop.js";
 import { getProngCount } from "../../cp-node/fs/get-prong-count.js";
 import { isOrderCorrect } from "../../cp-node/fs/is-order-correct.js";
-import { comparePoss } from "../../point-on-shape/compare-poss.js";
+
+
+interface Order {
+    prongCount: number;
+    cpNode: CpNode;
+    p: number[];
+    /** From highest to lowest significance */
+    curveIdx: number;
+    t: number;
+    order: number;
+    order2: number;
+}
 
 
 function checkOrdering(
@@ -16,81 +27,53 @@ function checkOrdering(
     const cpNodes = getAllOnLoop(cpStart);
 
     const wrongsPerLoop: Map<Loop,[Order,Order][]> = new Map();
-    for (const cpNodeA of cpNodes) {
-        const cpNodeB = cpNodeA.next;
-
-        const posA = cpNodeA.pointOnShape;
-        const idxA = posA.curve.idx;
-        const pA = posA.p;
-        const loopA = posA.curve.loop;
-        const cpTreeA = cpTrees.get(loopA)!;
-
-        const posB = cpNodeB.pointOnShape;
-        const idxB = posB.curve.idx;
-        const pB = posB.p;
-        // const loopB = posB.curve.loop;
-        // const cpTreeB = cpTrees.get(loopB)!;
-        
+    for (const cpNode of cpNodes) {
+        const pos = cpNode.pointOnShape;
+        const loop = pos.curve.loop;
+
+        if (loop !== cpNode.prev.pointOnShape.curve.loop ||
+            loop !== cpNode.next.pointOnShape.curve.loop) {
+
+            continue;
+        }
+
+        const cpTree = cpTrees.get(loop)!;
+
         const orderCorrect = isOrderCorrect(
-            cpTreeA, posA, cpNodeB
-        )
+            cpTree, cpNode.prev, cpNode.pointOnShape, cpNode.next, true
+        );
         if (!orderCorrect) {
-            const A: Order = {
-                prongCount: getProngCount(cpNodeA),
-                p: pA,
-                cpNode: cpNodeA,
-                curveIdx: idxA,
-                t: posA.t,
-                order: posA.order,
-                order2: posA.order2
-            }
-            const B: Order = {
-                prongCount: getProngCount(cpNodeB),
-                p: pB,
-                cpNode: cpNodeB,
-                curveIdx: idxB,
-                t: posB.t,
-                order: posB.order,
-                order2: posB.order2
-            }
-            const loopA = A.cpNode.pointOnShape.curve.loop;
-            let wrongs = wrongsPerLoop.get(loopA);
-            if (wrongs === undefined) {
-                wrongs = [];
-                wrongsPerLoop.set(loopA, wrongs);
-            }
+            const A = toOrder(cpNode);
+            const B = toOrder(cpNode.next);
+
+            let wrongs = wrongsPerLoop.getOrInsert(loop, []);
             wrongs.push([A,B]);
         }
     }
 
     for (const [loop,wrongs] of wrongsPerLoop) {
-        let maxOrder = -Infinity;
-        let max: Order | undefined = undefined;
         for (const wrong of wrongs) {
             const A = wrong[0];
             const B = wrong[1];
-            const c = comparePoss(A.cpNode.pointOnShape, B.cpNode.pointOnShape);
-            if (c > maxOrder) { 
-                
-            }
-            // console.log(wrong[0]);
-            // console.log(wrong[1]);
-            // console.log('---------');
+            // const c = comparePoss(A.cpNode.pointOnShape, B.cpNode.pointOnShape);
+
+            console.log(A);
+            console.log(B);
+            console.log('---------');
         }
     }
-    // }
 }
 
 
-interface Order {
-    prongCount: number;
-    cpNode: CpNode;
-    p: number[];
-    /** From highest to lowest significance */
-    curveIdx: number;
-    t: number;
-    order: number;
-    order2: number;
+function toOrder(
+        cpNode: CpNode): Order {
+
+    const prongCount = getProngCount(cpNode);
+    const { pointOnShape } = cpNode;
+    const { p, t, order, order2, curve } = pointOnShape;
+    const curveIdx = curve.idx;
+
+    return { cpNode, prongCount, p, curveIdx, t, order, order2 };
 }
 
 

package/src/find-2-prong/add-2-prong.ts

@@ -90,6 +90,7 @@ function closeHole(
         cpTrees.get(posAntipode.curve.loop)!,
         { ...posAntipode, order2: +1 },
         cpNodeAntipode,
+        undefined,  // unused
         meta.lastInsertId
     )! as Mutable<CpNode>;
     cpNodeAntipodeTwin.holeCloserTwin = cpNodeAntipode;
@@ -100,8 +101,9 @@ function closeHole(
     const cpNodeSourceTwin = insertCpNode(
         true, true, false,
         cpTrees.get(posSource.curve.loop)!,
-        { ...cpNodeSource.pointOnShape!, order2: -1 },
+        { ...posSource!, order2: -1 },
         cpNodeSource.prev,
+        undefined,  // unused
         meta.lastInsertId
     )! as Mutable<CpNode>;
     cpNodeSourceTwin.holeCloserTwin = cpNodeSource;

package/src/find-2-prong/find-and-add-2-prongs.ts

@@ -37,7 +37,7 @@ function findAndAdd2Prongs(
     for (let i=0; i<for2Prongs.length; i++) {
         const pos = for2Prongs[i];
 
-        const angles = getValidAngles(angleIncrement_, pos);
+        const angles = for1Prong ? [0] : getValidAngles(angleIncrement_, pos);
 
         for (const angle of angles) {
             const twoProngInfo = find2Prong_(