webgl2-sdf 0.0.2 → 0.0.4

package/src/utils/jump-idx.ts

@@ -1,6 +1,6 @@
-import { circsCache } from "./calc-circs";
+import { circsCache } from "./calc-circs.js";
 
-const { trunc, max, E } = Math;
+const { max, E } = Math;
 
 
 /**
@@ -14,10 +14,9 @@ function binarySearchRange<T>(
 
     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) {
             min = mid + 1;
@@ -26,11 +25,26 @@ function binarySearchRange<T>(
         }
     }
 
-    // return [min,mid,max];
     return mid;
 }
 
 
+function jumpIdx(
+        c: number) {
+
+    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];
@@ -55,30 +69,21 @@ function binarySearchRange<T>(
 // }
 
 
-function jumpIdx(
-        c: number) {
-
-    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);//?
 
 

package/src/webgl-utils/free-gl-context.ts

@@ -0,0 +1,35 @@
+import { GlContext } from '../types/gl-context.js';
+
+
+function freeGlContext(
+        glContext: GlContext | undefined) {
+
+    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 }

package/src/webgl-utils/get-gl-context.ts

@@ -1,6 +1,6 @@
-import type { Texture } from "../types/texture";
-import type { Program } from "../types/program";
-import type { GlContext } from "../types/gl-context";
+import type { Texture } from "../types/texture.js";
+import type { Program } from "../types/program.js";
+import type { GlContext } from "../types/gl-context.js";
 
 
 const cache = new WeakMap<WebGL2RenderingContext, GlContext>();
@@ -13,7 +13,7 @@ const cache = new WeakMap<WebGL2RenderingContext, GlContext>();
  * @param gl the `WebGL2RenderingContext` context to wrap
  * @param callback
  */
