flo-mat 3.0.10 → 3.0.12

package/src/cp-node/fs/is-terminating.ts

@@ -2,7 +2,7 @@ import type { CpNode } from "../cp-node.js";
 
 
 function isTerminating(cpNode: CpNode) {
-	return cpNode === cpNode.next.prevOnCircle;
+    return cpNode === cpNode.next.prevOnCircle;
 }
 
 

package/src/cp-node/fs/iterate-all-on-loop.ts

@@ -2,13 +2,13 @@ import { CpNode } from "../cp-node.js";
 
 
 function* iterateAllOnLoop(cpNode: CpNode) {
-	yield cpNode;
+    yield cpNode;
 
-	let cpNode_ = cpNode.next;
-	while (cpNode_ !== cpNode) {
-		yield cpNode_;
-		cpNode_ = cpNode_.next;
-	}
+    let cpNode_ = cpNode.next;
+    while (cpNode_ !== cpNode) {
+        yield cpNode_;
+        cpNode_ = cpNode_.next;
+    }
 }
 
 

package/src/cp-node/fs/traverse-all-forward.ts

@@ -4,20 +4,20 @@ import { getChildren } from './get-children.js';
 
 
 function traverseAllForward(
-		cpNode: CpNode,
-		traverseEdgesCallback: (cpNode: CpNode) => void) {
+        cpNode: CpNode,
+        traverseEdgesCallback: (cpNode: CpNode) => void) {
 
-	// Since the tree is unrooted we must iterate in all directions from the
-	// given vertex.
-	const cps = [cpNode];
+    // Since the tree is unrooted we must iterate in all directions from the
+    // given vertex.
+    const cps = [cpNode];
 
-	while (cps.length) {
-		const cp = cps.pop()!;
-		traverseEdgesCallback(cp);
+    while (cps.length) {
+        const cp = cps.pop()!;
+        traverseEdgesCallback(cp);
 
-		if (isTerminating(cp)) { continue; }
-		cps.push(...getChildren(cp));
-	}
+        if (isTerminating(cp)) { continue; }
+        cps.push(...getChildren(cp));
+    }
 }
 
 

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

@@ -2,25 +2,27 @@ import { CpNode } from "../cp-node.js";
 import { isTerminating } from "./is-terminating.js";
 
 
