flo-mat 3.0.9 → 3.0.11

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

@@ -1,203 +1,203 @@
-declare let _debug_: Debug; 
-
-import { drawFs } from 'flo-draw';
-import { getObjClosestTo, distanceBetween, squaredDistanceBetween } from 'flo-vector2d';
-import { Debug, Generated } from '../debug.js';
-import { CpNode } from '../../cp-node/cp-node.js';
-import { Circle } from '../../geometry/circle.js';
-import { TwoProngForDebugging } from '../two-prong-for-debugging.js';
-import { ElemType_TwoProng } from '../../mat/elem-type-two-prong.js';
-
-
-/** @internal */
-interface ITwoProngDebugFunctions {
-	logδ       : (n: number, type?: ElemType_TwoProng) => void,
-	log        : (n: number, type?: ElemType_TwoProng) => void,
-	drawNormal : typeof drawNormal,
-	logδBasic  : (n: number) => void,
-	logNearest : (
-		showSpokes?     : boolean,
-		showTrace?      : boolean,
-		showBoundaries? : boolean
-	) => (g: SVGGElement, p: number[], showDelay?: number, scale?: number) => void,
-	traceConvergence: typeof traceConvergence,
-}
-
-
-/**
- * @internal
- */
-function logδ(n: number, type: ElemType_TwoProng = 'twoProng_regular') {
-	const δ =_debug_.generated.elems[type][n].δ;
-	
-	console.log(δ);
-}
-
-
-/**
- * @internal
- */
-function log(n: number, type: ElemType_TwoProng = 'twoProng_regular') {
-	const twoProng = _debug_.generated.elems[type][n];
-	console.log(twoProng);
-}
-
-
-/**
- * @internal
- */
-function drawNormal(
-		g: SVGGElement,
-		twoProng: TwoProngForDebugging, 
-		showDelay = 1000) {
-
-	drawFs.line(
-		g, [twoProng.pos.p, twoProng.circle.center], 'thin10 blue', showDelay
-	);
-}
-
-
-/**
- * @internal
- */
-function logδBasic(
-		n: number, 
-		type: ElemType_TwoProng = 'twoProng_regular') {
-
-	const delta = _debug_.generated.elems[type][n].δ;
-
-	function logδBasic_(x: CpNode) {
-		const pos = x.cp.pointOnShape;
-		return {
-			bez: pos.curve.ps,
-			t: pos.t
-		}
-	}
-	
-	console.log(logδBasic_(delta[0]));
-	console.log(logδBasic_(delta[1]));
-}
-
-
-/**
- * @internal
- * Draws 3 lines from the given 3-prong center to its 3 contact points.
- * @param n - The 3-prong's zero-based index. 
- */
-function drawSpokes(
-        g: SVGGElement,
-        twoProng: TwoProngForDebugging,
-        showDelay = 1000): void {
-
-	const cc = twoProng.circle.center;
-	const { pos, circle, cpNode, xs, z, δ } = twoProng;
+// declare let _debug_: Debug; 
+
+// import { drawFs } from 'flo-draw';
+// import { getObjClosestTo, distanceBetween, squaredDistanceBetween } from 'flo-vector2d';
+// import { Debug, Generated } from '../debug.js';
+// import { CpNode } from '../../cp-node/cp-node.js';
+// import { Circle } from '../../geometry/circle.js';
+// import { TwoProngForDebugging } from '../two-prong-for-debugging.js';
+// import { ElemType_TwoProng } from '../../mat/elem-type-two-prong.js';
+
+
+// /** @internal */
+// interface ITwoProngDebugFunctions {
+//     logδ       : (n: number, type?: ElemType_TwoProng) => void,
+//     log        : (n: number, type?: ElemType_TwoProng) => void,
+//     drawNormal : typeof drawNormal,
+//     logδBasic  : (n: number) => void,
+//     logNearest : (
+//         showSpokes?     : boolean,
+//         showTrace?      : boolean,
+//         showBoundaries? : boolean
+//     ) => (g: SVGGElement, p: number[], showDelay?: number, scale?: number) => void,
+//     traceConvergence: typeof traceConvergence,
+// }
+
+
+// /**
+//  * @internal
+//  */
+// function logδ(n: number, type: ElemType_TwoProng = 'twoProng_regular') {
+//     const δ =_debug_.generated.elems[type][n].δ;
     
-	drawFs.line(g, [pos.p, cc], 'thin5 red', showDelay);
-    drawFs.line(g, [z, cc], 'thin5 red', showDelay);
-}
-
-
-/**
- * @internal
- */
-function logNearest(
-        showSpokes?: boolean,
-		showTrace?: boolean,
-		showBoundaries?: boolean) {
+//     console.log(δ);
+// }
+
+
+// /**
+//  * @internal
+//  */
+// function log(n: number, type: ElemType_TwoProng = 'twoProng_regular') {
+//     const twoProng = _debug_.generated.elems[type][n];
+//     console.log(twoProng);
+// }
+
+
+// /**
+//  * @internal
+//  */
+// function drawNormal(
+//         g: SVGGElement,
+//         twoProng: TwoProngForDebugging, 
+//         showDelay = 1000) {
+
+//     drawFs.line(
+//         g, [twoProng.pos.p, twoProng.circle.center], 'thin10 blue', showDelay
+//     );
+// }
+
+
+// /**
+//  * @internal
+//  */
+// function logδBasic(
+//         n: number, 
+//         type: ElemType_TwoProng = 'twoProng_regular') {
+
+//     const delta = _debug_.generated.elems[type][n].δ;
+
+//     function logδBasic_(x: CpNode) {
+//         const pos = x.cp.pointOnShape;
+//         return {
+//             bez: pos.curve.ps,
+//             t: pos.t
+//         }
+//     }
+    
+//     console.log(logδBasic_(delta[0]));
+//     console.log(logδBasic_(delta[1]));
+// }
+
+
+// /**
+//  * @internal
+//  * Draws 3 lines from the given 3-prong center to its 3 contact points.
+//  * @param n - The 3-prong's zero-based index. 
+//  */
+// function drawSpokes(
+//         g: SVGGElement,
+//         twoProng: TwoProngForDebugging,
+//         showDelay = 1000): void {
+
+//     const cc = twoProng.circle.center;
+//     const { pos, circle, cpNode, xs, z, δ } = twoProng;
+    
+//     drawFs.line(g, [pos.p, cc], 'thin5 red', showDelay);
+//     drawFs.line(g, [z, cc], 'thin5 red', showDelay);
+// }
+
+
+// /**
+//  * @internal
+//  */
+// function logNearest(
+//         showSpokes?: boolean,
+//         showTrace?: boolean,
+//         showBoundaries?: boolean) {
             
-    return (g: SVGGElement,
-			p: number[],
-			showDelay = 1000,
-			scale = 1) => {
-				
-		const closestPerLoops: TwoProngForDebugging[] = [];
-
-		const generated = _debug_.generated;
-		const twoProng = getObjClosestTo<TwoProngForDebugging>(
-			p, 
-			// generated.elems[type], 
-			generated.elems['twoProng_regular'],
-			twoProng => twoProng.circle.center
-		)!;
-		closestPerLoops.push(twoProng!);
-
-		console.log(twoProng);
-		
-		let n;
-		//for (let i=0; i<_debug_.generated.elems[type].length; i++) {
-		//	const twoProng_ = _debug_.generated.elems[type][i];
-		for (let i=0; i<_debug_.generated.elems['twoProng_regular'].length; i++) {
-			const twoProng_ = _debug_.generated.elems['twoProng_regular'][i];
-			if (twoProng_ === twoProng) {
-				n = i;
-				break;
-			}
-		}
-
-        if (showSpokes) {
-            drawSpokes(g, twoProng, showDelay)
-        }
-		
-		if (n !== undefined && showTrace) {
-			traceConvergence(g, twoProng, showDelay, scale);
-		}
-	}
-}
-
-
-/**
- * @internal
- * @param n - The 2-prong's zero-based index.
- * @param range
- */
-function traceConvergence(
-		g: SVGGElement, 
-		twoProng: TwoProngForDebugging, 
-		showDelay = 1000,
-		scale = 1) {
-
-	const xs = twoProng.xs;
-
-	console.log(twoProng);
-	console.log(
-		twoProng.xs.map(x => ({
-				x: x.x,
-				y: x.y,
-				z: x.z, 
-				d: x.z ? squaredDistanceBetween(x.y.p, x.z.p) : 0,
-				t: x.t,
-			})
-		)
-	);
-
-    console.log(xs.length)
-	for (let i=0; i<xs.length; i++) {
-		const x = twoProng.xs[i];
-
-		const circle = { center: x.x, radius: distanceBetween(x.x, x.y.p) };
-		drawFs.crossHair(g, x.x, 'red thin10 nofill', 0.002*scale, showDelay);
-		drawFs.circle(g, circle, 'blue thin10 nofill', showDelay);
-		if (x.z !== undefined) {
-			drawFs.crossHair(
-				g, x.z.p, 'yellow thin10 nofill', 0.001*scale, showDelay
-			);
-		}
-	}
-
-	// twoProngDebugFunctions.drawNormal(g, twoProng, showDelay);
-}
-
-
-/** @internal */
-const twoProngDebugFunctions: ITwoProngDebugFunctions = {
-	logδ,
-	log,
-	drawNormal,
-	logδBasic,
-	traceConvergence,
-	logNearest,	
-}
-
-
-export { ITwoProngDebugFunctions, twoProngDebugFunctions };
-	
+//     return (g: SVGGElement,
+//             p: number[],
+//             showDelay = 1000,
+//             scale = 1) => {
+                
+//         const closestPerLoops: TwoProngForDebugging[] = [];
+
+//         const generated = _debug_.generated;
+//         const twoProng = getObjClosestTo<TwoProngForDebugging>(
+//             p, 
+//             // generated.elems[type], 
+//             generated.elems['twoProng_regular'],
+//             twoProng => twoProng.circle.center
+//         )!;
+//         closestPerLoops.push(twoProng!);
+
+//         console.log(twoProng);
+        
+//         let n;
+//         //for (let i=0; i<_debug_.generated.elems[type].length; i++) {
+//         //    const twoProng_ = _debug_.generated.elems[type][i];
+//         for (let i=0; i<_debug_.generated.elems['twoProng_regular'].length; i++) {
+//             const twoProng_ = _debug_.generated.elems['twoProng_regular'][i];
+//             if (twoProng_ === twoProng) {
+//                 n = i;
+//                 break;
+//             }
+//         }
+
+//         if (showSpokes) {
+//             drawSpokes(g, twoProng, showDelay)
+//         }
+        
+//         if (n !== undefined && showTrace) {
+//             traceConvergence(g, twoProng, showDelay, scale);
+//         }
+//     }
+// }
+
+
+// /**
+//  * @internal
+//  * @param n - The 2-prong's zero-based index.
+//  * @param range
+//  */
+// function traceConvergence(
+//         g: SVGGElement, 
+//         twoProng: TwoProngForDebugging, 
+//         showDelay = 1000,
+//         scale = 1) {
+
+//     const xs = twoProng.xs;
+
+//     console.log(twoProng);
+//     console.log(
+//         twoProng.xs.map(x => ({
+//                 x: x.x,
+//                 y: x.y,
+//                 z: x.z, 
+//                 d: x.z ? squaredDistanceBetween(x.y.p, x.z.p) : 0,
+//                 t: x.t,
+//             })
+//         )
+//     );
+
+//     console.log(xs.length)
+//     for (let i=0; i<xs.length; i++) {
+//         const x = twoProng.xs[i];
+
+//         const circle = { center: x.x, radius: distanceBetween(x.x, x.y.p) };
+//         drawFs.crossHair(g, x.x, 'red thin10 nofill', 0.002*scale, showDelay);
+//         drawFs.circle(g, circle, 'blue thin10 nofill', showDelay);
+//         if (x.z !== undefined) {
+//             drawFs.crossHair(
+//                 g, x.z.p, 'yellow thin10 nofill', 0.001*scale, showDelay
+//             );
+//         }
+//     }
+
+//     // twoProngDebugFunctions.drawNormal(g, twoProng, showDelay);
+// }
+
+
+// /** @internal */
+// const twoProngDebugFunctions: ITwoProngDebugFunctions = {
+//     logδ,
+//     log,
+//     drawNormal,
+//     logδBasic,
+//     traceConvergence,
+//     logNearest,    
+// }
+
+
+// export { ITwoProngDebugFunctions, twoProngDebugFunctions };
+    