-function getWebGLContext<T>(
+function getWebGlContext(
         gl: WebGL2RenderingContext): GlContext {
 
     {
@@ -23,19 +23,17 @@ function getWebGLContext<T>(
 
     const programs: { [index:string]: Program } = {};
     const textures: { [index:string]: Texture } = {};
-    const framebufferStack: WebGLFramebuffer[] = [];
 
     gl.canvas.addEventListener('webglcontextlost', e => {
-        handleContextLoss();
+        onContextLoss();
         e.preventDefault();
     }, false);
 
     const glContext: GlContext = {
         gl,
-        onContextLoss: handleContextLoss,
+        onContextLoss,
         textures,
-        programs,
-        framebufferStack
+        programs
     };
 
     cache.set(gl, glContext);
@@ -45,10 +43,9 @@ function getWebGLContext<T>(
 
     ////////////////////////
 
-    function handleContextLoss() {
+    function onContextLoss() {
         deleteAllProps(programs);
         deleteAllProps(textures);
-        framebufferStack.length = 0;
     }
 }
 
@@ -58,4 +55,4 @@ function deleteAllProps(o: { [key:string] : unknown }) {
 }
 
 
-export { getWebGLContext }
+export { getWebGlContext }

package/src/webgl-utils/set-attribute.ts

@@ -1,6 +1,6 @@
-import { Program } from "../types/program";
-import { GLattrType } from "../types/gl-type";
-import { GLusage } from "../types/gl-usage";
+import { Program } from "../types/program.js";
+import { GLattrType } from "../types/gl-type.js";
+import { GLusage } from "../types/gl-usage.js";
 
 
 const {
@@ -45,7 +45,7 @@ function setAttribute(
         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/src/webgl-utils/set-uniform-block.ts

@@ -1,4 +1,4 @@
-import { Program } from "../types/program";
+import { Program } from "../types/program.js";
 
 
 /**
@@ -34,10 +34,8 @@ function setUniformBlock(
 
         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);
     }
 }
 

package/src/webgl-utils/set-uniform.ts

@@ -1,5 +1,5 @@
-import { Program } from "../types/program";
-import { UniformType } from "./uniform-type";
+import { Program } from "../types/program.js";
+import { UniformType } from "./uniform-type.js";
 
 
 function setUniform(

package/src/webgl-utils/use-program.ts

@@ -1,8 +1,8 @@
-import type { Program } from "../types/program";
-import type { Attribute } from "../types/attribute";
-import type { UniformBlock } from "./uniform-block";
-import type { GlContext } from "../types/gl-context";
-import { compileShader } from "./compile-shader";
+import type { Program } from "../types/program.js";
+import type { Attribute } from "../types/attribute.js";
+import type { UniformBlock } from "./uniform-block.js";
+import type { GlContext } from "../types/gl-context.js";
+import { compileShader } from "./compile-shader.js";
 
 
 /**
@@ -35,11 +35,22 @@ function initProgram(
     const uniformBlocks: { [index:string]: UniformBlock } = {};
 
     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];
 }

package/node/types/strip.d.ts

@@ -1,8 +0,0 @@
-/**
- * A single strip within strips
- */
-interface Strip {
-    /** line segments contained within the strip */
-    readonly lineSegs: number[][][];
-}
-export type { Strip };

package/node/types/strip.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=strip.js.map

package/node/types/strip.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"strip.js","sourceRoot":"","sources":["../../src/types/strip.ts"],"names":[],"mappings":""}

package/node/utils/create-empty-strips.d.ts

@@ -1,7 +0,0 @@
-import { Strip } from "../types/strip";
-/**
- *
- * @param count the number of strips
- */
-declare function createEmptyStrips(): Strip[];
-export { createEmptyStrips };

package/node/utils/create-empty-strips.js

@@ -1,16 +0,0 @@
-import { ROW_COUNT } from "../row-count";
-/**
- *
- * @param count the number of strips
- */
-// TODO - remove
-function createEmptyStrips() {
-    const strips = [];
-    for (let v = 0; v < ROW_COUNT; v++) {
-        // TODO - simplify
-        strips.push({ lineSegs: [] });
-    }
-    return strips;
-}
-export { createEmptyStrips };
-//# sourceMappingURL=create-empty-strips.js.map

package/node/utils/create-empty-strips.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"create-empty-strips.js","sourceRoot":"","sources":["../../src/utils/create-empty-strips.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC;;;GAGG;AACH,gBAAgB;AAChB,SAAS,iBAAiB;IACtB,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,kBAAkB;QAClB,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

package/node/utils/distance-seg-to-p.d.ts

@@ -1,5 +0,0 @@
-/**
- * Returns the minimum distance from the given line segment to the origin.
- */
-declare function distanceSegToP(seg: number[][], p: number[]): number;
-export { distanceSegToP };

package/node/utils/distance-seg-to-p.js

@@ -1,35 +0,0 @@
-const { min, max, sqrt } = Math;
-/**
- * Returns the minimum distance from the given line segment to the origin.
- */
-function distanceSegToP(seg, p) {
-    const seg0 = seg[0];
-    const seg1 = seg[1];
-    const _x1 = seg0[0];
-    const _y1 = seg0[1];
-    const _x2 = seg1[0];
-    const _y2 = seg1[1];
-    const x = p[0];
-    const y = p[1];
-    const x1 = _x1 - x;
-    const y1 = _y1 - y;
-    const x2 = _x2 - x;
-    const y2 = _y2 - y;
-    // Vector from point 1 to point 2
-    const dx = x2 - x1;
-    const dy = y2 - y1;
-    const lengthSq = dx * dx + dy * dy;
-    // Calculate projection parameter t
-    // t represents where the closest point lies on the line segment
-    // t = 0 means closest point is at seg[0], t = 1 means closest point is at seg[1]
-    const t = max(0, min(1, -(x1 * dx + y1 * dy) / lengthSq));
-    // Find the closest point on the segment
-    const closestX = x1 + t * dx;
-    const closestY = y1 + t * dy;
-    // Return distance from origin to closest point
-    return sqrt(closestX * closestX + closestY * closestY);
-}
-export { distanceSegToP };
-// Quokka tests
-// distanceSegToOrigin([[0,1],[-1,-2]]);//?
-//# sourceMappingURL=distance-seg-to-p.js.map

package/node/utils/distance-seg-to-p.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"distance-seg-to-p.js","sourceRoot":"","sources":["../../src/utils/distance-seg-to-p.ts"],"names":[],"mappings":"AACA,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;AAGhC;;GAEG;AACH,SAAS,cAAc,CACf,GAAe,EACf,CAAW;IAEf,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAEpB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEf,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;IACnB,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;IACnB,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;IACnB,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;IAEnB,iCAAiC;IACjC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAEnB,MAAM,QAAQ,GAAG,EAAE,GAAC,EAAE,GAAG,EAAE,GAAC,EAAE,CAAC;IAE/B,mCAAmC;IACnC,gEAAgE;IAChE,iFAAiF;IACjF,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAC,EAAE,GAAG,EAAE,GAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAEtD,wCAAwC;IACxC,MAAM,QAAQ,GAAG,EAAE,GAAG,CAAC,GAAC,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,EAAE,GAAG,CAAC,GAAC,EAAE,CAAC;IAE3B,+CAA+C;IAC/C,OAAO,IAAI,CAAC,QAAQ,GAAC,QAAQ,GAAG,QAAQ,GAAC,QAAQ,CAAC,CAAC;AACvD,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA;AAEzB,eAAe;AACf,2CAA2C"}

package/src/types/strip.ts

@@ -1,11 +0,0 @@
-
-/**
- * A single strip within strips
- */
-interface Strip {
-    /** line segments contained within the strip */
-    readonly lineSegs: number[][][];
-}
-
-
-export type { Strip }

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

@@ -1,21 +0,0 @@
-import { ROW_COUNT } from "../row-count";
-import { Strip } from "../types/strip";
-
-
-/**
- * 
- * @param count the number of strips
- */
-// TODO - remove
-function createEmptyStrips() {
-    const strips: Strip[] = [];
-    for (let v=0; v<ROW_COUNT; v++) {
-        // TODO - simplify
-        strips.push({ lineSegs: [] });
-    }
-
-    return strips;
-}
-
-
-export { createEmptyStrips }

package/src/utils/path.ts

@@ -1,137 +0,0 @@
-
-// /**
-//  * Find the point on a quadratic bezier curve at t where t is in the range [0, 1]
-//  */
-// function pointOnQuadraticBezier (
-//         x0: number, y0: number, x1: number, y1: number, x2: number, y2: number, t: number,
-//         pointOut: { x: number; y: number }) {
-
-//     const t2 = 1 - t
-//     pointOut.x = t2*t2*x0 + 2*t2*t*x1 + t*t*x2;
-//     pointOut.y = t2*t2*y0 + 2*t2*t*y1 + t*t*y2;
-// }
-
-
-// /**
-//  * Find the point on a cubic bezier curve at t where t is in the range [0, 1]
-//  */
-// function pointOnCubicBezier (
-//         x0: number, y0: number, x1: number, y1: number,
-//         x2: number, y2: number, x3: number, y3: number,
-//         t: number,
-//         pointOut: { x: number; y: number }) {
-
-//     const t2 = 1 - t;
-//     pointOut.x = t2*t2*t2*x0 + 3*t2*t2*t*x1 + 3*t2*t*t*x2 + t*t*t*x3;
-//     pointOut.y = t2*t2*t2*y0 + 3*t2*t2*t*y1 + 3*t2*t*t*y2 + t*t*t*y3;
-// }
-
-
-// /**
-//  * Parse a path string into its constituent line/curve commands, invoking a callback for each.
-//  * @param {string} pathString - An SVG-like path string to parse; should only contain commands: M/L/Q/C/Z
-//  * @param {function(
-//  *   command: 'L'|'Q'|'C',
-//  *   startX: number,
-//  *   startY: number,
-//  *   endX: number,
-//  *   endY: number,
-//  *   ctrl1X?: number,
-//  *   ctrl1Y?: number,
-//  *   ctrl2X?: number,
-//  *   ctrl2Y?: number
-//  * )} commandCallback - A callback function that will be called once for each parsed path command, passing the
-//  *                      command identifier (only L/Q/C commands) and its numeric arguments.
-//  */
-// export function forEachPathCommand(
-//         pathString: string, commandCallback: Function) {
-
-//   const segmentRE = /([MLQCZ])([^MLQCZ]*)/g
-//   let match, firstX, firstY, prevX, prevY
-//   while ((match = segmentRE.exec(pathString))) {
-//     const args = match[2].split(/[,\s]+/)
-//     switch (match[1]) {
-//       case 'M':
-//         prevX = firstX = +args[0]
-//         prevY = firstY = +args[1]
-//         break
-//       case 'L':
-//         if (+args[0] !== prevX || +args[1] !== prevY) { // yup, some fonts have zero-length line commands
-//           commandCallback('L', prevX, prevY, (prevX = +args[0]), (prevY = +args[1]))
-//         }
-//         break
-//       case 'Q': {
-//         commandCallback('Q', prevX, prevY, (prevX = +args[2]), (prevY = +args[3]), +args[0], +args[1])
-//         break
-//       }
-//       case 'C': {
-//         commandCallback('C', prevX, prevY, (prevX = +args[4]), (prevY = +args[5]), +args[0], +args[1], +args[2], +args[3])
-//         break
-//       }
-//       case 'Z':
-//         if (prevX !== firstX || prevY !== firstY) {
-//           commandCallback('L', prevX, prevY, firstX, firstY)
-//         }
-//         break
-//     }
-//   }
-// }
-
-
-// /**
-//  * Convert a path string to a series of straight line segments
-//  * @param {string} pathString - An SVG-like path string to parse; should only contain commands: M/L/Q/C/Z
-//  * @param {function(x1:number, y1:number, x2:number, y2:number)} segmentCallback - A callback
-//  *        function that will be called once for every line segment
-//  * @param {number} [curvePoints] - How many straight line segments to use when approximating a
-//  *        bezier curve in the path. Defaults to 16.
-//  */
-// export function pathToLineSegments (pathString: any, segmentCallback: any, curvePoints = 16) {
-//     const tempPoint = { x: 0, y: 0 }
-//     forEachPathCommand(
-//             pathString,
-//             (command: any, startX: any, startY: any, endX: any, endY: any,
-//              ctrl1X: any, ctrl1Y: any, ctrl2X: any, ctrl2Y: any) => {
-
-//         switch (command) {
-//         case 'L':
-//             segmentCallback(startX, startY, endX, endY);
-//             break;
-//         case 'Q': {
-//             let prevCurveX = startX
-//             let prevCurveY = startY
-//             for (let i = 1; i < curvePoints; i++) {
-//               pointOnQuadraticBezier(
-//                   startX, startY,
-//                   ctrl1X, ctrl1Y,
-//                   endX, endY,
-//                   i / (curvePoints - 1),
-//                   tempPoint
-//               )
-//               segmentCallback(prevCurveX, prevCurveY, tempPoint.x, tempPoint.y)
-//               prevCurveX = tempPoint.x
-//               prevCurveY = tempPoint.y
-//             }
-//             break;
-//         }
-//         case 'C': {
-//             let prevCurveX = startX
-//             let prevCurveY = startY
-//             for (let i = 1; i < curvePoints; i++) {
-//               pointOnCubicBezier(
-//                   startX, startY,
-//                   ctrl1X, ctrl1Y,
-//                   ctrl2X, ctrl2Y,
-//                   endX, endY,
-//                   i / (curvePoints - 1),
-//                   tempPoint
-//               )
-//               segmentCallback(prevCurveX, prevCurveY, tempPoint.x, tempPoint.y)
-//               prevCurveX = tempPoint.x
-//               prevCurveY = tempPoint.y
-//             }
-//             break
-//         }
-//         }
-//     });
-// }