-function traverseCp(cpStart: CpNode) {
-	let cpNode = cpStart;
+function traverseCp(
+        cpStart: CpNode) {
 
-	if (isTerminating(cpNode)) {
-		return [cpNode];  // one-sharp corner
-	}
+    let cpNode = cpStart;
 
-	const visitedCps: CpNode[] = [];
-	do {
-		visitedCps.push(cpNode);
-	
-		const next = cpNode.next.prevOnCircle;
-		cpNode = cpNode === next
-				? cpNode = cpNode.next.next // Terminal vertex
-				: cpNode = next         // Take last exit
-	
-	} while (cpNode !== cpStart); 
-	
-	return visitedCps;
+    if (isTerminating(cpNode)) {
+        return [cpNode];  // one-sharp corner
+    }
+
+    const visitedCps: CpNode[] = [];
+    do {
+        visitedCps.push(cpNode);
+    
+        const next = cpNode.next.prevOnCircle;
+        cpNode = cpNode === next
+                ? cpNode = cpNode.next.next // Terminal vertex
+                : cpNode = next         // Take last exit
+    
+    } while (cpNode !== cpStart); 
+    
+    return visitedCps;
 }
 
 

package/src/cp-node/fs/traverse-edges.ts

@@ -4,18 +4,18 @@ import { getAllOnLoop } from './get-all-on-loop.js';
 
 
 function traverseEdges(
-		cpNode: CpNode,
-		traverseEdgesCallback: (cpNode: CpNode) => void) {
+        cpNode: CpNode,
+        traverseEdgesCallback: (cpNode: CpNode) => void) {
 
-	const cpNodes = getAllOnLoop(cpNode);
-	const seen = new Set<CpNode>();
+    const cpNodes = getAllOnLoop(cpNode);
+    const seen = new Set<CpNode>();
 
-	for (cpNode of cpNodes) {
-		if (!isTerminating(cpNode) && !seen.has(cpNode.next.prevOnCircle)) {
-			traverseEdgesCallback(cpNode);
-		}
-		seen.add(cpNode);
-	}
+    for (cpNode of cpNodes) {
+        if (!isTerminating(cpNode) && !seen.has(cpNode.next.prevOnCircle)) {
+            traverseEdgesCallback(cpNode);
+        }
+        seen.add(cpNode);
+    }
 }
 
 

package/src/cp-node/fs/traverse-vertices.ts

@@ -6,26 +6,26 @@ import { getVertexForwardChildren } from './get-vertex-forward-children.js';
 
 
 function traverseVertices(
-		cpStart: CpNode, 
-		traverseVerticesCallback: (cpNode: CpNode) => void) {
+        cpStart: CpNode, 
+        traverseVerticesCallback: (cpNode: CpNode) => void) {
 
-	traverseVerticesCallback(cpStart);
+    traverseVerticesCallback(cpStart);
 
-	// Since the tree is unrooted we must iterate in all directions from the
-	// given cpNode.
-	const cpNodes = 
-		getAllOnCircle(cpStart)
-		.filter(cpNode => !isTerminating(cpNode))
-		.map(cpNode => cpNode.next);
+    // Since the tree is unrooted we must iterate in all directions from the
+    // given cpNode.
+    const cpNodes = 
+        getAllOnCircle(cpStart)
+        .filter(cpNode => !isTerminating(cpNode))
+        .map(cpNode => cpNode.next);
 
-	for (const cpNode of cpNodes) {
-		const cps = [cpNode];
-		while (cps.length) {
-			const cp = cps.pop()!;
-			traverseVerticesCallback(cp);
-			cps.push(...getVertexForwardChildren(cp));
-		}
-	}
+    for (const cpNode of cpNodes) {
+        const cps = [cpNode];
+        while (cps.length) {
+            const cp = cps.pop()!;
+            traverseVerticesCallback(cp);
+            cps.push(...getVertexForwardChildren(cp));
+        }
+    }
 }
 
 

package/src/curve/curve.ts

@@ -5,32 +5,32 @@ import { Loop } from 'flo-boolean';
  * Represents a bezier curve on the shape boundary / loop.
  */
 interface Curve {
-	/**
-	 * The closed loop of bezier curves representing the shape 
-	 * boundary this curve belongs to.
-	 */
-	loop: Loop;
-	/**
-	 * The bezier control points.
-	 */
-	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; 
-	/**
-	 * 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;
-	/**
-	 * The curve's ordered index in the loop. This imposes a cycling
-	 * ordering of the curves in the loop
-	 */
-	idx: number;
+    /**
+     * The closed loop of bezier curves representing the shape 
+     * boundary this curve belongs to.
+     */
+    loop: Loop;
+    /**
+     * The bezier control points.
+     */
+    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; 
+    /**
+     * 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;
+    /**
+     * The curve's ordered index in the loop. This imposes a cycling
+     * ordering of the curves in the loop
+     */
+    idx: number;
 }
 
 

package/src/debug/functions/cmp-cp-on-delta.ts

@@ -43,7 +43,7 @@ function cmpCpOnδ(
     } 
 
     if (cmpPrev === 0 || cmpNext === 0) {
-        // console.log('2-PRONG orders are equal.');	
+        // console.log('2-PRONG orders are equal.');    
         return 0;
     }
 

package/src/debug/functions/draw-elem/bounding-hull.ts

@@ -9,9 +9,9 @@ function boundingHull(
         delay = 0,
         scaleFactor = 1) {
             
-	const $polygon = drawFs.polygon(g, hull, classes, delay);
+    const $polygon = drawFs.polygon(g, hull, classes, delay);
 
-	return $polygon;
+    return $polygon;
 }
 
 

package/src/debug/functions/draw-elem/culls.ts

@@ -2,7 +2,7 @@ import { Circle } from '../../../geometry/circle.js';
 
 
 /** @internal */
-function culls(g: SVGGElement, culls: Circle[]) {	
+function culls(g: SVGGElement, culls: Circle[]) {    
     const $elems: SVGElement[] = [];
 
     for (const circle of culls) {
@@ -11,7 +11,7 @@ function culls(g: SVGGElement, culls: Circle[]) {
         $elems.push(drawCircle(g, p, 0.4, 'cyan thin5 nofill'));
     }
     
-	return $elems;
+    return $elems;
 }
 
 

package/src/debug/functions/draw-elem/draw-cp-node.ts

@@ -7,41 +7,41 @@ import { CpNodeFs } from '../../../cp-node/cp-node-fs.js';
 
 /** @internal */
 function drawCpNode(
-		g: SVGGElement,
-		cpNode: CpNode,
-		classes = 'blue thin2 nofill',
-		delay = 0,
-		scaleFactor = 1) {
-
-	const circle = scaleCircle(
-		cpNode.cp.circle,
-		1
-	);
-	const { center: c, radius: r } = circle;
-	
-	const poss = CpNodeFs.getAllOnCircle(cpNode)
+        g: SVGGElement,
+        cpNode: CpNode,
+        classes = 'blue thin2 nofill',
+        delay = 0,
+        scaleFactor = 1) {
+
+    const circle = scaleCircle(
+        cpNode.cp.circle,
+        1
+    );
+    const { center: c, radius: r } = circle;
+    
+    const poss = CpNodeFs.getAllOnCircle(cpNode)
         .map(cpNode => cpNode.cp.pointOnShape)
 
-	const { dot, circle: drawCircle, crossHair } = drawFs;
+    const { dot, circle: drawCircle, crossHair } = drawFs;
 
-	const $circle = drawCircle(g, circle, classes, delay);
+    const $circle = drawCircle(g, circle, classes, delay);
 
-	const $cps: SVGElement[] = [];
-	const $ls: SVGElement[] = [];
-	for (let i=0; i<poss.length; i++) {
-		const p = poss[i].p;
-		$cps.push(...dot(g, p, 0.01*(i+1)*scaleFactor, 'blue', delay));
-		$ls.push(...drawFs.line(g, [p, c], 'thin5 red', delay));
-	}
+    const $cps: SVGElement[] = [];
+    const $ls: SVGElement[] = [];
+    for (let i=0; i<poss.length; i++) {
+        const p = poss[i].p;
+        $cps.push(...dot(g, p, 0.01*(i+1)*scaleFactor, 'blue', delay));
+        $ls.push(...drawFs.line(g, [p, c], 'thin5 red', delay));
+    }
     
-	const $cross = crossHair(g, c, 'orange thin10 nofill', 2*scaleFactor, delay);
-
-	// if (r === 0) {
-	// 	const $cross = crossHair(g, circle.center, 'red thin2 nofill', 0.02*scaleFactor, delay);
-	// }
-		
-	return [...$cps, ...$ls, ...$circle, ...$cross] as SVGElement[];
-}		
+    const $cross = crossHair(g, c, 'orange thin10 nofill', 2*scaleFactor, delay);
+
+    // if (r === 0) {
+    //     const $cross = crossHair(g, circle.center, 'red thin2 nofill', 0.02*scaleFactor, delay);
+    // }
+        
+    return [...$cps, ...$ls, ...$circle, ...$cross] as SVGElement[];
+}        
 
 
 export { drawCpNode }

package/src/debug/functions/draw-elem/draw-cull.ts

@@ -6,7 +6,7 @@ function drawCull(
         cull: number[],
         classes = 'thin10 cyan nofill',
         delay = 0,
-        scaleFactor = 1) {	
+        scaleFactor = 1) {    
 
     const $elems: SVGElement[] = [];
 
@@ -14,7 +14,7 @@ function drawCull(
         g, cull, classes, 0.1*scaleFactor, delay)
     )
     
-	return $elems;
+    return $elems;
 }
 
 

package/src/debug/functions/draw-elem/draw-dull-corner.ts

@@ -4,17 +4,17 @@ import { Curve } from '../../../curve/curve.js';
 
 /** @internal */
 function dullCorner(
-		g: SVGGElement,
-		curve: Curve, 
+        g: SVGGElement,
+        curve: Curve, 
         classes = 'orange',
         delay = 0,
         scaleFactor = 1) {
 
-	const ps = curve.ps; 
-	const p = curve.ps[ps.length-1];
-	const $pos = drawFs.dot(g, p, 0.1*0.5*scaleFactor, classes, delay);
-	
-	return $pos;
+    const ps = curve.ps; 
+    const p = curve.ps[ps.length-1];
+    const $pos = drawFs.dot(g, p, 0.1*0.5*scaleFactor, classes, delay);
+    
+    return $pos;
 }
 
 

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

@@ -22,12 +22,12 @@ import { drawSpeed } from './draw-speed.js';
 
 
 type DrawElemFunction<T extends DebugElemKey> = (
-	g: SVGGElement,
-	elem: DebugElem[T],
-	classes?: string,
-	delay?: number,
-	scaleFactor?: number,
-	options?: any) => SVGElement[];
+    g: SVGGElement,
+    elem: DebugElem[T],
+    classes?: string,
+    delay?: number,
+    scaleFactor?: number,
+    options?: any) => SVGElement[];
 
 
 /** @internal */