package/src/debug/two-prong-for-debugging.ts

@@ -1,30 +1,30 @@
-import { CpNode } from '../cp-node/cp-node.js';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { Circle } from '../geometry/circle.js';
-import { CurvePiece } from '../mat/bezier-piece.js';
-import { Generated } from './debug.js';
+// import { CpNode } from '../cp-node/cp-node.js';
+// import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+// import { Circle } from '../geometry/circle.js';
+// import { CurvePiece } from '../mat/bezier-piece.js';
+// import { Generated } from './debug.js';
 
 
-/** @internal */
-interface TwoProngForDebugging {
-    generated: Generated;
-    bezierPieces: CurvePiece[];
-    pos: PointOnShape;
-    δ: CpNode[]; 
-    z: number[];
-    circle: Circle; 
-    xs: { 
-        x: number[]; 
-        y: PointOnShape; 
-        z: PointOnShape; 
-        t: number; 
-    }[]; 
-    failed: boolean; 
-    holeClosing: boolean;
-    notAdded: boolean;
-    deleted: boolean;
-    cpNode: CpNode;
-}
+// /** @internal */
+// interface TwoProngForDebugging {
+//     generated: Generated;
+//     bezierPieces: CurvePiece[];
+//     pos: PointOnShape;
+//     δ: CpNode[]; 
+//     z: number[];
+//     circle: Circle; 
+//     xs: { 
+//         x: number[]; 
+//         y: PointOnShape; 
+//         z: PointOnShape; 
+//         t: number; 
+//     }[]; 
+//     failed: boolean; 
+//     holeClosing: boolean;
+//     notAdded: boolean;
+//     deleted: boolean;
+//     cpNode: CpNode;
+// }
 
 
-export { TwoProngForDebugging }
+// export { TwoProngForDebugging }

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

