webgl2-sdf 0.0.3 → 0.0.4

package/node/utils/find-close-cells.js

@@ -1,8 +1,7 @@
 import { ROW_COUNT } from "../row-count.js";
 import { circsCache } from "./calc-circs.js";
-import { distanceSegToP } from "./distance-seg-to-p.js";
 import { jumpIdx } from "./jump-idx.js";
-const { min, SQRT2 } = Math;
+const { min, max, SQRT2 } = Math;
 function findCloseCells(grid, colCount, cellSize, maxDistance, padCount) {
     const findCloseCellsFor_ = findCloseCellsFor(grid, colCount, cellSize, maxDistance, padCount);
     let _minD = 0; // minimum for previous row, col 0
@@ -22,15 +21,17 @@ function findCloseCellsFor(grid, colCount, cellSize, maxDistance, padCount) {
         // 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 ||
@@ -39,29 +40,18 @@ function findCloseCellsFor(grid, colCount, cellSize, maxDistance, padCount) {
                 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) {
+            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;
             }
             const u_ = u + i;
@@ -81,50 +71,4 @@ function findCloseCellsFor(grid, colCount, cellSize, maxDistance, padCount) {
     };
 }
 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;//?
 //# sourceMappingURL=find-close-cells.js.map

package/node/utils/find-close-cells.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-close-cells.js","sourceRoot":"","sources":["../../src/utils/find-close-cells.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;AAG5B,SAAS,cAAc,CACf,IAAc,EACd,QAAgB,EAChB,QAAgB,EAChB,WAAmB,EACnB,QAAgB;IAEpB,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IAE7F,IAAI,KAAK,GAAG,CAAC,CAAC,CAAE,kCAAkC;IAClD,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,GAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,IAAI,GAAG,KAAK,CAAC;QACb,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,GAAC,SAAS,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,IAAI,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAAC,KAAK,GAAG,IAAI,CAAC;YAAC,CAAC;QACzC,CAAC;IACL,CAAC;AACL,CAAC;AAGD,SAAS,iBAAiB,CAClB,IAAc,EACd,QAAgB,EAChB,QAAgB,EAChB,WAAmB,EACnB,QAAgB;IAEpB,OAAO,SAAS,kBAAkB,CAC1B,CAAS,EACT,CAAS,EACT,KAAa;QAEjB,+DAA+D;QAC/D,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,GAAG,KAAK,GAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,CAAC;QACrD,IAAI,IAAI,GAAG,MAAM,CAAC,iBAAiB,CAAC;QACpC,OAAO,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAEhC,kCAAkC;YAClC,IAAI,QAAQ,GAAC,IAAI,GAAG,WAAW,GAAG,KAAK,GAAC,QAAQ,EAAE,CAAC;gBAC/C,MAAM;YACV,CAAC;YAED,yDAAyD;YACzD,0CAA0C;YACtC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,QAAQ,GAAG,CAAC,GAAC,QAAQ;gBACrC,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,SAAS,GAAG,CAAC,GAAC,QAAQ,EAAE,CAAC;gBAEzC,CAAC,EAAE,CAAC;gBAAC,SAAS;YAClB,CAAC;YAED,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YAClC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACnC,mBAAmB;gBACnB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,GAAG,CAAC,GAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,QAAQ,GAAG,GAAG,CAAC,GAAC,QAAQ,CAAC,CAAC;gBACzE,MAAM,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;oBACX,IAAI,GAAG,CAAC,CAAC;gBACb,CAAC;YACL,CAAC;YAED,CAAC,EAAE,CAAC;YACR,IAAI;YAEJ,IAAI,IAAI,KAAK,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBACpC,MAAM;YACV,CAAC;QACL,CAAC;QAED,IAAI,IAAI,KAAK,MAAM,CAAC,iBAAiB,EAAE,CAAC;YACpC,OAAO,GAAG,CACN,WAAW,GAAG,KAAK,GAAC,QAAQ,EAC5B,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CACpD,CAAC;QACN,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,GAAC,KAAK,GAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAErC,kCAAkC;YAClC,IAAI,QAAQ,GAAC,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,KAAK,GAAC,QAAQ,EAAE,CAAC;gBAC1D,MAAM;YACV,CAAC;YAED,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,QAAQ,GAAG,CAAC,GAAC,QAAQ;gBACrC,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,SAAS,GAAG,CAAC,GAAC,QAAQ,EAAE,CAAC;gBAEzC,CAAC,EAAE,CAAC;gBAAC,SAAS;YAClB,CAAC;YAED,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,GAAC,QAAQ,GAAG,SAAS,CAAC,GAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YACtD,CAAC;YAED,CAAC,EAAE,CAAC;QACR,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA;AAGzB,eAAe;AACf,2BAA2B;AAC3B,QAAQ;AACR,2EAA2E;AAC3E,2EAA2E;AAC3E,2EAA2E;AAC3E,0EAA0E;AAC1E,SAAS;AACT,QAAQ;AACR,2EAA2E;AAC3E,YAAY;AACZ,0BAA0B;AAC1B,oDAAoD;AACpD,gDAAgD;AAChD,aAAa;AACb,YAAY;AACZ,0BAA0B;AAC1B,oDAAoD;AACpD,gDAAgD;AAChD,aAAa;AACb,0EAA0E;AAC1E,SAAS;AACT,QAAQ;AACR,2EAA2E;AAC3E,YAAY;AACZ,0BAA0B;AAC1B,oDAAoD;AACpD,gDAAgD;AAChD,aAAa;AACb,YAAY;AACZ,0BAA0B;AAC1B,oDAAoD;AACpD,gDAAgD;AAChD,aAAa;AACb,0EAA0E;AAC1E,SAAS;AACT,QAAQ;AACR,2EAA2E;AAC3E,2EAA2E;AAC3E,2EAA2E;AAC3E,0EAA0E;AAC1E,QAAQ;AACR,KAAK;AAEL,wBAAwB;AACxB,+FAA+F;AAC/F,QAAQ"}
+{"version":3,"file":"find-close-cells.js","sourceRoot":"","sources":["../../src/utils/find-close-cells.ts"],"names":[],"mappings":"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"}

package/node/utils/find-crossing-cells.js

@@ -1,7 +1,4 @@
 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, colCount, padCount) {
     for (let i = padCount; i < colCount + padCount; i++) {
         for (let j = padCount; j < ROW_COUNT + padCount; j++) {
@@ -16,16 +13,4 @@ function findCrossingCells(grid, colCount, padCount) {
     }
 }
 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;//?
 //# sourceMappingURL=find-crossing-cells.js.map

package/node/utils/find-crossing-cells.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-crossing-cells.js","sourceRoot":"","sources":["../../src/utils/find-crossing-cells.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,mBAAmB;AACnB,uEAAuE;AACvE,0CAA0C;AAC1C,SAAS,iBAAiB,CAClB,IAAc,EACd,QAAgB,EAChB,QAAgB;IAEpB,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,GAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,GAAC,SAAS,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YAEpC,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,IAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7B,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAAC,SAAS;gBAAC,CAAC;gBACnD,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,GAAC,QAAQ,CAAC,GAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC;IACL,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAG5B,eAAe;AACf,yDAAyD;AACzD,mCAAmC;AACnC,gCAAgC;AAChC,kCAAkC;AAClC,+BAA+B;AAC/B,+BAA+B;AAC/B,wBAAwB;AACxB,aAAa;AACb,gEAAgE;AAChE,4EAA4E;AAC5E,QAAQ"}
+{"version":3,"file":"find-crossing-cells.js","sourceRoot":"","sources":["../../src/utils/find-crossing-cells.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,SAAS,iBAAiB,CAClB,IAAc,EACd,QAAgB,EAChB,QAAgB;IAEpB,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,GAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,GAAC,SAAS,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YAEpC,KAAK,IAAI,CAAC,GAAC,QAAQ,EAAE,CAAC,IAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7B,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAAC,SAAS;gBAAC,CAAC;gBACnD,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,GAAC,QAAQ,CAAC,GAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC;IACL,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

package/node/utils/jump-idx.js

@@ -1,5 +1,5 @@
 import { circsCache } from "./calc-circs.js";
-const { trunc, max, E } = Math;
+const { max, E } = Math;
 /**
  * @param v
  */
@@ -8,10 +8,9 @@ function binarySearchRange(v) {
     let max = circsCache.length - 1;
     let mid = 0;
     while (min <= max) {
-        mid = (min + max) >>> 1; //?
+        mid = (min + max) >>> 1;
         const midVal = circsCache[mid].from;
         if (midVal === v) {
-            // return [min,mid,max];
             return mid;
         }
         else if (v > midVal) {
@@ -21,9 +20,19 @@ function binarySearchRange(v) {
             max = mid - 1;
         }
     }
-    // return [min,mid,max];
     return mid;
 }
+function jumpIdx(c) {
+    let idx = binarySearchRange(c);
+    c = max(0, c);
+    if (idx === 0) {
+        return 0;
+    }
+    while (circsCache[idx].from === circsCache[idx - 1].from) {
+        idx--;
+    }
+    return idx;
+}
 // const [Q,R] = [10.606601717798213, 35.531676008879735];
 // const [A1,B1,F1] = [102.42126, 0.153169, -117.56077];
 // const [A2,B2,C2,D2,F2] = [-0.000660087, 0.388148, 841.25744, -0.0529616, -1089.49916];
@@ -43,25 +52,18 @@ function binarySearchRange(v) {
 //     while (circsCache[idx + 1].from < c) { idx++; }
 //     return idx;
 // }
-function jumpIdx(c) {
-    let idx = binarySearchRange(c);
-    c = max(0, c);
-    while (idx !== 0 && circsCache[idx].from >= c) {
-        idx--;
-    }
-    while (idx < circsCache.length - 2 && circsCache[idx + 1].from < c) {
-        idx++;
-    }
-    return idx;
-}
 export { jumpIdx };
 // Quokka tests
-// // circsCache.slice(0,30).map(c => c.from);//?
+// circsCache.slice(0,10);//?
+// circsCache.slice(0,30).map(c => c.from);//?
+// circsCache[5].from;//?
 // circsCache[12].from;//?
 // circsCache[15].from;//?
 // // circsCache.length;//?
-// // jumpIdxOld(1.5811388300841898);//?
-// jumpIdx(0.5);//?
+// jumpIdxOld(1.5811388300841898);//?
+// const v = (53.08771209782213 - Math.SQRT2*24.09375)/24.09375;//?
+// jumpIdx(v);//?
+// circsCache[8].from;//?
 // binarySearchRange(1.5811388300841898);//?
 // jumpIdxOld(3.7);//?
 // jumpIdx(3.7);//?

package/node/utils/jump-idx.js.map

@@ -1 +1 @@
-{"version":3,"file":"jump-idx.js","sourceRoot":"","sources":["../../src/utils/jump-idx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;AAG/B;;GAEG;AACH,SAAS,iBAAiB,CAClB,CAAS;IAEb,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,GAAG,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAEhC,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QAChB,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA,GAAG;QAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACpC,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACf,wBAAwB;YACxB,OAAO,GAAG,CAAC;QACf,CAAC;aAAM,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;YACpB,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAClB,CAAC;IACL,CAAC;IAED,wBAAwB;IACxB,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,0DAA0D;AAC1D,wDAAwD;AACxD,yFAAyF;AACzF,yFAAyF;AACzF,uBAAuB;AACvB,uBAAuB;AAEvB,uBAAuB;AACvB,kEAAkE;AAClE,4EAA4E;AAC5E,sBAAsB;AACtB,gCAAgC;AAChC,mBAAmB;AACnB,kDAAkD;AAClD,oDAAoD;AAEpD,qBAAqB;AACrB,kDAAkD;AAClD,sDAAsD;AAEtD,kBAAkB;AAClB,IAAI;AAGJ,SAAS,OAAO,CACR,CAAS;IAEb,IAAI,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAE/B,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACd,OAAO,GAAG,KAAK,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;QAAC,GAAG,EAAE,CAAC;IAAC,CAAC;IACzD,OAAO,GAAG,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAAC,GAAG,EAAE,CAAC;IAAC,CAAC;IAE9E,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAA;AAGlB,eAAe;AACf,iDAAiD;AACjD,0BAA0B;AAC1B,0BAA0B;AAC1B,2BAA2B;AAE3B,wCAAwC;AACxC,mBAAmB;AACnB,4CAA4C;AAG5C,sBAAsB;AACtB,mBAAmB;AACnB,gCAAgC;AAEhC,oBAAoB;AACpB,iBAAiB;AACjB,8BAA8B;AAE9B,uBAAuB;AACvB,oBAAoB;AACpB,iCAAiC;AAEjC,uBAAuB;AACvB,oBAAoB;AACpB,iCAAiC;AAEjC,wBAAwB;AACxB,qBAAqB;AACrB,4BAA4B"}
+{"version":3,"file":"jump-idx.js","sourceRoot":"","sources":["../../src/utils/jump-idx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;AAGxB;;GAEG;AACH,SAAS,iBAAiB,CAClB,CAAS;IAEb,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,GAAG,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IAEhC,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QAChB,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACpC,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACf,OAAO,GAAG,CAAC;QACf,CAAC;aAAM,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;YACpB,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;QAClB,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,SAAS,OAAO,CACR,CAAS;IAEb,IAAI,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAE/B,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACd,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QAAC,OAAO,CAAC,CAAC;IAAC,CAAC;IAE5B,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACvD,GAAG,EAAE,CAAC;IACV,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,0DAA0D;AAC1D,wDAAwD;AACxD,yFAAyF;AACzF,yFAAyF;AACzF,uBAAuB;AACvB,uBAAuB;AAEvB,uBAAuB;AACvB,kEAAkE;AAClE,4EAA4E;AAC5E,sBAAsB;AACtB,gCAAgC;AAChC,mBAAmB;AACnB,kDAAkD;AAClD,oDAAoD;AAEpD,qBAAqB;AACrB,kDAAkD;AAClD,sDAAsD;AAEtD,kBAAkB;AAClB,IAAI;AAGJ,OAAO,EAAE,OAAO,EAAE,CAAA;AAGlB,eAAe;AACf,6BAA6B;AAC7B,8CAA8C;AAC9C,yBAAyB;AACzB,0BAA0B;AAC1B,0BAA0B;AAC1B,2BAA2B;AAE3B,qCAAqC;AACrC,mEAAmE;AACnE,iBAAiB;AACjB,yBAAyB;AACzB,4CAA4C;AAG5C,sBAAsB;AACtB,mBAAmB;AACnB,gCAAgC;AAEhC,oBAAoB;AACpB,iBAAiB;AACjB,8BAA8B;AAE9B,uBAAuB;AACvB,oBAAoB;AACpB,iCAAiC;AAEjC,uBAAuB;AACvB,oBAAoB;AACpB,iCAAiC;AAEjC,wBAAwB;AACxB,qBAAqB;AACrB,4BAA4B"}

package/node/webgl-utils/free-gl-context.d.ts

@@ -0,0 +1,3 @@
+import { GlContext } from '../types/gl-context.js';
+declare function freeGlContext(glContext: GlContext | undefined): void;
+export { freeGlContext };

package/node/webgl-utils/free-gl-context.js

@@ -0,0 +1,26 @@
+function freeGlContext(glContext) {
+    if (glContext === undefined) {
+        return;
+    }
+    const { gl, programs, textures } = glContext;
+    for (let key in programs) {
+        const { attributes, fragmentShader, vertexShader, uniformBlocks, program } = programs[key];
+        for (let key in uniformBlocks) {
+            const { buf } = uniformBlocks[key];
+            gl.deleteBuffer(buf);
+        }
+        for (let key in attributes) {
+            const { buf } = attributes[key];
+            gl.deleteBuffer(buf);
+        }
+        gl.deleteShader(fragmentShader);
+        gl.deleteShader(vertexShader);
+        gl.deleteProgram(program);
+    }
+    for (let key in textures) {
+        const { tex } = textures[key];
+        gl.deleteTexture(tex);
+    }
+}
+export { freeGlContext };
+//# sourceMappingURL=free-gl-context.js.map

package/node/webgl-utils/free-gl-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"free-gl-context.js","sourceRoot":"","sources":["../../src/webgl-utils/free-gl-context.ts"],"names":[],"mappings":"AAGA,SAAS,aAAa,CACd,SAAgC;IAEpC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO;IAAC,CAAC;IAExC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAE7C,KAAK,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;QACvB,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAE3F,KAAK,IAAI,GAAG,IAAI,aAAa,EAAE,CAAC;YAC5B,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YACnC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YAChC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAChC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAC9B,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAE1B,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/node/webgl-utils/get-gl-context.d.ts

@@ -6,5 +6,5 @@ import type { GlContext } from "../types/gl-context.js";
  * @param gl the `WebGL2RenderingContext` context to wrap
  * @param callback
  */
-declare function getWebGLContext<T>(gl: WebGL2RenderingContext): GlContext;
-export { getWebGLContext };
+declare function getWebGlContext(gl: WebGL2RenderingContext): GlContext;
+export { getWebGlContext };

package/node/webgl-utils/get-gl-context.js

@@ -6,7 +6,7 @@ const cache = new WeakMap();
  * @param gl the `WebGL2RenderingContext` context to wrap
  * @param callback
  */
-function getWebGLContext(gl) {
+function getWebGlContext(gl) {
     {
         const glContext = cache.get(gl);
         if (glContext) {
@@ -15,29 +15,26 @@ function getWebGLContext(gl) {
     }
     const programs = {};
     const textures = {};
-    const framebufferStack = [];
     gl.canvas.addEventListener('webglcontextlost', e => {
-        handleContextLoss();
+        onContextLoss();
         e.preventDefault();
     }, false);
     const glContext = {
         gl,
-        onContextLoss: handleContextLoss,
+        onContextLoss,
         textures,
-        programs,
-        framebufferStack
+        programs
     };
     cache.set(gl, glContext);
     return glContext;
     ////////////////////////
-    function handleContextLoss() {
+    function onContextLoss() {
         deleteAllProps(programs);
         deleteAllProps(textures);
-        framebufferStack.length = 0;
     }
 }
 function deleteAllProps(o) {
     Object.keys(o).forEach(key => { delete o[key]; });
 }
-export { getWebGLContext };
+export { getWebGlContext };
 //# sourceMappingURL=get-gl-context.js.map

package/node/webgl-utils/get-gl-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-gl-context.js","sourceRoot":"","sources":["../../src/webgl-utils/get-gl-context.ts"],"names":[],"mappings":"AAKA,MAAM,KAAK,GAAG,IAAI,OAAO,EAAqC,CAAC;AAG/D;;;;;;GAMG;AACH,SAAS,eAAe,CAChB,EAA0B;IAE9B,CAAC;QACG,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,SAAS,EAAE,CAAC;YAAC,OAAO,SAAS,CAAC;QAAC,CAAC;IACxC,CAAC;IAED,MAAM,QAAQ,GAAgC,EAAE,CAAC;IACjD,MAAM,QAAQ,GAAgC,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAuB,EAAE,CAAC;IAEhD,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE;QAC/C,iBAAiB,EAAE,CAAC;QACpB,CAAC,CAAC,cAAc,EAAE,CAAC;IACvB,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,MAAM,SAAS,GAAc;QACzB,EAAE;QACF,aAAa,EAAE,iBAAiB;QAChC,QAAQ;QACR,QAAQ;QACR,gBAAgB;KACnB,CAAC;IAEF,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAEzB,OAAO,SAAS,CAAC;IAGjB,wBAAwB;IAExB,SAAS,iBAAiB;QACtB,cAAc,CAAC,QAAQ,CAAC,CAAC;QACzB,cAAc,CAAC,QAAQ,CAAC,CAAC;QACzB,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAChC,CAAC;AACL,CAAC;AAGD,SAAS,cAAc,CAAC,CAA6B;IACjD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}
+{"version":3,"file":"get-gl-context.js","sourceRoot":"","sources":["../../src/webgl-utils/get-gl-context.ts"],"names":[],"mappings":"AAKA,MAAM,KAAK,GAAG,IAAI,OAAO,EAAqC,CAAC;AAG/D;;;;;;GAMG;AACH,SAAS,eAAe,CAChB,EAA0B;IAE9B,CAAC;QACG,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,SAAS,EAAE,CAAC;YAAC,OAAO,SAAS,CAAC;QAAC,CAAC;IACxC,CAAC;IAED,MAAM,QAAQ,GAAgC,EAAE,CAAC;IACjD,MAAM,QAAQ,GAAgC,EAAE,CAAC;IAEjD,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE;QAC/C,aAAa,EAAE,CAAC;QAChB,CAAC,CAAC,cAAc,EAAE,CAAC;IACvB,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,MAAM,SAAS,GAAc;QACzB,EAAE;QACF,aAAa;QACb,QAAQ;QACR,QAAQ;KACX,CAAC;IAEF,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAEzB,OAAO,SAAS,CAAC;IAGjB,wBAAwB;IAExB,SAAS,aAAa;QAClB,cAAc,CAAC,QAAQ,CAAC,CAAC;QACzB,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;AACL,CAAC;AAGD,SAAS,cAAc,CAAC,CAA6B;IACjD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}

package/node/webgl-utils/set-attribute.js

@@ -26,7 +26,7 @@ function setAttribute(program) {
     return (name, size, type, usage, data, instancingDivisor = 0, stride = 0, offset = 0) => {
         const { gl, attributes } = program;
         const attr = attributes[name] = attributes[name] ?? {
-            buf: gl.createBuffer(), // TODO should we destroy our buffers?
+            buf: gl.createBuffer(),
             loc: gl.getAttribLocation(program.program, name),
             data: null
         };

package/node/webgl-utils/set-attribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-attribute.js","sourceRoot":"","sources":["../../src/webgl-utils/set-attribute.ts"],"names":[],"mappings":"AAKA,MAAM;AACF,gBAAgB;AAChB,IAAI,EAAa,OAAO;AACxB,aAAa,EAAI,OAAO;AACxB,KAAK,EAAY,OAAO;AACxB,cAAc,EAAG,OAAO;AACxB,GAAG,EAAc,OAAO;AACxB,YAAY,EAAK,OAAO;AACxB,cAAc;AACd,KAAK,EAAY,OAAO;AACxB,UAAU,EAAO,OAAO;AAExB,kBAAkB,EAAY,QAAQ;AACtC,2BAA2B,CAAG,QAAQ;EACzC,GAAG,sBAAsB,CAAC;AAG3B;;;;;;;;;GASG;AACH,SAAS,YAAY,CACb,OAAgB;IAEpB,OAAO,CAAC,IAAY,EACZ,IAAY,EACZ,IAAgB,EAChB,KAAc,EACd,IAAoC,EACpC,iBAAiB,GAAG,CAAC,EACrB,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,CAAC,EAAE,EAAE;QAElB,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAEnC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI;YAChD,GAAG,EAAE,EAAE,CAAC,YAAY,EAAE,EAAE,sCAAsC;YAC9D,GAAG,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;YAChD,IAAI,EAAE,IAAI;SACb,CAAA;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAE1B,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxC,EAAE,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACJ,EAAE,CAAC,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;QACD,EAAE,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,iBAAiB,KAAK,CAAC,EAAE,CAAC;YAC1B,EAAE,CAAC,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACrB,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;IACL,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"set-attribute.js","sourceRoot":"","sources":["../../src/webgl-utils/set-attribute.ts"],"names":[],"mappings":"AAKA,MAAM;AACF,gBAAgB;AAChB,IAAI,EAAa,OAAO;AACxB,aAAa,EAAI,OAAO;AACxB,KAAK,EAAY,OAAO;AACxB,cAAc,EAAG,OAAO;AACxB,GAAG,EAAc,OAAO;AACxB,YAAY,EAAK,OAAO;AACxB,cAAc;AACd,KAAK,EAAY,OAAO;AACxB,UAAU,EAAO,OAAO;AAExB,kBAAkB,EAAY,QAAQ;AACtC,2BAA2B,CAAG,QAAQ;EACzC,GAAG,sBAAsB,CAAC;AAG3B;;;;;;;;;GASG;AACH,SAAS,YAAY,CACb,OAAgB;IAEpB,OAAO,CAAC,IAAY,EACZ,IAAY,EACZ,IAAgB,EAChB,KAAc,EACd,IAAoC,EACpC,iBAAiB,GAAG,CAAC,EACrB,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,CAAC,EAAE,EAAE;QAElB,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAEnC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI;YAChD,GAAG,EAAE,EAAE,CAAC,YAAY,EAAE;YACtB,GAAG,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;YAChD,IAAI,EAAE,IAAI;SACb,CAAA;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAE1B,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxC,EAAE,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACJ,EAAE,CAAC,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;QACD,EAAE,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,iBAAiB,KAAK,CAAC,EAAE,CAAC;YAC1B,EAAE,CAAC,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACrB,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;IACL,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/webgl-utils/set-uniform-block.js

@@ -21,10 +21,8 @@ function setUniformBlock(program_) {
             gl.bindBuffer(gl.UNIFORM_BUFFER, uniformBlock.buf);
         }
         const { buf } = uniformBlock;
-        gl.bufferData(gl.UNIFORM_BUFFER, buffer, gl.DYNAMIC_DRAW);
-        // gl.bindBuffer(gl.UNIFORM_BUFFER, null);
+        gl.bufferData(gl.UNIFORM_BUFFER, buffer, gl.STATIC_DRAW);
         gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, buf);
-        // gl.bindBufferRange(gl.UNIFORM_BUFFER, bindingPoint, ubo, 0, sizeInBytes);
     };
 }
 export { setUniformBlock };

package/node/webgl-utils/set-uniform-block.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-uniform-block.js","sourceRoot":"","sources":["../../src/webgl-utils/set-uniform-block.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,SAAS,eAAe,CAChB,QAAiB;IAErB,OAAO,CAAC,SAAiB,EACjB,YAAoB,EACpB,MAA+B,EAAE,EAAE;QAEvC,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAEhD,yCAAyC;QAEzC,IAAI,YAAY,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,UAAU,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAC/D,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;YAC1D,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC;YAE9B,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;YAEtC,YAAY,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;YAC9C,aAAa,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC;QAE7B,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC;QAC1D,0CAA0C;QAC1C,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QACxD,4EAA4E;IAChF,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}
+{"version":3,"file":"set-uniform-block.js","sourceRoot":"","sources":["../../src/webgl-utils/set-uniform-block.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,SAAS,eAAe,CAChB,QAAiB;IAErB,OAAO,CAAC,SAAiB,EACjB,YAAoB,EACpB,MAA+B,EAAE,EAAE;QAEvC,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAEhD,yCAAyC;QAEzC,IAAI,YAAY,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,UAAU,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAC/D,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;YAC1D,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC;YAE9B,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;YAEtC,YAAY,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;YAC9C,aAAa,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC;QAE7B,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;QACzD,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}

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

@@ -21,10 +21,20 @@ function initProgram(glContext, name, vert, frag) {
     const uniforms = {};
     const uniformBlocks = {};
     const program = gl.createProgram();
-    gl.attachShader(program, compileShader(gl, vert, gl.VERTEX_SHADER));
-    gl.attachShader(program, compileShader(gl, frag, gl.FRAGMENT_SHADER));
+    const vertexShader = compileShader(gl, vert, gl.VERTEX_SHADER);
+    const fragmentShader = compileShader(gl, frag, gl.FRAGMENT_SHADER);
+    gl.attachShader(program, vertexShader);
+    gl.attachShader(program, fragmentShader);
     gl.linkProgram(program);
-    programs[name] = { gl, program, attributes, uniforms, uniformBlocks };
+    programs[name] = {
+        gl,
+        program,
+        attributes,
+        uniforms,
+        uniformBlocks,
+        vertexShader,
+        fragmentShader
+    };
     return programs[name];
 }
 export { initProgram };

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,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,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.3",
+    "version": "0.0.4",
     "author": {
         "name": "Floris Steenkamp"
     },

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.vertex.ts

@@ -5,7 +5,6 @@ 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

@@ -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

@@ -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

@@ -20,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;