@@ -36,32 +36,32 @@ type DrawElemFunctions = { [T in DebugElemKey]: DrawElemFunction<T> }
 
 /** @internal */
 const drawElemFs: DrawElemFunctions = {
-	oneProng: drawOneProng,
-	// oneProngAtDullCorner,
-	// csf,
-	twoProng: drawTwoProng(false, true),
-	threeProng: drawThreeProng,
-	boundingHull,
-	looseBoundingBox,
-	tightBoundingBox,
-	// sharpCorner,
-	// dullCorner,
-	vertex,
-	mat: drawMat,
-	// sat: drawMat('sat'),
-	maxVertex,
-	leaves: drawLeaves,
-	cull: drawCull,
-	cpNode: drawCpNode,
-	branch: drawBranch,
-	holeCloser: drawTwoProng(false, false),
-	speed: drawSpeed
+    oneProng: drawOneProng,
+    // oneProngAtDullCorner,
+    // csf,
+    twoProng: drawTwoProng(false, true),
+    threeProng: drawThreeProng,
+    boundingHull,
+    looseBoundingBox,
+    tightBoundingBox,
+    // sharpCorner,
+    // dullCorner,
+    vertex,
+    mat: drawMat,
+    // sat: drawMat('sat'),
+    maxVertex,
+    leaves: drawLeaves,
+    cull: drawCull,
+    cpNode: drawCpNode,
+    branch: drawBranch,
+    holeCloser: drawTwoProng(false, false),
+    speed: drawSpeed
 }
 
 
 const drawElemFsDetailed: DrawElemFunctions = {
-	...drawElemFs,
-	twoProng: drawTwoProng(true, true),
+    ...drawElemFs,
+    twoProng: drawTwoProng(true, true),
 }
 
 

