@thi.ng/webgl 6.6.10 → 6.6.12

package/fbo.js

@@ -3,98 +3,103 @@ 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;
-/**
- * WebGL framebuffer wrapper w/ automatic detection & support for multiple
- * render targets (color attachments) and optional depth buffer. Multiple
- * targets are only supported if the `WEBGL_draw_buffers` extension is
- * available. The max. number of attachments can be obtained via the
- * `maxAttachments` property of the FBO instance.
- *
- * ```
- * // create FBO w/ 2 render targets
- * fbo = new FBO(gl, { tex: [tex1, tex2] });
- * ```
- *
- * https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_draw_buffers
- */
-export class FBO {
-    gl;
-    fbo;
-    ext;
-    maxAttachments;
-    constructor(gl, opts) {
-        this.gl = gl;
-        this.fbo = gl.createFramebuffer() || error("error creating FBO");
-        this.ext =
-            !isGL2Context(gl) && opts && opts.tex && opts.tex.length > 1
-                ? gl.getExtension("WEBGL_draw_buffers") ||
-                    error("missing WEBGL_draw_buffers ext")
-                : undefined;
-        this.maxAttachments = gl.getParameter(GL_MAX_COLOR_ATTACHMENTS_WEBGL);
-        opts && this.configure(opts);
+const GL_COLOR_ATTACHMENT0_WEBGL = 36064;
+const GL_MAX_COLOR_ATTACHMENTS_WEBGL = 36063;
+class FBO {
+  gl;
+  fbo;
+  ext;
+  maxAttachments;
+  constructor(gl, opts) {
+    this.gl = gl;
+    this.fbo = gl.createFramebuffer() || error("error creating FBO");
+    this.ext = !isGL2Context(gl) && opts && opts.tex && opts.tex.length > 1 ? gl.getExtension("WEBGL_draw_buffers") || error("missing WEBGL_draw_buffers ext") : void 0;
+    this.maxAttachments = gl.getParameter(GL_MAX_COLOR_ATTACHMENTS_WEBGL);
+    opts && this.configure(opts);
+  }
+  bind() {
+    this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, this.fbo);
+    return true;
+  }
+  unbind() {
+    this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, null);
+    return true;
+  }
+  release() {
+    this.gl.deleteFramebuffer(this.fbo);
+    delete this.fbo;
+    delete this.ext;
+    return true;
+  }
+  configure(opts, unbind = true) {
+    const gl = this.gl;
+    this.bind();
+    if (opts.tex) {
+      assert(
+        opts.tex.length < this.maxAttachments,
+        `too many attachments (max. ${this.maxAttachments})`
+      );
+      const attachments = [];
+      for (let i = 0; i < opts.tex.length; i++) {
+        const tex = opts.tex[i];
+        assert(
+          !!(TEX_FORMATS[tex.format].render || TEX_FORMATS[tex.format].renderExt),
+          `texture #${i} has non-renderable format`
+        );
+        const attach = GL_COLOR_ATTACHMENT0_WEBGL + i;
+        gl.framebufferTexture2D(
+          gl.FRAMEBUFFER,
+          attach,
+          gl.TEXTURE_2D,
+          tex.tex,
+          0
+        );
+        attachments[i] = attach;
+      }
+      if (this.ext) {
+        this.ext.drawBuffersWEBGL(attachments);
+      } else if (isGL2Context(gl)) {
+        gl.drawBuffers(attachments);
+      }
     }
-    bind() {
-        this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, this.fbo);
-        return true;
-    }
-    unbind() {
-        this.gl.bindFramebuffer(this.gl.FRAMEBUFFER, null);
-        return true;
+    if (opts.depth) {
+      opts.depth instanceof RBO ? gl.framebufferRenderbuffer(
+        gl.FRAMEBUFFER,
+        gl.DEPTH_ATTACHMENT,
+        gl.RENDERBUFFER,
+        opts.depth.buffer
+      ) : gl.framebufferTexture2D(
+        gl.FRAMEBUFFER,
+        gl.DEPTH_ATTACHMENT,
+        gl.TEXTURE_2D,
+        opts.depth.tex,
+        0
+      );
     }
-    release() {
-        this.gl.deleteFramebuffer(this.fbo);
-        delete this.fbo;
-        delete this.ext;
+    this.validate();
+    return unbind ? this.unbind() : true;
+  }
+  validate() {
+    const gl = this.gl;
+    const err = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
+    switch (err) {
+      case gl.FRAMEBUFFER_COMPLETE:
         return true;
+      case gl.FRAMEBUFFER_UNSUPPORTED:
+        error("FBO unsupported");
+      case gl.FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+        error("FBO incomplete attachment");
+      case gl.FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
+        error("FBO incomplete dimensions");
+      case gl.FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+        error("FBO incomplete missing attachment");
+      default:
+        return error(`FBO error: ${err}`);
     }
-    configure(opts, unbind = true) {
-        const gl = this.gl;
-        this.bind();
-        if (opts.tex) {
-            assert(opts.tex.length < this.maxAttachments, `too many attachments (max. ${this.maxAttachments})`);
-            const attachments = [];
-            for (let i = 0; i < opts.tex.length; i++) {
-                const tex = opts.tex[i];
-                assert(!!(TEX_FORMATS[tex.format].render ||
-                    TEX_FORMATS[tex.format].renderExt), `texture #${i} has non-renderable format`);
-                const attach = GL_COLOR_ATTACHMENT0_WEBGL + i;
-                gl.framebufferTexture2D(gl.FRAMEBUFFER, attach, gl.TEXTURE_2D, tex.tex, 0);
-                attachments[i] = attach;
-            }
-            if (this.ext) {
-                this.ext.drawBuffersWEBGL(attachments);
-            }
-            else if (isGL2Context(gl)) {
-                gl.drawBuffers(attachments);
-            }
-        }
-        if (opts.depth) {
-            opts.depth instanceof RBO
-                ? gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, opts.depth.buffer)
-                : gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.TEXTURE_2D, opts.depth.tex, 0);
-        }
-        this.validate();
-        return unbind ? this.unbind() : true;
-    }
-    validate() {
-        const gl = this.gl;
-        const err = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
-        switch (err) {
-            case gl.FRAMEBUFFER_COMPLETE:
-                return true;
-            case gl.FRAMEBUFFER_UNSUPPORTED:
-                error("FBO unsupported");
-            case gl.FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-                error("FBO incomplete attachment");
-            case gl.FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
-                error("FBO incomplete dimensions");
-            case gl.FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-                error("FBO incomplete missing attachment");
-            default:
-                return error(`FBO error: ${err}`);
-        }
-    }
+  }
 }
