flo-mat 2.0.4 → 3.0.0

package/src/debug/debug-elem-types.ts

@@ -1,17 +1,17 @@
-import { IPointOnShape } from '../point-on-shape.js';
+import { PointOnShape } from '../point-on-shape/point-on-shape.js';
 import { TwoProngForDebugging } from './two-prong-for-debugging.js';
 import { ThreeProngForDebugging } from './three-prong-for-debugging.js';
-import { Curve } from '../curve.js';
-import { Mat } from '../mat.js';
-import { CpNode } from '../cp-node.js';
-import { Circle } from '../circle.js';
+import { Curve } from '../curve/curve.js';
+import { Mat } from '../mat/mat.js';
+import { CpNode } from '../cp-node/cp-node.js';
+import { Circle } from '../geometry/circle.js';
 import { ICpNodeForDebugging } from './cp-node-for-debugging.js';
 
 
-/** @hidden */
+/** @internal */
 interface IDebugElems {
-    oneProng: IPointOnShape;
-    oneProngAtDullCorner: IPointOnShape;
+    oneProng: CpNode[];
+    oneProngAtDullCorner: PointOnShape;    
     twoProng_regular: TwoProngForDebugging;
 	twoProng_failed: TwoProngForDebugging;
 	twoProng_notAdded: TwoProngForDebugging;

package/src/debug/debug.ts

@@ -8,7 +8,7 @@ import { drawElemFunctions, TDrawElemFunctions } from './functions/draw-elem/dra
 import { IDebugElems } from './debug-elem-types.js';
 
 
-/** @hidden */
+/** @internal */
 interface Debug {
     /** Generated by debug object for later inspection */
     generated: Generated;
@@ -21,11 +21,11 @@ interface Debug {
 }
 
 
-/** @hidden */
+/** @internal */
 type GeneratedElems = { [T in keyof IDebugElems]: IDebugElems[T][] };
 
 
-/** @hidden */
+/** @internal */
 interface ITiming {
     //normalize     : number;
     //simplifyPaths : number;
@@ -37,14 +37,14 @@ interface ITiming {
 }
 
 
-/** @hidden */
+/** @internal */
 interface Generated {
     elems: GeneratedElems;
     timing: ITiming;
 }
 
 
-/** @hidden */
+/** @internal */
 interface IDebugFunctions extends IGeneralDebugFunctions {
     //draw       : IDrawFunctions,
     twoProng   : ITwoProngDebugFunctions,
@@ -53,7 +53,7 @@ interface IDebugFunctions extends IGeneralDebugFunctions {
 }
 
 
-/** @hidden */
+/** @internal */
 interface IDirectives {
     stopAfterHoleClosers: boolean,
     stopAfterHoleClosersNum: number,
@@ -80,6 +80,8 @@ function enableDebugForMat(debugOn: boolean) {
             elems: { 
                 //...debug?.generated?.elems,
                 ...(!debug ? {} : !debug.generated ? {} : !debug.generated.elems ? {} : debug.generated.elems),
+                oneProng             : [],
+                oneProngAtDullCorner : [],
                 twoProng_regular     : [],
                 twoProng_failed      : [],
                 twoProng_notAdded    : [],
@@ -87,8 +89,6 @@ function enableDebugForMat(debugOn: boolean) {
                 twoProng_holeClosing : [],
                 looseBoundingBox     : [],
                 tightBoundingBox     : [],
-                oneProng             : [],
-                oneProngAtDullCorner : [],
                 sharpCorner          : [],
                 dullCorner           : [],
                 vertex               : [],
@@ -127,11 +127,11 @@ function enableDebugForMat(debugOn: boolean) {
             //...debug?.directives,
             ...(!debug ? {} : !debug.directives ? {} : debug.directives),
             stopAfterHoleClosers: false,
-            stopAfterHoleClosersNum: undefined,
+            stopAfterHoleClosersNum: undefined!,
             stopAfterTwoProngs: false,
-            stopAfterTwoProngsNum: undefined,
+            stopAfterTwoProngsNum: undefined!,
             stopAfterThreeProngs: false,
-            stopAfterThreeProngsNum: undefined,
+            stopAfterThreeProngsNum: undefined!,
         }
     };
 

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

@@ -1,13 +1,15 @@
 import { drawFs } from 'flo-draw';
 
 
-/** @hidden */
+/** @internal */
 function boundingHull(
         g: SVGGElement,
         hull: number[][], 
-        style = 'thin5 black nofill') {
+        classes = 'thin5 black nofill',
+        delay = 0,
+        scaleFactor = 1) {
             
-	const $polygon = drawFs.polygon(g, hull, style);
+	const $polygon = drawFs.polygon(g, hull, classes, delay);
 
 	return $polygon;
 }

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

@@ -1,9 +1,9 @@
 import { drawFs } from 'flo-draw';
-import { CpNode } from '../../../cp-node.js';
-import { getCurveToNext } from '../../../get-curve-to-next.js';
+import { CpNode, isTerminating } from '../../../cp-node/cp-node.js';
+import { getCurveToNext } from '../../../cp-node/get-curve-to-next.js';
 
 
-/** @hidden */
+/** @internal */
 function drawBranch(g: SVGGElement, branch: CpNode[], delay?: number) {
 
     const classes = 'thin5 purple nofill';
@@ -12,7 +12,7 @@ function drawBranch(g: SVGGElement, branch: CpNode[], delay?: number) {
     let i = 0;
 
     for (const cpNode of branch) {
-        if (cpNode.isTerminating()) { continue; }
+        if (isTerminating(cpNode)) { continue; }
         //let bezier = cpNode.matCurveToNextVertex;
         const bezier = getCurveToNext(cpNode);
         if (!bezier) { continue; }

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

@@ -1,7 +1,7 @@
-import { Circle } from '../../../circle.js';
+import { Circle } from '../../../geometry/circle.js';
 
 
-/** @hidden */
+/** @internal */
 function culls(g: SVGGElement, culls: Circle[]) {	
     const $elems: SVGElement[] = [];
 
@@ -15,7 +15,7 @@ function culls(g: SVGGElement, culls: Circle[]) {
 }
 
 
-/** @hidden */
+/** @internal */
 function drawCircle(
         g: SVGGElement,
         center: number[], 

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

@@ -1,5 +1,5 @@
 
-/** @hidden */
+/** @internal */
 function drawCirclePercent(
         g: SVGGElement,
         center: number[], 

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

@@ -18,22 +18,26 @@ import { culls            } from './culls.js';
 import { oneProngAtDullCorner } from './one-prong-at-dull-corner.js';
 
 
-/** @hidden */
+/** @internal */
 type TDrawElemFunctions = 
-	{ [T in keyof IDebugElems]: (g: SVGGElement, elem: IDebugElems[T], classes?: string, delay?: number) => SVGElement[] };
+	{ [T in keyof IDebugElems]: (
+		g: SVGGElement,
+		elem: IDebugElems[T],
+		classes?: string,
+		delay?: number,
+		scaleFactor?: number) => SVGElement[] };
 
 
-/** @hidden */
+/** @internal */
 function notImplementedYet<T extends IDebugElems[keyof IDebugElems]> (g: SVGElement, elem: T) {
-	return [] as SVGElement[]; // TODO - implement relevant drawing function
+	return [] as SVGElement[];
 }
 
 
-/** @hidden */
+/** @internal */
 const drawElemFunctions: TDrawElemFunctions = {
 	oneProng: drawOneProng,
 	oneProngAtDullCorner,
-	
 	twoProng_regular: twoProng,
 	twoProng_failed: twoProng,
 	twoProng_notAdded: twoProng,

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

@@ -1,14 +1,18 @@
 import { drawFs } from 'flo-draw';
-import { Curve } from '../../../curve.js';
+import { Curve } from '../../../curve/curve.js';
 
 
-/** @hidden */
-function dullCorner(g: SVGGElement, curve: Curve) {
-	const scaleFactor = 1;
-		
+/** @internal */
+function dullCorner(
+		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.5*scaleFactor, 'orange');
+	const $pos = drawFs.dot(g, p, 0.1*0.5*scaleFactor, classes, delay);
 	
 	return $pos;
 }

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

@@ -1,8 +1,8 @@
-import { CpNode } from '../../../cp-node.js';
+import { CpNode } from '../../../cp-node/cp-node.js';
 import { drawCirclePercent } from './draw-circle-percent.js';
 
 
-/** @hidden */
+/** @internal */
 function leaves(g: SVGGElement, leaves: CpNode[]) {	
     const $elems: SVGElement[] = [];
 

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

@@ -1,7 +1,8 @@
-import { Loop } from "../../../loop.js";
+//import { Loop } from "../../../loop.js";
+import { Loop } from 'flo-boolean';
 
-// TODO - finish
-/** @hidden */
+
+/** @internal */
 function loop(g: SVGGElement, loop: Loop): SVGElement[] {
     /*
     for (let curve of loop.curves) {

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

@@ -1,7 +1,6 @@
-import { Loop } from "../../../loop.js";
+import { Loop } from 'flo-boolean';
 
 
-// TODO - finish
 /** @hidden */
 function loops(g: SVGGElement, loops: Loop[]): SVGElement[] {
     return [];

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

@@ -1,13 +1,18 @@
 import { drawFs } from "flo-draw";
 
 
-/** @hidden */
-function looseBoundingBox(g: SVGGElement, box: number[][]) {
+/** @internal */
+function looseBoundingBox(
+		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 $box = drawFs.polygon(g, box, 'thin5 brown nofill');
+	const $box = drawFs.polygon(g, box, classes, delay);
 	
 	return $box;
 }

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

@@ -1,26 +1,34 @@
 import { drawFs } from 'flo-draw';
-import { Mat } from '../../../mat.js';
-import { traverseEdges } from '../../../traverse-edges.js';
-import { getCurveToNext } from '../../../get-curve-to-next.js';
+import { Mat } from '../../../mat/mat.js';
+import { traverseEdges } from '../../../cp-node/traverse-edges.js';
+import { getCurveToNext } from '../../../cp-node/get-curve-to-next.js';
+import { isTerminating } from '../../../cp-node/cp-node.js';
 
 
-/** @hidden */
+/** @internal */
 function drawMat(type: 'mat' | 'sat') {
 
     const classes: string = type === 'mat'
         ? 'thin5 purple nofill'
         : 'thin10 red nofill';
 
-    return (g: SVGGElement, mat: Mat) => {
+    return (
+            g: SVGGElement,
+            mat: Mat,
+            classes_?: string,
+            delay = 0,
+            scaleFactor = 1): SVGElement[] => {
+
         const cpNode = mat.cpNode;
         
-        if (!cpNode) { return undefined; }
+        // if (!cpNode) { return undefined; }
+        if (!cpNode) { return []; }
 
         const $svgs: SVGElement[] = [];
         let i = 0;
 
         traverseEdges(cpNode, cpNode => {
-            if (cpNode.isTerminating()) { return; }
+            if (isTerminating(cpNode)) { return; }
     
             const bezier = getCurveToNext(cpNode);
 
@@ -28,7 +36,7 @@ function drawMat(type: 'mat' | 'sat') {
 
             i++;
             
-            $svgs.push( ...drawFs.bezier(g, bezier, classes/*, i*500*/));
+            $svgs.push( ...drawFs.bezier(g, bezier, classes, delay));
         });
         
         return $svgs;

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

@@ -1,8 +1,8 @@
 import { drawFs } from 'flo-draw';
-import { CpNode } from '../../../cp-node.js';
+import { CpNode } from '../../../cp-node/cp-node.js';
 
 
-/** @hidden */
+/** @internal */
 function maxVertex(g: SVGGElement, cpNode: CpNode) {	
     const circle = cpNode.cp.circle;
 

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

@@ -1,16 +1,11 @@
 import { toCubic, evalDeCasteljau } from 'flo-bezier3';
 import { drawFs } from 'flo-draw';
-import { IPointOnShape } from '../../../point-on-shape.js';
+import { PointOnShape } from '../../../point-on-shape/point-on-shape.js';
 
 
-/** @hidden */
-function minY(g: SVGGElement, pos: IPointOnShape) {	
-    const p = evalDeCasteljau(pos.curve.ps, pos.t) ;
-
-    const ps = toCubic(pos.curve.ps);
-    //console.log('x: ', getX(ps));
-    //console.log('y: ', getY(ps));
-    //console.log('t: ', pos.t);
+/** @internal */
+function minY(g: SVGGElement, pos: PointOnShape) {
+    const p = evalDeCasteljau(pos.curve.ps, pos.t);
 
     const $elems = drawFs.crossHair( 
             g, p, 'red thin10 nofill'

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

@@ -1,9 +1,17 @@
+
 import { drawFs } from 'flo-draw';
-import { getOsculatingCircle, IPointOnShape } from '../../../point-on-shape.js';
+import { PointOnShape } from '../../../point-on-shape/point-on-shape.js';
+import { getOsculatingCircle } from '../../../point-on-shape/get-osculating-circle.js';
 
 
 /** @hidden */
-function oneProngAtDullCorner(g: SVGGElement, pos: IPointOnShape) {
+function oneProngAtDullCorner(
+        g: SVGGElement,
+        pos: PointOnShape,
+        classes?: string,
+        delay = 1000,
+        scaleFactor = 1) {
+
     //let oCircle = PointOnShape.getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
     const oCircle = getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
 

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

@@ -1,24 +1,21 @@
 import { drawFs } from 'flo-draw';
-import { getOsculatingCircle, IPointOnShape } from '../../../point-on-shape.js';
-import { Circle, scaleCircle } from '../../../circle.js';
+import { CpNode } from '../../../cp-node/cp-node.js';
 
 
 /** @hidden */
-const scaleFactor = 0.5;
+function drawOneProng(
+        g: SVGGElement,
+        cpNodes: CpNode[],
+        classes?: string,
+        delay = 0,
+        scaleFactor = 1) {
 
+    const cp = cpNodes[0].cp;
+    const { circle, pointOnShape: pos } = cp;
+    const $center = drawFs.dot(g, pos.p, 0.02*scaleFactor, 'deeppink', delay);
+    const $circle = drawFs.dot(g, circle.center, 0.05*scaleFactor, 'deeppink', delay);
+    const $pos    = drawFs.circle(g, circle, 'deeppink thin5 nofill', delay);
 
-/** @hidden */
-function drawOneProng(g: SVGGElement, pos: IPointOnShape, classes: string, delay = 0) {
-    const circle = scaleCircle(
-        //PointOnShape.getOsculatingCircle(Number.POSITIVE_INFINITY, pos),
-        getOsculatingCircle(Number.POSITIVE_INFINITY, pos),
-        1
-    );
-
-    const $center = drawFs.dot(g, pos.p, 0.1*scaleFactor, 'gray', delay);
-    const $circle = drawFs.dot(g, circle.center, 0.25*scaleFactor, 'gray', delay);
-    const $pos    = drawFs.circle(g, circle, 'gray thin10 nofill', delay);
-        
 	return [...$center, ...$circle, ...$pos];
 }
 

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

@@ -1,13 +1,17 @@
 import { drawFs } from 'flo-draw';
-import { Curve } from '../../../curve.js';
+import { Curve } from '../../../curve/curve.js';
 
 
-/** @hidden */
-function sharpCorner(g: SVGGElement, curve: Curve) {
-	const scaleFactor = 1;
-		
+/** @internal */
+function sharpCorner(
+		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');
+	const $pos = drawFs.dot(g, p, 0.6*scaleFactor, 'green', delay);
 		
 	return $pos;
 }

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

@@ -1,25 +1,27 @@
 import { drawFs } from 'flo-draw';
 import { ThreeProngForDebugging } from '../../three-prong-for-debugging.js';
-import { Circle, scaleCircle } from '../../../circle.js';
+import { Circle, scaleCircle } from '../../../geometry/circle.js';
 
 
-/** @hidden */
-const scaleFactor = 0.3;
+/** @internal */
+function threeProng(
+		g: SVGGElement,
+		threeProng: ThreeProngForDebugging,
+		classes?: string,
+		delay = 0,
+		scaleFactor = 1) {
 
-
-/** @hidden */
-function threeProng(g: SVGGElement, threeProng: ThreeProngForDebugging) {
 	const circle = scaleCircle(
 		threeProng.circle,
 		1
 	);
 	const poss = threeProng.poss;
 		
-	const $cp1 = drawFs.dot(g, poss[0].p, 0.1*1*scaleFactor, 'blue');
-	const $cp2 = drawFs.dot(g, poss[1].p, 0.1*2*scaleFactor, 'blue');
-	const $cp3 = drawFs.dot(g, poss[2].p, 0.1*3*scaleFactor, 'blue');
-	const $center = drawFs.dot(g, circle.center, 0.3*scaleFactor, 'blue');
-	const $circle = drawFs.circle(g, circle, 'blue thin2 nofill');
+	const $cp1 = drawFs.dot(g, poss[0].p, 0.01*1*scaleFactor, 'blue', delay);
+	const $cp2 = drawFs.dot(g, poss[1].p, 0.01*2*scaleFactor, 'blue', delay);
+	const $cp3 = drawFs.dot(g, poss[2].p, 0.01*3*scaleFactor, 'blue', delay);
+	const $center = drawFs.dot(g, circle.center, 0.03*scaleFactor, 'blue', delay);
+	const $circle = drawFs.circle(g, circle, 'blue thin2 nofill', delay);
 		
 	return [...$center, ...$cp1, ...$cp2, ...$cp3, ...$circle];
 }		

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

@@ -1,9 +1,15 @@
 import { drawFs } from 'flo-draw';
 
 
-/** @hidden */
-function tightBoundingBox(g: SVGGElement, box: number[][]) {
-	const $box = drawFs.polygon(g, box, 'thin5 pinker nofill');
+/** @internal */
+function tightBoundingBox(
+		g: SVGGElement,
+		box: number[][], 
+        classes = 'thin5 pinker nofill',
+        delay = 0,
+        scaleFactor = 1) {
+
+	const $box = drawFs.polygon(g, box, 'thin5 pinker nofill', delay);
 
 	return $box;
 }

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

@@ -3,9 +3,13 @@ import { TwoProngForDebugging   } from '../../two-prong-for-debugging.js';
 import { getTwoProngType } from '../../../mat/get-two-prong-type.js';
 
 
-/** @hidden */
-function twoProng(g: SVGGElement, twoProng: TwoProngForDebugging) {
-	const scaleFactor = 0.3;
+/** @internal */
+function twoProng(
+		g: SVGGElement,
+		twoProng: TwoProngForDebugging,
+        classes?: string,
+        delay = 0,
+        scaleFactor = 1) {
 
 	let $failedDot : SVGElement[] = [];
 	let $center    : SVGElement[] = [];
@@ -31,12 +35,12 @@ function twoProng(g: SVGGElement, twoProng: TwoProngForDebugging) {
 		
 	
 	if (twoProng.failed) {
-		$failedDot = drawFs.dot(g, twoProng.pos.p, 1*scaleFactor, 'black');
+		$failedDot = drawFs.dot(g, twoProng.pos.p, 1*scaleFactor, 'black', delay);
 	} else if (!twoProng.failed) {
-		$center = drawFs.dot   (g, twoProng.circle.center, 1*scaleFactor, 'yellow');
-		$circle = drawFs.circle(g, twoProng.circle, color + 'thin' + thin + ' nofill'); 
-		$cp1    = drawFs.dot   (g, twoProng.pos.p, 0.035*scaleFactor, color);
-		$cp2    = drawFs.dot   (g, twoProng.z, 0.07*scaleFactor, color);	
+		$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];	

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

@@ -1,28 +1,29 @@
 import { drawFs } from 'flo-draw';
-import { CpNode } from '../../../cp-node.js';
+import { CpNode, getCpNodesOnCircle } from '../../../cp-node/cp-node.js';
 
 
-/** @hidden */
+/** @internal */
 function vertex(
 		g: SVGGElement,
 		cpNode: CpNode,
 		classes?: string,
-		delay?: number,
-		visible = true) {
+		delay?: number,/*
+		visible = true*/
+		scaleFactor = 1) {
 
-	const visibleClass = visible ? '' : ' invisible';
+	// const visibleClass = visible ? '' : ' invisible';
 
 	const circle = cpNode.cp.circle;
 
 	const THIN = 'thin20';
 
-	const cps = cpNode.getCpNodesOnCircle();
+	const cps = getCpNodesOnCircle(cpNode);
 	console.log(cps)
 
 	let $svgs: SVGElement[] = [];
 
-	const $circle = drawFs.circle(g, circle, 'red ' + THIN + ' nofill ' + visibleClass, delay);
-	const $crossHair = drawFs.crossHair(g, circle.center, 'red ' + THIN + ' nofill ' + visibleClass, 3, delay);
+	const $circle = drawFs.circle(g, circle, 'red ' + THIN + ' nofill '/* + visibleClass*/, delay);
+	const $crossHair = drawFs.crossHair(g, circle.center, 'red ' + THIN + ' nofill '/* + visibleClass*/, 3, delay);
 
 	$svgs = [...$circle, ...$crossHair];
 
@@ -30,15 +31,15 @@ function vertex(
 		const cp = cps[i];
 		const edgeCircle = cp.next.cp.circle;
 
-		const $circle = drawFs.circle(g, edgeCircle, 'pink ' + THIN + ' nofill ' + visibleClass, delay);
-		const $crossHair = drawFs.crossHair(g, edgeCircle.center, 'pink ' + THIN + ' nofill ' + visibleClass, 3, delay);
+		const $circle = drawFs.circle(g, edgeCircle, 'pink ' + THIN + ' nofill '/* + visibleClass*/, delay);
+		const $crossHair = drawFs.crossHair(g, edgeCircle.center, 'pink ' + THIN + ' nofill '/* + visibleClass*/, 3, delay);
 
 		$svgs.push(...$circle, ...$crossHair)
 
 		const p1 = circle.center;
 		const p2 = edgeCircle.center;
 		const thin = i === 0 ? 'thin10' : (i === 1 ? 'thin20' : 'thin35');
-		const $line = drawFs.line(g, [p1, p2], 'yellow ' + thin  + ' nofill ' + visibleClass, delay);
+		const $line = drawFs.line(g, [p1, p2], 'yellow ' + thin  + ' nofill '/* + visibleClass*/, delay);
 
 		$svgs.push(...$line);
 	}