flo-mat 3.0.7 → 3.0.10

package/src/cp-node/fs/get-boundary-bezier-parts-to-next.ts

@@ -13,7 +13,7 @@ import type { Curve  } from '../../curve/curve.js';
  * @param cpNode 
  */
 function getBoundaryBezierPartsToNext(
-        cpNode: CpNode): BezierPiece[] | undefined {
+        cpNode: CpNode): BezierPiece[] {
 
     const cpThis = cpNode; 
     const cpNext = cpNode.next;
@@ -27,27 +27,22 @@ function getBoundaryBezierPartsToNext(
     if (curveThis.loop !== curveNext.loop) {
         // It is a hole-closer going over to the other loop - a kind of terminal
         // CpNode.
-        return undefined;
+        // return undefined;
+        return [];
     }
     
     const bezierPieces: BezierPiece[] = [];
 
     if (curveNext === curveThis) {
         bezierPieces.push(
-            {
-                ps: posThis.curve.ps,
-                ts: [posThis.t, posNext.t]
-            }
+            { ps: posThis.curve.ps, ts: [posThis.t, posNext.t] }
         );
     } else {
         bezierPieces.push(
-            {
-                ps: posThis.curve.ps,
-                ts: [posThis.t, 1]
-            }
+            { ps: posThis.curve.ps, ts: [posThis.t, 1] }
         );
         
-        addSkippedBeziers(
+        addSkippedBezierPiecess(
             bezierPieces,
             posThis.curve,
             posNext.curve,
@@ -60,10 +55,10 @@ function getBoundaryBezierPartsToNext(
 
 
 /**
- * @internal
  * Adds pieces of skipped beziers.
+ * @internal
  */
-function addSkippedBeziers(
+function addSkippedBezierPiecess(
         bezierPieces: BezierPiece[],
         curveStart: Curve,
         curveEnd: Curve,
@@ -72,11 +67,10 @@ function addSkippedBeziers(
     let curveThis = curveStart;
     do {
         curveThis = curveThis.next;
-        const bezierPart = curveThis === curveEnd 
-            ? { ps: curveThis.ps, ts: [0, t1] }
-            : { ps: curveThis.ps, ts: [0, 1] }
-
-        bezierPieces.push(bezierPart);
+        const tEnd = curveThis === curveEnd ? t1 : 1;
+        bezierPieces.push({
+            ps: curveThis.ps, ts: [0, tEnd]
+        });
     } while (curveThis !== curveEnd);
 }
 

package/src/cp-node/fs/get-boundary-beziers-between.ts

@@ -1,7 +1,6 @@
-import type { BezierPiece } from "flo-bezier3";
 import type { CpNode } from "../cp-node.js";
-import { cpNodesToBoundaryBeziers } from "./cp-nodes-to-boundary-beziers.js";
 import { getAllBetween } from "./get-all-between.js";
+import { getBoundaryBeziersToNext } from "./get-boundary-beziers-to-next.js";
 
 
 /**
@@ -23,12 +22,12 @@ function getBoundaryBeziersBetween(
             hasHoleCloser: boolean
         } {
 
-    const allBetween = getAllBetween(cpNode1,cpNode2,inclAllIfEqual);
+    const { cpNodes, hasHoleCloser } =
+        getAllBetween(cpNode1,cpNode2,inclAllIfEqual);
 
-    return {
-        pss: cpNodesToBoundaryBeziers(allBetween.cpNodes),
-        hasHoleCloser: allBetween.hasHoleCloser
-    }
+    const pss = cpNodes.flatMap(getBoundaryBeziersToNext);
+
+    return { pss, hasHoleCloser }
 }
 
 

package/src/cp-node/fs/get-boundary-beziers-to-next.ts

@@ -1,70 +1,96 @@
+import type { CpNode } from '../cp-node.js';
 import { fromTo } from 'flo-bezier3';
-import { CpNode } from '../cp-node.js';
-import { Curve  } from '../../curve/curve.js';
+import { getBoundaryBezierPartsToNext } from './get-boundary-bezier-parts-to-next.js';
 
 
+/**
+//  * Returns the boundary beziers between this `CpNode` and the next
+//  * one.
+//  * 
+//  * * returns `[]` if the next `CpNode` is on a different loop,
+//  * as this is a hole-closer and there are no boundary beziers between them.
+//  * 
+//  * @param cpNode 
+//  */
 function getBoundaryBeziersToNext(
         cpNode: CpNode): number[][][] {
 
-    const cpThis = cpNode; 
-    const cpNext = cpNode.next;
+    return getBoundaryBezierPartsToNext(cpNode).map(
+        bp => fromTo(bp.ps, bp.ts[0], bp.ts[1])
+    );
+}
+
+
+// /**
+//  * Returns the boundary beziers between this `CpNode` and the next
+//  * one.
+//  * 
+//  * * returns `[]` if the next `CpNode` is on a different loop,
+//  * as this is a hole-closer and there are no boundary beziers between them.
+//  * 
+//  * @param cpNode 
+//  */
+// function getBoundaryBeziersToNext(
+//         cpNode: CpNode): number[][][] {
+
+//     const cpThis = cpNode; 
+//     const cpNext = cpNode.next;
 
-    const posThis = cpThis.cp.pointOnShape;
-    const posNext = cpNext.cp.pointOnShape;
+//     const posThis = cpThis.cp.pointOnShape;
+//     const posNext = cpNext.cp.pointOnShape;
 
-    const curveThis = posThis.curve;
-    const curveNext = posNext.curve;
+//     const curveThis = posThis.curve;
+//     const curveNext = posNext.curve;
 
-    if (curveThis.loop !== curveNext.loop) {
-        // It is a hole-closer going over to the other loop - a kind of terminal
-        // CpNode.
-        // return undefined!;
-        return [];
-    }
+//     if (curveThis.loop !== curveNext.loop) {
+//         // It is a hole-closer going over to the other loop - a kind of terminal
+//         // CpNode.
+//         // return undefined!;
+//         return [];
+//     }
 
-    const beziers = [];
+//     const beziers: number[][][] = [];
 
-    if (curveNext === curveThis) {
-        beziers.push(
-            fromTo(posThis.curve.ps, posThis.t, posNext.t)
-        );
-    } else {
-        beziers.push(
-            fromTo(posThis.curve.ps, posThis.t, 1)
-        );
+//     if (curveNext === curveThis) {
+//         beziers.push(
+//             fromTo(posThis.curve.ps, posThis.t, posNext.t)
+//         );
+//     } else {
+//         beziers.push(
+//             fromTo(posThis.curve.ps, posThis.t, 1)
+//         );
         
-        addSkippedBeziers(
-                beziers, 
-                posThis.curve, 
-                posNext.curve,
-                posNext.t
-        );
-    }
-
-    return beziers;
-}
+//         addSkippedBeziers(
+//             beziers,
+//             posThis.curve,
+//             posNext.curve,
+//             posNext.t
+//         );
+//     }
 
+//     return beziers;
+// }
 
-/**
- * Adds pieces of skipped beziers.
- * @internal
- */
-function addSkippedBeziers(
-        beziers    : number[][][], 
-        curveStart : Curve, 
-        curveEnd   : Curve, 
-        t1         : number) {
-
-    let curveThis = curveStart;
-    do {
-        curveThis = curveThis.next;
-        const tEnd = curveThis === curveEnd ? t1 : 1;
-        beziers.push( 
-            // qqq from0ToT(curveThis.ps, tEnd) 
-            fromTo(curveThis.ps, 0, tEnd)
-        );
-    } while (curveThis !== curveEnd);
-}
+
+// /**
+//  * Adds pieces of skipped beziers.
+//  * @internal
+//  */
+// function addSkippedBeziers(
+//         beziers: number[][][],
+//         curveStart: Curve,
+//         curveEnd: Curve,
+//         t1: number) {
+
+//     let curveThis = curveStart;
+//     do {
+//         curveThis = curveThis.next;
+//         const tEnd = curveThis === curveEnd ? t1 : 1;
+//         beziers.push( 
+//             fromTo(curveThis.ps, 0, tEnd)
+//         );
+//     } while (curveThis !== curveEnd);
+// }
 
 
 export { getBoundaryBeziersToNext }

package/src/cp-node/fs/get-salience.ts

@@ -17,9 +17,9 @@ function getSalience(cpNode: CpNode) {
 
     const d = distanceBetween(bp1, bp2);
 
-    const { pss: bps, hasHoleCloser } = getBoundaryBeziersBetween(cpNode1, cpNode2);
+    const { pss, hasHoleCloser } = getBoundaryBeziersBetween(cpNode1, cpNode2);
 
-    const s = sum(bps.map(ps => totalLength(ps)));
+    const s = sum(pss.map(ps => totalLength(ps)));
 
     return hasHoleCloser ? Number.POSITIVE_INFINITY : s/d;
 }

package/src/cp-node/fs/get-speed.ts

@@ -1,14 +1,9 @@
-import { curvature, totalAbsoluteCurvature, totalLength } from "flo-bezier3";
+import { totalAbsoluteCurvature, totalLength } from "flo-bezier3";
 import { memoize } from "flo-memoize";
-import { sum } from "../../utils/sum.js";
 import { CpNode } from "../cp-node.js";
-import { getBoundaryBeziersToNext } from "./get-boundary-beziers-to-next.js";
 import { getMatCurveToNext } from "./get-mat-curve-to-next.js";
 import { getRealProngCount } from "./get-real-prong-count.js";
 
-const { min, abs } = Math;
-
-
 const getSpeed$ = memoize(getSpeed);
 
 

package/src/curve/curve.ts

@@ -9,28 +9,28 @@ interface Curve {
 	 * The closed loop of bezier curves representing the shape 
 	 * boundary this curve belongs to.
 	 */
-	loop : Loop;
+	loop: Loop;
 	/**
 	 * The bezier control points.
 	 */
-	ps   : number[][];
+	ps: number[][];
 	/**
 	 * The previous curve (when going in a negative direction around
 	 * the shape boundary, i.e. clockwise for the outer shape and anti-clockwise
 	 * for the holes (if any))
 	 */
-	prev : Curve; 
+	prev: Curve; 
 	/**
 	 * The next curve (when going in a positive direction around
 	 * the shape boundary, i.e. anti-clockwise for the outer shape and clockwise
 	 * for the holes (if any))
 	 */
-	next : Curve;
+	next: Curve;
 	/**
 	 * The curve's ordered index in the loop. This imposes a cycling
 	 * ordering of the curves in the loop
 	 */
-	idx  : number;
+	idx: number;
 }
 
 

package/src/debug/functions/draw-elem/two-prong.ts

@@ -1,50 +1,50 @@
-import { drawFs } from 'flo-draw';
-import { TwoProngForDebugging   } from '../../two-prong-for-debugging.js';
-import { getTwoProngType } from '../../../mat/get-two-prong-type.js';
+// import { drawFs } from 'flo-draw';
+// import { TwoProngForDebugging   } from '../../two-prong-for-debugging.js';
+// import { getTwoProngType } from '../../../mat/get-two-prong-type.js';
 
 
-/** @internal */
-function twoProng(
-		g: SVGGElement,
-		twoProng: TwoProngForDebugging,
-        classes?: string,
-        delay = 0,
-        scaleFactor = 1) {
+// /** @internal */
+// function twoProng(
+// 		g: SVGGElement,
+// 		twoProng: TwoProngForDebugging,
+//         classes?: string,
+//         delay = 0,
+//         scaleFactor = 1) {
 
-	let $failedDot : SVGElement[] = [];
-	let $center    : SVGElement[] = [];
-	let $circle    : SVGElement[] = [];
-	let $cp1       : SVGElement[] = [];
-	let $cp2       : SVGElement[] = [];
+// 	let $failedDot : SVGElement[] = [];
+// 	let $center    : SVGElement[] = [];
+// 	let $circle    : SVGElement[] = [];
+// 	let $cp1       : SVGElement[] = [];
+// 	let $cp2       : SVGElement[] = [];
 	
-	let color;
-	let thin;
+// 	let color;
+// 	let thin;
 
-	switch (getTwoProngType(twoProng)) {
-		case 'twoProng_regular': {
-			color = 'red ';
-			thin = '2';
-			break;
-		}
-		case 'twoProng_holeClosing': {
-			color = 'cyan ';
-			thin = '10';
-			break;
-		}		
-	}
+// 	switch (getTwoProngType(twoProng)) {
+// 		case 'twoProng_regular': {
+// 			color = 'red ';
+// 			thin = '2';
+// 			break;
+// 		}
+// 		case 'twoProng_holeClosing': {
+// 			color = 'cyan ';
+// 			thin = '10';
+// 			break;
+// 		}		
+// 	}
 		
 	
-	if (twoProng.failed) {
-		$failedDot = drawFs.dot(g, twoProng.pos.p, 1*scaleFactor, 'black', delay);
-	} else if (!twoProng.failed) {
-		$center = drawFs.dot   (g, twoProng.circle.center, 0.01*scaleFactor, 'yellow', delay);
-		$circle = drawFs.circle(g, twoProng.circle, color + 'thin' + thin + ' nofill', delay); 
-		$cp1    = drawFs.dot   (g, twoProng.pos.p, 0.0175*scaleFactor, color, delay);
-		$cp2    = drawFs.dot   (g, twoProng.z, 0.035*scaleFactor, color, delay);	
-	}
+// 	if (twoProng.failed) {
+// 		$failedDot = drawFs.dot(g, twoProng.pos.p, 1*scaleFactor, 'black', delay);
+// 	} else if (!twoProng.failed) {
+// 		$center = drawFs.dot   (g, twoProng.circle.center, 0.01*scaleFactor, 'yellow', delay);
+// 		$circle = drawFs.circle(g, twoProng.circle, color + 'thin' + thin + ' nofill', delay); 
+// 		$cp1    = drawFs.dot   (g, twoProng.pos.p, 0.0175*scaleFactor, color, delay);
+// 		$cp2    = drawFs.dot   (g, twoProng.z, 0.035*scaleFactor, color, delay);	
+// 	}
 	
-	return [...$failedDot, ...$center, ...$circle, ...$cp1, ...$cp2];	
-}
+// 	return [...$failedDot, ...$center, ...$circle, ...$cp1, ...$cp2];	
+// }
 
 
-export { twoProng }
+// export { twoProng }