-export const defFBO = (gl, opts) => new FBO(gl, opts);
+const defFBO = (gl, opts) => new FBO(gl, opts);
+export {
+  FBO,
+  defFBO
+};

package/geo/cube.js

@@ -1,28 +1,30 @@
 import { DrawMode } from "../api/model.js";
-// prettier-ignore
-export const defCubeModel = (opts) => {
-    opts = { size: 1, normal: true, uv: true, ...opts };
-    const s = opts.size;
-    const spec = {
-        attribs: {
-            position: {
-                data: new Float32Array([s, s, -s, s, s, s, s, -s, s, s, -s, -s, -s, s, s, -s, s, -s, -s, -s, -s, -s, -s, s, -s, s, s, s, s, s, s, s, -s, -s, s, -s, -s, -s, -s, s, -s, -s, s, -s, s, -s, -s, s, s, s, s, -s, s, s, -s, -s, s, s, -s, s, -s, s, -s, s, s, -s, s, -s, -s, -s, -s, -s])
-            },
-        },
-        indices: {
-            data: new Uint16Array([0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13, 14, 12, 14, 15, 16, 17, 18, 16, 18, 19, 20, 21, 22, 20, 22, 23])
-        },
-        uniforms: {},
-        shader: null,
-        mode: DrawMode.TRIANGLES,
-        num: 36
-    };
-    opts.normal && (spec.attribs.normal = {
-        data: new Float32Array([1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1])
-    });
-    opts.uv && (spec.attribs.uv = {
-        data: new Float32Array([1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1]),
-        size: 2
-    });
-    return spec;
+const defCubeModel = (opts) => {
+  opts = { size: 1, normal: true, uv: true, ...opts };
+  const s = opts.size;
+  const spec = {
+    attribs: {
+      position: {
+        data: new Float32Array([s, s, -s, s, s, s, s, -s, s, s, -s, -s, -s, s, s, -s, s, -s, -s, -s, -s, -s, -s, s, -s, s, s, s, s, s, s, s, -s, -s, s, -s, -s, -s, -s, s, -s, -s, s, -s, s, -s, -s, s, s, s, s, -s, s, s, -s, -s, s, s, -s, s, -s, s, -s, s, s, -s, s, -s, -s, -s, -s, -s])
+      }
+    },
+    indices: {
+      data: new Uint16Array([0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11, 12, 13, 14, 12, 14, 15, 16, 17, 18, 16, 18, 19, 20, 21, 22, 20, 22, 23])
+    },
+    uniforms: {},
+    shader: null,
+    mode: DrawMode.TRIANGLES,
+    num: 36
+  };
+  opts.normal && (spec.attribs.normal = {
+    data: new Float32Array([1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1])
+  });
+  opts.uv && (spec.attribs.uv = {
+    data: new Float32Array([1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1]),
+    size: 2
+  });
+  return spec;
+};
+export {
+  defCubeModel
 };

package/geo/quad.js

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

package/logger.js

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

package/material.js

@@ -1,15 +1,18 @@
-export const DEFAULT_MATERIAL = {
-    ambientCol: [0.1, 0.1, 0.1],
-    diffuseCol: [0.8, 0.8, 0.8],
-    specularCol: [1, 1, 1],
+const DEFAULT_MATERIAL = {
+  ambientCol: [0.1, 0.1, 0.1],
+  diffuseCol: [0.8, 0.8, 0.8],
+  specularCol: [1, 1, 1]
 };
 const TYPES = {
-    ambientCol: "vec3",
-    diffuseCol: "vec3",
-    specularCol: "vec3",
+  ambientCol: "vec3",
+  diffuseCol: "vec3",
+  specularCol: "vec3"
 };
-export const defMaterial = (mat = {}, flags = {}, base = DEFAULT_MATERIAL) => Object.keys(base).reduce((acc, id) => {
-    flags[id] !== false &&
-        (acc[id] = [TYPES[id], mat[id] || base[id]]);
-    return acc;
+const defMaterial = (mat = {}, flags = {}, base = DEFAULT_MATERIAL) => Object.keys(base).reduce((acc, id) => {
+  flags[id] !== false && (acc[id] = [TYPES[id], mat[id] || base[id]]);
+  return acc;
 }, {});
+export {
+  DEFAULT_MATERIAL,
+  defMaterial
+};

package/matrices.js

@@ -4,23 +4,16 @@ 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.
- * `transpose(invert(m))`.
- *
- * @param model -
- */
-export const autoNormalMatrix1 = (model = "model") => (shaderU, specU) => normal44([], $(specU, shaderU, model));
-/**
- * Computes the inverse transpose of the matrix product of given 4x4
- * matrix uniforms, i.e. `transpose(invert(view * model))`.
- *
- * @param model -
- * @param view -
- */
-export const autoNormalMatrix2 = (model = "model", view = "view") => (shaderU, specU) => (normal44(null, mulM44([], $(specU, shaderU, view), $(specU, shaderU, model))));
-export function screen2d(a, b) {
-    return isNumber(a)
-        ? ortho([], 0, a, b, 0, -1, 1)
-        : ortho([], 0, a.drawingBufferWidth, a.drawingBufferHeight, 0, -1, 1);
+const autoNormalMatrix1 = (model = "model") => (shaderU, specU) => normal44([], $(specU, shaderU, model));
+const autoNormalMatrix2 = (model = "model", view = "view") => (shaderU, specU) => normal44(
+  null,
+  mulM44([], $(specU, shaderU, view), $(specU, shaderU, model))
+);
+function screen2d(a, b) {
+  return isNumber(a) ? ortho([], 0, a, b, 0, -1, 1) : ortho([], 0, a.drawingBufferWidth, a.drawingBufferHeight, 0, -1, 1);
 }
+export {
+  autoNormalMatrix1,
+  autoNormalMatrix2,
+  screen2d
+};