@@ -15,44 +15,44 @@ import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
  * @param pos 
  */
 function add1Prong(
-		meta: MatMeta,
-		radius: number,
+        meta: MatMeta,
+        radius: number,
         center: number[],
         pos: PointOnShape) {
 
     if (isPosCorner(pos) && getPosCorner(pos).isDull) {
-		// This is a 1-prong at a dull corner.
-		
-		// TODO IMPORTANT 
-		// Remove this line, uncomment piece below it and implement the 
-		// following strategy to find the 3-prongs: if deltas are conjoined due 
-		// to dull corner, split the conjoinment by inserting successively 
-		// closer (binary division) 2-prongs. If a 2-prong actually fails, 
-		// simply remove the 1-prong at the dull corner. In this way **all** 
+        // This is a 1-prong at a dull corner.
+        
+        // TODO IMPORTANT 
+        // Remove this line, uncomment piece below it and implement the 
+        // following strategy to find the 3-prongs: if deltas are conjoined due 
+        // to dull corner, split the conjoinment by inserting successively 
+        // closer (binary division) 2-prongs. If a 2-prong actually fails, 
+        // simply remove the 1-prong at the dull corner. In this way **all** 
         // terminal points are found, e.g. zoom in on top left leg of ant.
         // Afterthought: there is a better way - split points by two prongs.
 
-		//toRemove.push(posNode); // this!
-		
-		// if (typeof _debug_ !== 'undefined') { 
+        //toRemove.push(posNode); // this!
+        
+        // if (typeof _debug_ !== 'undefined') { 
             // _debug_.generated.elems.oneProngAtDullCorner.push(pos);
         // }
 
-		return;
-	}
-	
+        return;
+    }
+    
     const circle: Circle = { radius, center };
