@thi.ng/webgl 5.0.14 → 6.0.4

package/canvas.js

@@ -1,6 +1,6 @@
 import { adaptDPI } from "@thi.ng/adapt-dpi";
-import { isString } from "@thi.ng/checks";
-import { error } from "./error";
+import { isString } from "@thi.ng/checks/is-string";
+import { error } from "./error.js";
 const defaultOpts = {
     alpha: true,
     antialias: true,
@@ -19,7 +19,10 @@ export const glCanvas = (opts = {}) => {
     opts.height && (canvas.height = opts.height);
     opts.autoScale !== false && adaptDPI(canvas, canvas.width, canvas.height);
     opts.parent && opts.parent.appendChild(canvas);
-    const gl = canvas.getContext(opts.version === 2 ? "webgl2" : "webgl", Object.assign(Object.assign({}, defaultOpts), opts.opts));
+    const gl = canvas.getContext(opts.version === 2 ? "webgl2" : "webgl", {
+        ...defaultOpts,
+        ...opts.opts,
+    });
     if (!gl) {
         error("WebGL unavailable");
     }

package/checks.d.ts

@@ -1,4 +1,4 @@
-import { ITexture } from "./api/texture";
+import { ITexture } from "./api/texture.js";
 export declare const isGL2Context: (gl: WebGLRenderingContext | WebGL2RenderingContext) => gl is WebGL2RenderingContext;
 export declare const isFloatTexture: (tex: ITexture) => boolean;
 //# sourceMappingURL=checks.d.ts.map

package/checks.js

@@ -1,4 +1,4 @@
-import { TextureType } from "./api/texture";
+import { TextureType } from "./api/texture.js";
 export const isGL2Context = (gl) => typeof WebGL2RenderingContext !== "undefined" &&
     gl instanceof WebGL2RenderingContext;
 export const isFloatTexture = (tex) => tex.type === TextureType.FLOAT ||

package/draw.d.ts

@@ -1,4 +1,4 @@
-import type { ModelSpec } from "./api/model";
+import type { ModelSpec } from "./api/model.js";
 export interface DrawFlags {
     /**
      * Unless false (default: true), bind modelspec's textures

package/draw.js

@@ -1,7 +1,7 @@
-import { isArray } from "@thi.ng/checks";
-import { isGL2Context } from "./checks";
-import { error } from "./error";
-import { bindTextures, unbindTextures } from "./texture";
+import { isArray } from "@thi.ng/checks/is-array";
+import { isGL2Context } from "./checks.js";
+import { error } from "./error.js";
+import { bindTextures, unbindTextures } from "./texture.js";
 export const draw = (specs, opts = {}) => {
     const _specs = isArray(specs) ? specs : [specs];
     for (let i = 0, n = _specs.length; i < n; i++) {

package/error.d.ts

@@ -1,5 +1,13 @@
-export declare class WebGLError extends Error {
-    constructor(msg?: string);
-}
+/// <reference types="node" />
+export declare const WebGLError: {
+    new (msg?: string | undefined): {
+        name: string;
+        message: string;
+        stack?: string | undefined;
+    };
+    captureStackTrace(targetObject: object, constructorOpt?: Function | undefined): void;
+    prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
+    stackTraceLimit: number;
+};
 export declare const error: (msg?: string | undefined) => never;
 //# sourceMappingURL=error.d.ts.map

package/error.js

@@ -1,8 +1,5 @@
-export class WebGLError extends Error {
-    constructor(msg) {
-        super(`WebGL error ${msg ? ": " + msg : ""}`);
-    }
-}
+import { defError } from "@thi.ng/errors/deferror";
+export const WebGLError = defError(() => "WebGL");
 export const error = (msg) => {
     throw new WebGLError(msg);
 };

package/fbo.d.ts

@@ -1,4 +1,4 @@
-import type { FboOpts, IFbo } from "./api/buffers";
+import type { FboOpts, IFbo } from "./api/buffers.js";
 /**
  * WebGL framebuffer wrapper w/ automatic detection & support for
  * multiple render targets (color attachments) and optional depth

package/fbo.js

@@ -1,8 +1,8 @@
-import { assert } from "@thi.ng/api";
-import { TEX_FORMATS } from "./api/texture";
-import { isGL2Context } from "./checks";
-import { error } from "./error";
-import { RBO } from "./rbo";
+import { assert } from "@thi.ng/errors/assert";
+import { TEX_FORMATS } from "./api/texture.js";
+import { isGL2Context } from "./checks.js";
+import { error } from "./error.js";
+import { RBO } from "./rbo.js";
 const GL_COLOR_ATTACHMENT0_WEBGL = 0x8ce0;
 const GL_MAX_COLOR_ATTACHMENTS_WEBGL = 0x8cdf;
 /**

package/geo/cube.d.ts

@@ -1,4 +1,4 @@
-import { ModelSpec } from "../api/model";
+import { ModelSpec } from "../api/model.js";
 export interface CubeOpts {
     size: number;
     normal: boolean;

package/geo/cube.js

@@ -1,7 +1,7 @@
-import { DrawMode } from "../api/model";
+import { DrawMode } from "../api/model.js";
 // prettier-ignore
 export const defCubeModel = (opts) => {
-    opts = Object.assign({ size: 1, normal: true, uv: true }, opts);
+    opts = { size: 1, normal: true, uv: true, ...opts };
     const s = opts.size;
     const spec = {
         attribs: {

package/geo/quad.d.ts

@@ -1,4 +1,4 @@
-import { ModelSpec } from "../api/model";
+import { ModelSpec } from "../api/model.js";
 export interface QuadOpts {
     /**
      * Side length of the quad in each direction (always square).

package/geo/quad.js

@@ -1,10 +1,11 @@
-import { DrawMode } from "../api/model";
+import { DrawMode } from "../api/model.js";
 export const defQuadModel = (opts) => {
-    let { size, uv, center } = Object.assign({ size: 2, uv: true, center: true }, opts);
+    let { size, uv, center } = { size: 2, uv: true, center: true, ...opts };
     size *= 0.5;
     const o = center ? 0 : size;
     return {
-        attribs: Object.assign({ position: {
+        attribs: {
+            position: {
                 data: new Float32Array([
                     o - size,
                     o - size,
@@ -16,14 +17,16 @@ export const defQuadModel = (opts) => {
                     o + size,
                 ]),
                 size: 2,
-            } }, (uv
-            ? {
-                uv: {
-                    data: new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]),
-                    size: 2,
-                },
-            }
-            : null)),
+            },
+            ...(uv
+                ? {
+                    uv: {
+                        data: new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]),
+                        size: 2,
+                    },
+                }
+                : null),
+        },
         uniforms: {},
         shader: null,
         mode: DrawMode.TRIANGLE_STRIP,

package/index.d.ts

@@ -1,33 +1,33 @@
-export * from "./api/blend";
-export * from "./api/buffers";
-export * from "./api/canvas";
-export * from "./api/ext";
-export * from "./api/glsl";
-export * from "./api/logger";
-export * from "./api/material";
-export * from "./api/model";
-export * from "./api/shader";
-export * from "./api/texture";
-export * from "./buffer";
-export * from "./canvas";
-export * from "./checks";
-export * from "./draw";
-export * from "./error";
-export * from "./fbo";
-export * from "./material";
-export * from "./matrices";
-export * from "./multipass";
-export * from "./rbo";
-export * from "./readpixels";
-export * from "./shader";
-export * from "./syntax";
-export * from "./texture";
-export * from "./utils";
-export * from "./shaders/lambert";
-export * from "./shaders/phong";
-export * from "./shaders/pipeline";
-export * from "./textures/checkerboard";
-export * from "./textures/stripes";
-export * from "./geo/cube";
-export * from "./geo/quad";
+export * from "./api/blend.js";
+export * from "./api/buffers.js";
+export * from "./api/canvas.js";
+export * from "./api/ext.js";
+export * from "./api/glsl.js";
+export * from "./api/material.js";
+export * from "./api/model.js";
+export * from "./api/shader.js";
+export * from "./api/texture.js";
+export * from "./buffer.js";
+export * from "./canvas.js";
+export * from "./checks.js";
+export * from "./draw.js";
+export * from "./error.js";
+export * from "./fbo.js";
+export * from "./logger.js";
+export * from "./material.js";
+export * from "./matrices.js";
+export * from "./multipass.js";
+export * from "./rbo.js";
+export * from "./readpixels.js";
+export * from "./shader.js";
+export * from "./syntax.js";
+export * from "./texture.js";
+export * from "./utils.js";
+export * from "./shaders/lambert.js";
+export * from "./shaders/phong.js";
+export * from "./shaders/pipeline.js";
+export * from "./textures/checkerboard.js";
+export * from "./textures/stripes.js";
+export * from "./geo/cube.js";
+export * from "./geo/quad.js";
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -1,32 +1,32 @@
-export * from "./api/blend";
-export * from "./api/buffers";
-export * from "./api/canvas";
-export * from "./api/ext";
-export * from "./api/glsl";
-export * from "./api/logger";
-export * from "./api/material";
-export * from "./api/model";
-export * from "./api/shader";
-export * from "./api/texture";
-export * from "./buffer";
-export * from "./canvas";
-export * from "./checks";
-export * from "./draw";
-export * from "./error";
-export * from "./fbo";
-export * from "./material";
-export * from "./matrices";
-export * from "./multipass";
-export * from "./rbo";
-export * from "./readpixels";
-export * from "./shader";
-export * from "./syntax";
-export * from "./texture";
-export * from "./utils";
-export * from "./shaders/lambert";
-export * from "./shaders/phong";
-export * from "./shaders/pipeline";
-export * from "./textures/checkerboard";
-export * from "./textures/stripes";
-export * from "./geo/cube";
-export * from "./geo/quad";
+export * from "./api/blend.js";
+export * from "./api/buffers.js";
+export * from "./api/canvas.js";
+export * from "./api/ext.js";
+export * from "./api/glsl.js";
+export * from "./api/material.js";
+export * from "./api/model.js";
+export * from "./api/shader.js";
+export * from "./api/texture.js";
+export * from "./buffer.js";
+export * from "./canvas.js";
+export * from "./checks.js";
+export * from "./draw.js";
+export * from "./error.js";
+export * from "./fbo.js";
+export * from "./logger.js";
+export * from "./material.js";
+export * from "./matrices.js";
+export * from "./multipass.js";
+export * from "./rbo.js";
+export * from "./readpixels.js";
+export * from "./shader.js";
+export * from "./syntax.js";
+export * from "./texture.js";
+export * from "./utils.js";
+export * from "./shaders/lambert.js";
+export * from "./shaders/phong.js";
+export * from "./shaders/pipeline.js";
+export * from "./textures/checkerboard.js";
+export * from "./textures/stripes.js";
+export * from "./geo/cube.js";
+export * from "./geo/quad.js";

package/{api/logger.d.ts → logger.d.ts}

@@ -1,4 +1,4 @@
-import { ILogger } from "@thi.ng/api";
+import type { ILogger } from "@thi.ng/logger";
 export declare let LOGGER: ILogger;
 export declare const setLogger: (logger: ILogger) => ILogger;
 //# sourceMappingURL=logger.d.ts.map

package/{api/logger.js → logger.js}

@@ -1,3 +1,3 @@
-import { NULL_LOGGER } from "@thi.ng/api";
+import { NULL_LOGGER } from "@thi.ng/logger/null";
 export let LOGGER = NULL_LOGGER;
 export const setLogger = (logger) => (LOGGER = logger);

package/material.d.ts

@@ -1,5 +1,5 @@
-import type { Material } from "./api/material";
-import type { ShaderUniformSpecs } from "./api/shader";
+import type { Material } from "./api/material.js";
+import type { ShaderUniformSpecs } from "./api/shader.js";
 export declare const DEFAULT_MATERIAL: Material;
 export declare const defMaterial: (mat?: Partial<Material>, flags?: Partial<Record<keyof Material, boolean>>, base?: Material) => ShaderUniformSpecs;
 //# sourceMappingURL=material.d.ts.map

package/matrices.d.ts

@@ -1,7 +1,7 @@
 import type { IObjectOf } from "@thi.ng/api";
 import type { ReadonlyVec } from "@thi.ng/vectors";
-import type { GLMat4 } from "./api/glsl";
-import type { ShaderUniforms } from "./api/shader";
+import type { GLMat4 } from "./api/glsl.js";
+import type { ShaderUniforms } from "./api/shader.js";
 /**
  * Computes the inverse transpose of given 4x4 matrix uniform, i.e.
  * `transpose(invert(m))`.

package/matrices.js

@@ -1,5 +1,8 @@
-import { isNumber } from "@thi.ng/checks";
-import { IDENT44, mulM44, normal44, ortho } from "@thi.ng/matrices";
+import { isNumber } from "@thi.ng/checks/is-number";
+import { IDENT44 } from "@thi.ng/matrices/constants";
+import { mulM44 } from "@thi.ng/matrices/mulm";
+import { normal44 } from "@thi.ng/matrices/normal-mat";
+import { ortho } from "@thi.ng/matrices/ortho";
 const $ = (a, b, id) => a[id] || b[id].defaultVal || IDENT44;
 /**
  * Computes the inverse transpose of given 4x4 matrix uniform, i.e.

package/multipass.d.ts

@@ -1,4 +1,4 @@
-import type { Multipass, MultipassOpts, PassOpts } from "./api/multipass";
+import type { Multipass, MultipassOpts, PassOpts } from "./api/multipass.js";
 export declare const defMultiPass: (opts: MultipassOpts) => Multipass;
 /**
  * Returns a dynamically generated single pass spec ({@link PassOpts}) for use

package/multipass.js

@@ -1,14 +1,22 @@
-import { assert } from "@thi.ng/api";
-import { $xy, assign, defMain, INT0, ivec2, texelFetch, } from "@thi.ng/shader-ast";
-import { assocObj, map, range, some, transduce } from "@thi.ng/transducers";
-import { compileModel } from "./buffer";
-import { isFloatTexture, isGL2Context } from "./checks";
-import { draw } from "./draw";
-import { defFBO } from "./fbo";
-import { defQuadModel } from "./geo/quad";
-import { defShader } from "./shader";
-import { PASSTHROUGH_VS } from "./shaders/pipeline";
-import { defTexture } from "./texture";
+import { assert } from "@thi.ng/errors/assert";
+import { assign } from "@thi.ng/shader-ast/ast/assign";
+import { defMain } from "@thi.ng/shader-ast/ast/function";
+import { INT0, ivec2 } from "@thi.ng/shader-ast/ast/lit";
+import { $xy } from "@thi.ng/shader-ast/ast/swizzle";
+import { texelFetch } from "@thi.ng/shader-ast/builtin/texture";
+import { assocObj } from "@thi.ng/transducers/assoc-obj";
+import { map } from "@thi.ng/transducers/map";
+import { range } from "@thi.ng/transducers/range";
+import { some } from "@thi.ng/transducers/some";
+import { transduce } from "@thi.ng/transducers/transduce";
+import { compileModel } from "./buffer.js";
+import { isFloatTexture, isGL2Context } from "./checks.js";
+import { draw } from "./draw.js";
+import { defFBO } from "./fbo.js";
+import { defQuadModel } from "./geo/quad.js";
+import { defShader } from "./shader.js";
+import { PASSTHROUGH_VS } from "./shaders/pipeline.js";
+import { defTexture } from "./texture.js";
 export const defMultiPass = (opts) => {
     const gl = opts.gl;
     const numPasses = opts.passes.length;
@@ -70,9 +78,9 @@ const initPasses = (opts, textures) => {
     const gl = opts.gl;
     const model = compileModel(gl, defQuadModel({ uv: false }));
     return opts.passes.map((pass) => {
-        const m = pass.model ? compileModel(gl, pass.model) : Object.assign({}, model);
+        const m = pass.model ? compileModel(gl, pass.model) : { ...model };
         m.shader = initShader(gl, pass, textures);
-        m.uniforms = Object.assign({}, pass.uniformVals);
+        m.uniforms = { ...pass.uniformVals };
         pass.inputs.length > 0 &&
             (m.textures = pass.inputs.map((id) => textures[id]));
         return m;
@@ -90,7 +98,10 @@ const initShader = (gl, pass, textures) => {
             position: "vec2",
         },
         varying: pass.varying,
-        uniforms: Object.assign(Object.assign({}, pass.uniforms), transduce(map((i) => [`input${i}`, ["sampler2D", i]]), assocObj(), range(numIns))),
+        uniforms: {
+            ...pass.uniforms,
+            ...transduce(map((i) => [`input${i}`, ["sampler2D", i]]), assocObj(), range(numIns)),
+        },
         outputs: numOuts
             ? transduce(map((i) => [
                 `output${i}`,
@@ -117,7 +128,14 @@ const initShader = (gl, pass, textures) => {
     return defShader(gl, spec);
 };
 const initTextures = (opts) => Object.keys(opts.textures).reduce((acc, id) => {
-    acc[id] = defTexture(opts.gl, Object.assign({ width: opts.width, height: opts.height, filter: opts.gl.NEAREST, wrap: opts.gl.CLAMP_TO_EDGE, image: null }, opts.textures[id]));
+    acc[id] = defTexture(opts.gl, {
+        width: opts.width,
+        height: opts.height,
+        filter: opts.gl.NEAREST,
+        wrap: opts.gl.CLAMP_TO_EDGE,
+        image: null,
+        ...opts.textures[id],
+    });
     return acc;
 }, {});
 const initBuffers = (opts, textures, useMainBuffer) => (useMainBuffer