package/src/debug/functions/draw-elem/draw-leaves.ts

@@ -10,7 +10,7 @@ function drawLeaves(
         leaves: CpNode[],
         classes = 'thin10 deeppink nofill',
         delay = 0,
-        scaleFactor = 1) {	
+        scaleFactor = 1) {    
 
     const $elems: SVGElement[] = [];
     const { line, dot, circle: drawCircle } = drawFs;
@@ -32,19 +32,19 @@ function drawLeaves(
             $cps.push(...dot(g, p, 0.01*(i+1)*scaleFactor, 'pinker', delay));
             $ls.push(...line(g, [p, c], 'thin5 red', delay));
         }
-		
-		const $circle = drawCircle(g, circle, classes, delay); 
-		// const $cp = dot(g, p, 0.005*scaleFactor, 'pinker', delay);
-
-		$elems.push(...[
-			...$circle,
-			...$cps,
-			...$ls,
-			...$center
-		]);
+        
+        const $circle = drawCircle(g, circle, classes, delay); 
+        // const $cp = dot(g, p, 0.005*scaleFactor, 'pinker', delay);
+
+        $elems.push(...[
+            ...$circle,
+            ...$cps,
+            ...$ls,
+            ...$center
+        ]);
     }
     
-	return $elems;
+    return $elems;
 }
 
 