-	
-	const order = calcPosOrder(circle, pos);
-	// Make sure there isn't already a ContactPoint close by - it can cause
-	// floating point stability issues.
-	if (getCloseByCpIfExist(meta, pos, circle, order, 0, 1)) {
-		return;
-	}
+    
+    const order = calcPosOrder(circle, pos);
+    // Make sure there isn't already a ContactPoint close by - it can cause
+    // floating point stability issues.
+    if (getCloseByCpIfExist(meta, pos, circle, order, 0, 1)) {
+        return;
+    }
 
     const { anyFailed, cpNodes } = addToCpTree(false, false, circle, [-0.5, +0.5], meta, [pos, pos]); 
-	
-	// if (typeof _debug_ !== 'undefined') { 
+    
+    // if (typeof _debug_ !== 'undefined') { 
     //     _debug_.generated.elems.oneProng.push(cpNodes);
     // }
 }

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

@@ -1,45 +1,45 @@
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { Circle } from '../geometry/circle.js';
-import { CpNode } from '../cp-node/cp-node.js';
-import { CurvePiece } from '../mat/bezier-piece.js';
-import { TwoProngForDebugging } from '../debug/two-prong-for-debugging.js';
-import { getTwoProngType } from '../mat/get-two-prong-type.js';
-import { ElemType_TwoProng } from '../mat/elem-type-two-prong.js';
-import { TXForDebugging } from './x-for-debugging.js';
+// import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+// import { Circle } from '../geometry/circle.js';
+// import { CpNode } from '../cp-node/cp-node.js';
+// import { CurvePiece } from '../mat/bezier-piece.js';
+// import { TwoProngForDebugging } from '../debug/two-prong-for-debugging.js';
+// import { getTwoProngType } from '../mat/get-two-prong-type.js';
+// import { ElemType_TwoProng } from '../mat/elem-type-two-prong.js';
+// import { TXForDebugging } from './x-for-debugging.js';
 
 
-/** @internal */
-function addDebugInfo(
-        bezierPieces: CurvePiece[],
-        failed: boolean, 
-        x: number[],
-        y: PointOnShape,
-        z: PointOnShape,
-        circle: Circle,
-        δ: CpNode[], 
-        xs: TXForDebugging[], 
-        holeClosing: boolean) {
+// /** @internal */
+// function addDebugInfo(
+//         bezierPieces: CurvePiece[],
+//         failed: boolean, 
+//         x: number[],
+//         y: PointOnShape,
+//         z: PointOnShape,
+//         circle: Circle,
+//         δ: CpNode[], 
+//         xs: TXForDebugging[], 
+//         holeClosing: boolean) {
 
-//     xs.push({ x, y, z, t: y.t });
+// //     xs.push({ x, y, z, t: y.t });
 
-//     const twoProng: TwoProngForDebugging = {
-//             generated: _debug_.generated,
-//             bezierPieces,
-//             pos: y,
-//             δ,
-//             z: z ? z.p : undefined!,
-//             circle,
-//             xs,
-//             failed,
-//             holeClosing,
-//             notAdded: false,
-//             deleted: false,
-//             cpNode: undefined!
-//     };
+// //     const twoProng: TwoProngForDebugging = {
+// //             generated: _debug_.generated,
+// //             bezierPieces,
+// //             pos: y,
+// //             δ,
+// //             z: z ? z.p : undefined!,
+// //             circle,
+// //             xs,
+// //             failed,
+// //             holeClosing,
+// //             notAdded: false,
+// //             deleted: false,
+// //             cpNode: undefined!
+// //     };
 
-//     const twoProngType = getTwoProngType(twoProng) as ElemType_TwoProng;
-//     _debug_.generated.elems[twoProngType].push(twoProng);
-}
+// //     const twoProngType = getTwoProngType(twoProng) as ElemType_TwoProng;
+// //     _debug_.generated.elems[twoProngType].push(twoProng);
+// }
 
 
-export { addDebugInfo }
+// export { addDebugInfo }

