webgl2-sdf 0.0.2 → 0.0.4

package/node/webgl-utils/use-program.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-program.js","sourceRoot":"","sources":["../../src/webgl-utils/use-program.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;;;;;;;;;;;GAYG;AACH,SAAS,WAAW,CACR,SAAoB,EACpB,IAAY,EACZ,IAAY,EACZ,IAAY;IAEpB,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAEnC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,UAAU,GAAkC,EAAE,CAAC;IACrD,MAAM,QAAQ,GAAoD,EAAE,CAAC;IACrE,MAAM,aAAa,GAAqC,EAAE,CAAC;IAE3D,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;IACnC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACpE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IACtE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAExB,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;IAEtE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"use-program.js","sourceRoot":"","sources":["../../src/webgl-utils/use-program.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;;;;;;;;;;GAYG;AACH,SAAS,WAAW,CACR,SAAoB,EACpB,IAAY,EACZ,IAAY,EACZ,IAAY;IAEpB,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAEnC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,UAAU,GAAkC,EAAE,CAAC;IACrD,MAAM,QAAQ,GAAoD,EAAE,CAAC;IACrE,MAAM,aAAa,GAAqC,EAAE,CAAC;IAE3D,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC;IAEnE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACvC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACzC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAExB,QAAQ,CAAC,IAAI,CAAC,GAAG;QACb,EAAE;QACF,OAAO;QACP,UAAU;QACV,QAAQ;QACR,aAAa;QACb,YAAY;QACZ,cAAc;KACjB,CAAC;IAEF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/package.json

@@ -2,7 +2,7 @@
     "name": "webgl2-sdf",
     "sideEffects": false,
     "description": "Fast sdf generator from bezier curves or svg string.",
-    "version": "0.0.2",
+    "version": "0.0.4",
     "author": {
         "name": "Floris Steenkamp"
     },

package/src/bezier/is-cubic-obtuse.ts

@@ -1,5 +1,5 @@
-import { fromToVec } from '../vector/from-to-vec';
-import { dot } from "../vector/dot";
+import { fromToVec } from '../vector/from-to-vec.js';
+import { dot } from "../vector/dot.js";
 
 
 /** 

package/src/bezier/is-quad-obtuse.ts

@@ -1,5 +1,5 @@
-import { fromToVec } from '../vector/from-to-vec';
-import { dot } from "../vector/dot";
+import { fromToVec } from '../vector/from-to-vec.js';
+import { dot } from "../vector/dot.js";
 
 
 /** 

package/src/bezier/split-by-deviation-from-straight-line-quad.ts

@@ -1,7 +1,7 @@
 import { getDistanceToLineFunction } from '../utils/get-distance-to-line-function.js';
-import { evalDeCasteljau } from './eval-de-casteljau';
-import { fromTo } from './from-to/from-to';
-import { isQuadObtuse } from './is-quad-obtuse';
+import { evalDeCasteljau } from './eval-de-casteljau.js';
+import { fromTo } from './from-to/from-to.js';
+import { isQuadObtuse } from './is-quad-obtuse.js';
 
 const { abs } = Math;
 

package/src/bezier/split-into-line-segments.ts

@@ -1,7 +1,7 @@
-import { evalDeCasteljau } from './eval-de-casteljau';
-import { splitByDeviationFromStraighLine_Cubic_Crude } from './split-by-deviation-from-straight-line-cubic';
+import { evalDeCasteljau } from './eval-de-casteljau.js';
+import { splitByDeviationFromStraighLine_Cubic_Crude } from './split-by-deviation-from-straight-line-cubic.js';
 // import { splitByDeviationFromStraighLine_Cubic_Precise } from './split-by-deviation-from-straight-line-cubic';
-import { splitByDeviationFromStraighLine_Quad } from './split-by-deviation-from-straight-line-quad';
+import { splitByDeviationFromStraighLine_Quad } from './split-by-deviation-from-straight-line-quad.js';
 
 
 /**

package/src/debug-shaders.ts

@@ -1,5 +1,5 @@
-import { getMainFragment } from "./shaders/main.fragment";
-import { main_Vertex } from "./shaders/main.vertex";
+import { getMainFragment } from "./shaders/main.fragment.js";
+import { main_Vertex } from "./shaders/main.vertex.js";
 
 
 /**

package/src/generate-sdf.ts

@@ -1,4 +1,4 @@
-import { getWebGLContext } from './webgl-utils/get-gl-context.js';
+// import { getWebGLContext } from './webgl-utils/get-gl-context.js';
 import { main_Vertex } from './shaders/main.vertex.js';
 import { getMainFragment } from './shaders/main.fragment.js';
 import { initProgram } from './webgl-utils/use-program.js';
@@ -6,13 +6,14 @@ import { mainProgram } from './main-program.js';
 import { ROW_COUNT } from './row-count.js';
 import { getPathsFromStr } from './svg/get-paths-from-str.js';
 import { MAX_ASPECT_RATIO_BEFORE_STRETCH } from './max-aspect-ratio-before-stretch.js';
+import { GlContext } from './types/gl-context.js';
 // import { debugShaders } from './debug-shaders.js';
 
 const { ceil, min, max } = Math;
 
 
 /**
- * 
+ * TODO
  * @param gl 
  * @param psss 
  * @param width 
@@ -28,7 +29,7 @@ const { ceil, min, max } = Math;
  * @param resolution 
  */
 function generateIntoFramebuffer(
-        gl: WebGL2RenderingContext,
+        glContext: GlContext,
         psss: (number[][])[][] | string,
         width: number,
         height: number,
@@ -37,7 +38,6 @@ function generateIntoFramebuffer(
         sdfExponent = 1,
         inclInside = true,
         inclOutside = true,
-        // framebuffer: WebGLFramebuffer | null,
         x = 0, y = 0,
         channel = 0,
         resolution: 0.5|1 = 0.5) {
@@ -48,7 +48,7 @@ function generateIntoFramebuffer(
         ? getPathsFromStr(psss)
         : psss;
 
-    const glContext = getWebGLContext(gl);
+    // const glContext = getWebGLContext(gl);
 
     const { onContextLoss } = glContext;
 
@@ -72,6 +72,8 @@ function generateIntoFramebuffer(
         main_Vertex, getMainFragment(colCount, padCount)
     );
 
+    const { gl } = glContext;
+
     gl.useProgram(programMain.program);
     mainProgram(
         glContext, programMain, resolution, psss_,

package/src/index.ts

@@ -1,2 +1,4 @@
 
 export { generateIntoFramebuffer } from './generate-sdf.js';
+export { freeGlContext } from './webgl-utils/free-gl-context.js';
+export { getWebGlContext } from './webgl-utils/get-gl-context.js';

package/src/main-program.ts

@@ -81,7 +81,6 @@ function mainProgram(
     setUniform_('1f', 'uMaxDistance', maxDistance);
     setUniform_('1f', 'uExponent', sdfExponent);  // TODO
     setUniform_('1i', 'uIncl', (inclInside ? 1 : 0) + (inclOutside ? 2 : 0));
-    setUniform_('1f', 'uStretch', stretch);  // TODO
 
     setUniformBlock(programMain)('SegIdxRangePerCellBlock', 0, segIdxs_PerCell_Range_Arr);
     setUniformBlock(programMain)('SegIdxRangePerStripBlock', 1, segIdxs_PerStrip_Range_Arr);

package/src/prepare-buffers.ts

@@ -5,10 +5,9 @@ import { createEmptyGrid } from './utils/create-empty-grid.js';
 import { findCrossingCells } from './utils/find-crossing-cells.js';
 import { TEX_WIDTH } from './tex-width.js';
 import { ROW_COUNT } from './row-count.js';
-import { createEmptyStrips } from './utils/create-empty-strips.js';
 import { clipLineSegmentToStrips } from './utils/clip-line-segment-to-strips.js';
 import { mapToViewbox } from './utils/map-to-viewbox.js';
-// import { sum } from './utils/sum.js';
+// import { sum } from './utils/sum.js';  // testing
 
 
 function prepareBuffers(
@@ -28,11 +27,12 @@ function prepareBuffers(
 
     const lineSegs = bezierCurvesToLineSegs(psss_, resolution);
     const grid = createEmptyGrid(colCount, padCount);
-    const strips = createEmptyStrips();
+    const strips = new Array(ROW_COUNT).fill(undefined).map(v => []);
+
     for (let i=0; i<lineSegs.length; i++) {
         const seg = lineSegs[i];
         // Split the line segment into multiple segments that fit within grid cells
-        clipLineSegmentToGrid(grid, width, height, colCount, cellSize, seg, padCount);  // add segments to grid
+        clipLineSegmentToGrid(grid, width, height, cellSize, seg, padCount);  // add segments to grid
         clipLineSegmentToStrips(strips, height, seg);  // add segments to strips
     }
 
@@ -96,8 +96,7 @@ function prepareBuffers(
     // Add line segs from strips
     const segIdxs_PerStrip_Range: [number,number][] = [];
     for (let i=0; i<ROW_COUNT; i++) {
-        const strip = strips[i];
-        const { lineSegs } = strip;
+        const lineSegs = strips[i];
 
         //////////
         const L = lineSegs.length;

package/src/shaders/main.fragment.ts

@@ -1,4 +1,4 @@
-import { ROW_COUNT } from "../row-count"
+import { ROW_COUNT } from "../row-count.js";
 
 
 const cache: { [padCount_times_colCount: number]: string } = {};

package/src/shaders/main.vertex.ts

@@ -1,11 +1,10 @@
-import { ROW_COUNT } from "../row-count";
+import { ROW_COUNT } from "../row-count.js";
 
 const main_Vertex = /*glsl*/`#version 300 es
 
 precision highp float;
 
 uniform vec2 uWidthHeight;
-uniform float uStretch;
 in vec2 aUV;
 in ivec2 aCloseCellIdxRangePerCell;
 in ivec2 aCrossIdxRangePerCell;

package/src/types/gl-context.ts

@@ -20,7 +20,6 @@ interface GlContext {
     readonly gl: WebGL2RenderingContext;
     readonly textures: { [index:string]: Texture };
     readonly programs: { [index:string]: Program };
-    readonly framebufferStack: WebGLFramebuffer[];
     readonly onContextLoss: () => void;
 }
 

package/src/types/program.ts

@@ -1,5 +1,5 @@
-import type { Attribute } from "./attribute";
-import type { UniformBlock } from "../webgl-utils/uniform-block";
+import type { Attribute } from "./attribute.js";
+import type { UniformBlock } from "../webgl-utils/uniform-block.js";
 
 
 interface Program {
@@ -8,6 +8,8 @@ interface Program {
     readonly attributes: { [index:string]: Attribute };
     readonly uniforms: { [index:string]: WebGLUniformLocation | null };
     readonly uniformBlocks: { [index:string]: UniformBlock };
+    readonly vertexShader: WebGLShader;
+    readonly fragmentShader: WebGLShader;
 }
 
 

package/src/utils/calc-circs.ts

@@ -1,6 +1,6 @@
-import { MAX_ASPECT_RATIO_BEFORE_STRETCH } from '../max-aspect-ratio-before-stretch';
-import { ROW_COUNT } from '../row-count';
-import { len } from '../vector/len';
+import { MAX_ASPECT_RATIO_BEFORE_STRETCH } from '../max-aspect-ratio-before-stretch.js';
+import { ROW_COUNT } from '../row-count.js';
+import { len } from '../vector/len.js';
 
 
 /**
@@ -50,8 +50,6 @@ function calcCircs() {
         ranges.sort((a,b) => (a.from - b.from));
     }
 
-
-
     return ranges;
 }
 

package/src/utils/clip-line-segment-to-grid.ts

@@ -1,6 +1,5 @@
-import type { Cell } from "../types/cell";
-import { ROW_COUNT } from "../row-count";
-import { segBoxX } from "./seg-box-x";
+import type { Cell } from "../types/cell.js";
+import { segBoxX } from "./seg-box-x.js";
 
 
 const { floor, ceil } = Math;
@@ -21,21 +20,17 @@ function clipLineSegmentToGrid(
         grid: Cell[][],
         width: number,
         height: number,
-        colCount: number,
         cellSize: number,
         seg: number[][],
         padCount: number): void {
     
-    /** `cellSize` *must* be a power of two */
-    // const cellSize = width/ROW_COUNT;
-
     const padding = cellSize*padCount;
 
     const [[x0,y0],[x1,y1]] = seg;
 
     const paddedWidth = width + padding;
     const paddedHeight = height + padding;
-    // TODO - investigate lines on edge and corners - ps could be length 4!!
+
     const ps = segBoxX(seg, [[-padding,-padding],[paddedWidth,paddedHeight]]);
 
     const p0IsInBox = x0 > -padding && x0 < paddedWidth && y0 > -padding && y0 < paddedHeight;

package/src/utils/clip-line-segment-to-strips.ts

@@ -1,5 +1,4 @@
-import type { Strip } from "../types/strip";
-import { segStripX } from "./seg-strip-x";
+import { segStripX } from "./seg-strip-x.js";
 
 
 const { floor, ceil } = Math;
@@ -11,12 +10,12 @@ const { floor, ceil } = Math;
  * * modifies strips by adding line segments to each strip
  * * size/count *must* be a power of 2
  * 
- * @param count the number of strips
+ * @param strips array of strips - each contains an array line segments
  * @param height the height of a strip
  * @param seg the line segment (array of 2 points)
  */
 function clipLineSegmentToStrips(
-        strips: Strip[],
+        strips: number[][][][],
         height: number,
         seg: number[][]): void {
     
@@ -93,7 +92,7 @@ function clipLineSegmentToStrips(
         // if we're past the line endpoint
         if ((tX > 1 || dX === 0) && tY > 1) {
             const v = floor(p1[1]/cellSize);
-            strips[v]?.lineSegs.push([[x,y],p1]);
+            strips[v]?.push([[x,y],p1]);
             break;
         }
 
@@ -109,7 +108,7 @@ function clipLineSegmentToStrips(
             } else {
                 const v = fY(y/cellSize) - (btt ? 0 : 1);  // previous v
                 const seg_ = [[x,y],ps[i]];
-                strips[v]?.lineSegs.push(seg_);
+                strips[v]?.push(seg_);
                 break;
             }
         }
@@ -117,7 +116,7 @@ function clipLineSegmentToStrips(
         // previous v
         const v = fY(y/cellSize) - (btt ? 0 : 1);
 
-        strips[v]?.lineSegs.push([[x,y], [xX,xY]]);
+        strips[v]?.push([[x,y], [xX,xY]]);
 
         // update current position
         x = xX;
@@ -127,70 +126,4 @@ function clipLineSegmentToStrips(
 
 
 export { clipLineSegmentToStrips }
-
-
-// Quokka tests - https://www.desmos.com/calculator/uyqsdkviih
-// import { createEmptyStrips } from "./create-empty-strips";
-
-// {
-//     const strips = createEmptyStrips(8);
-//     const seg = [[0, 100], [0, 400]];
-
-//     toDesmosStr(seg);
-//     clipLineSegmentToStrips(strips, 512, seg);
-//     testAllEmptyExcept(strips,[1,2,3,4,5,6]);
-// }
-
-
-// {
-//     const strips = createEmptyStrips(8);
-//     const seg = [[83, 166], [-90, 440]];
-
-//     toDesmosStr(seg);
-//     clipLineSegmentToStrips(strips, 512, seg);
-//     testAllEmptyExcept(strips,[4,5,6]);
-// }
-
-// {
-//     const strips = createEmptyStrips(8);
-//     const seg = [[-570, 236], [-392, 546]];
-
-//     toDesmosStr(seg);
-//     clipLineSegmentToStrips(strips, 512, seg);
-//     testAllEmptyExcept(strips,[3,4,5,6,7]);
-// }
-
-// {
-//     const strips = createEmptyStrips(8);
-//     const seg = [[-462, 632], [-152, 611]];
-
-//     toDesmosStr(seg);
-//     clipLineSegmentToStrips(strips, 512, seg);
-//     testAllEmptyExcept(strips,[]);
-// }
-
-
-// function toDesmosStr(seg: number[][]) {
-//     const [[x0,y0],[x1,y1]] = seg;
-//     return `\\left(\\left(1-t\\right)\\cdot${x0.toFixed(2)}+t\\cdot\\left(${x1.toFixed(2)}\\right),\\left(1-t\\right)\\cdot${y0.toFixed(2)}+t\\cdot${y1.toFixed(2)}\\right)`;
-// }
-// function testAllEmptyExcept(
-//         strips: Strip[],
-//         exceptions: number[]) {
-
-//     for (let i=0; i<strips.length; i++) {
-//         const strip = strips[i];
-//         const idx = exceptions.findIndex(v => v === i);
-//         const exception = exceptions[idx];
-//         const len = strip.lineSegs.length;
-//         if (exception === undefined) {
-//             if (len !== 0) {
-//                 throw new Error(`Strip ${i} must be empty`);
-//             }
-//         } else {
-//             if (len !== 1) {
-//                 throw new Error(`Strip ${i} must contain 1 segments, found ${len}`);
-//             }
-//         }
-//     }
-// }
+var a = [[1,1], [1,1]]

package/src/utils/create-empty-grid.ts

@@ -1,5 +1,5 @@
-import { ROW_COUNT } from "../row-count";
-import { Cell } from "../types/cell";
+import { ROW_COUNT } from "../row-count.js";
+import { Cell } from "../types/cell.js";
 
 
 /**

package/src/utils/find-close-cells.ts

@@ -1,11 +1,10 @@
-import type { Cell } from "../types/cell";
-import { ROW_COUNT } from "../row-count";
-import { circsCache } from "./calc-circs";
-import { distanceSegToP } from "./distance-seg-to-p";
-import { jumpIdx } from "./jump-idx";
+import type { Cell } from "../types/cell.js";
+import { ROW_COUNT } from "../row-count.js";
+import { circsCache } from "./calc-circs.js";
+import { jumpIdx } from "./jump-idx.js";
 
 
-const { min, SQRT2 } = Math;
+const { min, max, SQRT2 } = Math;
 
 
 function findCloseCells(
@@ -44,57 +43,47 @@ function findCloseCellsFor(
         // reduce current circle search range since we moved one square
         let k = jumpIdx((_minD - SQRT2*cellSize) / cellSize);
         let minD = Number.POSITIVE_INFINITY;
-        while (k < circsCache.length) {
-            const from = circsCache[k].from;
+        while (true) {
+            if (k >= circsCache.length) {
+                minD = cellSize*(circsCache[circsCache.length - 1].from - SQRT2);
+                break;
+            }
+
+            const { u, v, from } = circsCache[k];
 
             // `SQRT2` to account for diagonal
             if (cellSize*from > maxDistance + SQRT2*cellSize) {
+                minD = cellSize*(from - 2*SQRT2);
                 break;
             }
 
-            // uncomment loop below to search all equidistant squares
-            // while (circsCache?.[k].from === from) {
-                const { u, v } = circsCache[k];
-                const u_ = u + i;
-                const v_ = v + j;
-                if (u_ < 0 || u_ >= colCount + 2*padCount ||
-                    v_ < 0 || v_ >= ROW_COUNT + 2*padCount) {
-
-                    k++; continue;
-                }
-
-                const { lineSegs } = grid[u_][v_];
-                for (let l=0; l<lineSegs.length; l++) {
-                    // center of square
-                    const c = [(i - padCount + 0.5)*cellSize, (j - padCount + 0.5)*cellSize];
-                    const d = distanceSegToP(lineSegs[l], c);
-                    if (d < minD) {
-                        minD = d;
-                    }
-                }
-
-                k++;
-            // }
-
-            if (minD !== Number.POSITIVE_INFINITY) {
+            const u_ = u + i;
+            const v_ = v + j;
+            if (u_ < 0 || u_ >= colCount + 2*padCount ||
+                v_ < 0 || v_ >= ROW_COUNT + 2*padCount) {
+
+                k++; continue;
+            }
+
+            const { lineSegs } = grid[u_][v_];
+
+            if (lineSegs.length > 0) {
+                minD = cellSize*(from - SQRT2);
                 break;
             }
-        }
 
-        if (minD === Number.POSITIVE_INFINITY) {
-            return min(
-                maxDistance + SQRT2*cellSize,
-                cellSize * circsCache[circsCache.length - 1].from
-            );
+            k++;
         }
 
+
         const { closeCells } = grid[i][j];
-        let l = jumpIdx((_minD - 2*SQRT2*cellSize) / cellSize);
+
+        let l = max(0, k - 1);
         while (l < circsCache.length) {
             const { from, u, v } = circsCache[l];
 
-            // `SQRT2` to account for diagonal
-            if (cellSize*from > min(minD, maxDistance) + SQRT2*cellSize) {
+            // `SQRT2` to account for diagonal (times 2 since we minused it off earlier)
+            if (cellSize*from > min(minD, maxDistance) + 2*SQRT2*cellSize) {
                 break;
             }
 
@@ -120,52 +109,3 @@ function findCloseCellsFor(
 
 
 export { findCloseCells }
-
-
-// Quokka tests
-// const grid: Cell[][] = [
-//     [
-//         { u: 0, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
-//         { u: 0, v: 1, lineSegs: [], closeCells: [], crossingCells: [] },
-//         { u: 0, v: 2, lineSegs: [], closeCells: [], crossingCells: [] },
-//         { u: 0, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
-//     ],
-//     [
-//         { u: 1, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
-//         {
-//             u: 1, v: 1,
-//             lineSegs: [[[175, 163], [175, 355]]],
-//             closeCells: [], crossingCells: []
-//         },
-//         {
-//             u: 1, v: 2,
-//             lineSegs: [[[175, 355], [335, 355]]],
-//             closeCells: [], crossingCells: []
-//         },
-//         { u: 1, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
-//     ],
-//     [
-//         { u: 2, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
-//         {
-//             u: 2, v: 1,
-//             lineSegs: [[[335, 163], [175, 163]]],
-//             closeCells: [], crossingCells: []
-//         },
-//         {
-//             u: 2, v: 2,
-//             lineSegs: [[[335, 355], [335, 163]]],
-//             closeCells: [], crossingCells: []
-//         },
-//         { u: 2, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
-//     ],
-//     [
-//         { u: 3, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
-//         { u: 3, v: 1, lineSegs: [], closeCells: [], crossingCells: [] },
-//         { u: 3, v: 2, lineSegs: [], closeCells: [], crossingCells: [] },
-//         { u: 3, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
-//     ]
-// ];
-
-// findCloseCells(grid);
-// const v = grid.map(cells => cells.map(c => ({ u: c.u, v: c.v, closeCells: c.closeCells })));
-// v;//?

package/src/utils/find-crossing-cells.ts

@@ -1,10 +1,7 @@
-import { ROW_COUNT } from "../row-count";
-import type { Cell } from "../types/cell";
+import type { Cell } from "../types/cell.js";
+import { ROW_COUNT } from "../row-count.js";
 
 
-// TODO - simplify?
-// TODO - could be made much faster by also checking intersections here
-// and passing the result to the next cell
 function findCrossingCells(
         grid: Cell[][],
         colCount: number,
@@ -24,17 +21,3 @@ function findCrossingCells(
 
 
 export { findCrossingCells }
-
-
-// Quokka tests
-// import { createEmptyGrid } from "./create-empty-grid";
-// // const g = createEmptyGrid(0);
-// const g = createEmptyGrid(0);
-// // g[0][0].lineSegs.push([[]]);
-// g[2][0].lineSegs.push([[]]);
-// g[2][2].lineSegs.push([[]]);
-// findCrossingCells(g);
-// let r = 2;
-// // g.map(r => r.map(c => c.crossingCells))[r].map(v => v);//?
-// g.map(r => r.map(c => c.crossingCells))[r].map(v => v.map(r => r[1]));//?
-// g;//?