package/src/debug/functions/draw-elem/draw-loose-bounding-box.ts

@@ -3,18 +3,18 @@ import { drawFs } from "flo-draw";
 
 /** @internal */
 function looseBoundingBox(
-		g: SVGGElement,
-		box: number[][], 
+        g: SVGGElement,
+        box: number[][], 
         classes = 'thin5 brown nofill',
         delay = 0,
         scaleFactor = 1) {
 
-	const [[x0, y0],[x1, y1]] = box;
-	box = [[x0, y0],[x1, y0],[x1,y1],[x0,y1]];
+    const [[x0, y0],[x1, y1]] = box;
+    box = [[x0, y0],[x1, y0],[x1,y1],[x0,y1]];
 
-	const $box = drawFs.polygon(g, box, classes, delay);
-	
-	return $box;
+    const $box = drawFs.polygon(g, box, classes, delay);
+    
+    return $box;
 }
 
 

package/src/debug/functions/draw-elem/draw-max-vertex.ts

@@ -3,12 +3,12 @@ import { CpNode } from '../../../cp-node/cp-node.js';
 
 
 /** @internal */
-function maxVertex(g: SVGGElement, cpNode: CpNode) {	
+function maxVertex(g: SVGGElement, cpNode: CpNode) {    
     const circle = cpNode.cp.circle;
 
     const $elems = drawFs.circle(g, circle, 'brown thin10 nofill');
         
-	return $elems;
+    return $elems;
 }
 
 

package/src/debug/functions/draw-elem/draw-min-y.ts

@@ -9,8 +9,8 @@ function minY(g: SVGGElement, pos: PointOnShape) {
 
     const $elems = drawFs.crossHair( 
             g, p, 'red thin10 nofill'
-	);  
-	
+    );  
+    
     return $elems;
 }
 

package/src/debug/functions/draw-elem/draw-one-prong-at-dull-corner.ts

@@ -19,7 +19,7 @@ function oneProngAtDullCorner(
     const $circle = drawFs.dot(g, oCircle.center, 0.25, 'orange');
     const $pos    = drawFs.circle(g, oCircle, 'orange thin10 nofill');
         
-	return [...$center, ...$circle, ...$pos];
+    return [...$center, ...$circle, ...$pos];
 }
 
 

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

@@ -16,7 +16,7 @@ function drawOneProng(
     const $circle = drawFs.dot(g, circle.center, 0.05*scaleFactor, 'deeppink', delay);
     const $pos    = drawFs.circle(g, circle, 'deeppink thin5 nofill', delay);
 
-	return [...$center, ...$circle, ...$pos];
+    return [...$center, ...$circle, ...$pos];
 }
 
 

package/src/debug/functions/draw-elem/draw-sharp-corner.ts

@@ -4,16 +4,16 @@ import { Curve } from '../../../curve/curve.js';
 
 /** @internal */
 function sharpCorner(
-		g: SVGGElement,
-		curve: Curve, 
+        g: SVGGElement,
+        curve: Curve, 
         classes = 'green',
         delay = 0,
         scaleFactor = 1) {
 
-	const p = curve.ps[curve.ps.length-1];
-	const $pos = drawFs.dot(g, p, 0.6*scaleFactor, 'green', delay);
-		
-	return $pos;
+    const p = curve.ps[curve.ps.length-1];
+    const $pos = drawFs.dot(g, p, 0.6*scaleFactor, 'green', delay);
+        
+    return $pos;
 }
 
 

package/src/debug/functions/draw-elem/draw-speed.ts

@@ -11,7 +11,7 @@ function drawSpeed(
         cpNode: CpNode,
         classes_?: string,
         delay = 0,
-        scaleFactor = 1) {	
+        scaleFactor = 1) {    
 
     const $elems: SVGElement[] = [];
 
@@ -28,7 +28,7 @@ function drawSpeed(
     const n = toLength(normal(ps,t), ss);
     $elems.push(...drawFs.line(g, [p,translate(p,n)], 'red thin5', delay));
     
-	return $elems;
+    return $elems;
 }