package/src/find-2-prong/cull-bezier-pieces.ts

@@ -5,32 +5,32 @@ import { getBoundingBox$ } from '../geometry/get-bounding-box-.js';
 
 /**
  * @internal
- * Cull all bezierPieces not within given radius of a given point.
+ * Cull all curvePieces not within given radius of a given point.
  * @param extreme
- * @param bezierPieces
+ * @param curvePieces
  * @param p
  * @param rSquared
  */
-function cullBezierPieces2(
-        bezierPieces: CurvePiece[], 
+function cullCurvePieces2(
+        curvePieces: CurvePiece[], 
         p: number[], 
         rSquared: number) {
 
     const TOLERANCE = 1 + 2**-10;
 
-    if (bezierPieces.length <= 1) {
-        return bezierPieces;
+    if (curvePieces.length <= 1) {
+        return curvePieces;
     }
 
 
     const newPieces = [];
-    for (const bezierPiece of bezierPieces) {
-        const ps = bezierPiece.curve.ps;
+    for (const curvePiece of curvePieces) {
+        const ps = curvePiece.curve.ps;
         
         const rect = getBoundingBox$(ps);
         const bd = getClosestSquareDistanceToRect(rect, p);
         if (bd <= TOLERANCE*rSquared) {
-            newPieces.push(bezierPiece);
+            newPieces.push(curvePiece);
         } 
     }
 
@@ -38,4 +38,4 @@ function cullBezierPieces2(
 }
 
 
-export { cullBezierPieces2 }
+export { cullCurvePieces2 }