@thi.ng/webgl 6.6.11 → 6.6.12

package/multipass.js

@@ -17,157 +17,166 @@ 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;
-    assert(numPasses > 0, "require at least one shader pass");
-    const useMainBuffer = !opts.passes[numPasses - 1].outputs.length;
-    const textures = initTextures(opts);
-    const passes = initPasses(opts, textures);
-    const fbos = initBuffers(opts, textures, useMainBuffer);
-    const drawPass = (i, time, isFBO = true) => {
-        isFBO && fbos[i].bind();
-        const spec = opts.passes[i];
-        const pass = passes[i];
-        const shader = pass.shader;
-        const size = spec.outputs.length
-            ? textures[spec.outputs[0]].size
-            : [gl.drawingBufferWidth, gl.drawingBufferHeight];
-        shader.uniforms.resolution && (pass.uniforms.resolution = size);
-        shader.uniforms.time && (pass.uniforms.time = time);
-        gl.viewport(0, 0, size[0], size[1]);
-        draw(pass);
-        isFBO && fbos[i].unbind();
-    };
-    const update = (time) => {
-        for (let i = 0; i < fbos.length; i++) {
-            drawPass(i, time);
-        }
-        useMainBuffer && drawPass(numPasses - 1, time, false);
-    };
-    const updateRAF = () => {
-        update((Date.now() - t0) * 1e-3);
-        active && (rafID = requestAnimationFrame(updateRAF));
-    };
-    let active;
-    let t0 = Date.now();
-    let rafID;
-    const instance = {
-        start() {
-            t0 = Date.now();
-            active = true;
-            rafID = requestAnimationFrame(updateRAF);
-        },
-        stop() {
-            if (active) {
-                active = false;
-                cancelAnimationFrame(rafID);
-            }
-        },
-        update(time) {
-            update(time);
-        },
-        singlePass(i, time) {
-            drawPass(i, time, i < fbos.length);
-        },
-        passes: opts.passes,
-        fbos,
-        models: passes,
-        textures,
-    };
-    return instance;
+const defMultiPass = (opts) => {
+  const gl = opts.gl;
+  const numPasses = opts.passes.length;
+  assert(numPasses > 0, "require at least one shader pass");
+  const useMainBuffer = !opts.passes[numPasses - 1].outputs.length;
+  const textures = initTextures(opts);
+  const passes = initPasses(opts, textures);
+  const fbos = initBuffers(opts, textures, useMainBuffer);
+  const drawPass = (i, time, isFBO = true) => {
+    isFBO && fbos[i].bind();
+    const spec = opts.passes[i];
+    const pass = passes[i];
+    const shader = pass.shader;
+    const size = spec.outputs.length ? textures[spec.outputs[0]].size : [gl.drawingBufferWidth, gl.drawingBufferHeight];
+    shader.uniforms.resolution && (pass.uniforms.resolution = size);
+    shader.uniforms.time && (pass.uniforms.time = time);
+    gl.viewport(0, 0, size[0], size[1]);
+    draw(pass);
+    isFBO && fbos[i].unbind();
+  };
+  const update = (time) => {
+    for (let i = 0; i < fbos.length; i++) {
+      drawPass(i, time);
+    }
+    useMainBuffer && drawPass(numPasses - 1, time, false);
+  };
+  const updateRAF = () => {
+    update((Date.now() - t0) * 1e-3);
+    active && (rafID = requestAnimationFrame(updateRAF));
+  };
+  let active;
+  let t0 = Date.now();
+  let rafID;
+  const instance = {
+    start() {
+      t0 = Date.now();
+      active = true;
+      rafID = requestAnimationFrame(updateRAF);
+    },
+    stop() {
+      if (active) {
+        active = false;
+        cancelAnimationFrame(rafID);
+      }
+    },
+    update(time) {
+      update(time);
+    },
+    singlePass(i, time) {
+      drawPass(i, time, i < fbos.length);
+    },
+    passes: opts.passes,
+    fbos,
+    models: passes,
+    textures
+  };
+  return instance;
 };
 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) : { ...model };
-        m.shader = initShader(gl, pass, textures);
-        m.uniforms = { ...pass.uniformVals };
-        pass.inputs.length > 0 &&
-            (m.textures = pass.inputs.map((id) => textures[id]));
-        return m;
-    });
+  const gl = opts.gl;
+  const model = compileModel(gl, defQuadModel({ uv: false }));
+  return opts.passes.map((pass) => {
+    const m = pass.model ? compileModel(gl, pass.model) : { ...model };
+    m.shader = initShader(gl, pass, textures);
+    m.uniforms = { ...pass.uniformVals };
+    pass.inputs.length > 0 && (m.textures = pass.inputs.map((id) => textures[id]));
+    return m;
+  });
 };
 const initShader = (gl, pass, textures) => {
-    const isGL2 = isGL2Context(gl);
-    const numIns = pass.inputs.length;
-    const numOuts = pass.outputs.length;
-    const ext = {};
-    const spec = {
-        vs: pass.vs || PASSTHROUGH_VS,
-        fs: pass.fs,
-        attribs: pass.attribs || {
-            position: "vec2",
-        },
-        varying: pass.varying,
-        uniforms: {
-            ...pass.uniforms,
-            ...transduce(map((i) => [`input${i}`, ["sampler2D", i]]), assocObj(), range(numIns)),
-        },
-        outputs: numOuts
-            ? transduce(map((i) => [
-                `output${i}`,
-                ["vec4", i],
-            ]), assocObj(), range(numOuts))
-            : undefined,
-        state: pass.state,
-        pre: pass.pre,
-        post: pass.post,
-        replacePrelude: pass.replacePrelude,
-        generateDecls: pass.generateDecls,
-        ext,
-    };
-    const floatIn = some((id) => isFloatTexture(textures[id]), pass.inputs);
-    const floatOut = some((id) => isFloatTexture(textures[id]), pass.outputs);
-    if (!isGL2) {
-        floatIn && (ext.OES_texture_float = "require");
-        numOuts > 1 && (ext.WEBGL_draw_buffers = "require");
-    }
-    if (floatOut) {
-        ext[isGL2 ? "EXT_color_buffer_float" : "WEBGL_color_buffer_float"] =
-            "require";
-        isGL2 && (ext["EXT_float_blend"] = "require");
-    }
-    return defShader(gl, spec);
+  const isGL2 = isGL2Context(gl);
+  const numIns = pass.inputs.length;
+  const numOuts = pass.outputs.length;
+  const ext = {};
+  const spec = {
+    vs: pass.vs || PASSTHROUGH_VS,
+    fs: pass.fs,
+    attribs: pass.attribs || {
+      position: "vec2"
+    },
+    varying: pass.varying,
+    uniforms: {
+      ...pass.uniforms,
+      ...transduce(
+        map(
+          (i) => [`input${i}`, ["sampler2D", i]]
+        ),
+        assocObj(),
+        range(numIns)
+      )
+    },
+    outputs: numOuts ? transduce(
+      map(
+        (i) => [
+          `output${i}`,
+          ["vec4", i]
+        ]
+      ),
+      assocObj(),
+      range(numOuts)
+    ) : void 0,
+    state: pass.state,
+    pre: pass.pre,
+    post: pass.post,
+    replacePrelude: pass.replacePrelude,
+    generateDecls: pass.generateDecls,
+    ext
+  };
+  const floatIn = some((id) => isFloatTexture(textures[id]), pass.inputs);
+  const floatOut = some((id) => isFloatTexture(textures[id]), pass.outputs);
+  if (!isGL2) {
+    floatIn && (ext.OES_texture_float = "require");
+    numOuts > 1 && (ext.WEBGL_draw_buffers = "require");
+  }
+  if (floatOut) {
+    ext[isGL2 ? "EXT_color_buffer_float" : "WEBGL_color_buffer_float"] = "require";
+    isGL2 && (ext["EXT_float_blend"] = "require");
+  }
+  return defShader(gl, spec);
 };
 const initTextures = (opts) => Object.keys(opts.textures).reduce((acc, 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;
+  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
-    ? opts.passes.slice(0, opts.passes.length - 1)
-    : opts.passes).map((pass) => defFBO(opts.gl, { tex: pass.outputs.map((id) => textures[id]) }));
-/**
- * Returns a dynamically generated single pass spec ({@link PassOpts}) for use
- * within a larger multipass pipeline spec, and which copies given `src`
- * textures into their respective `dest` textures (e.g. for feedback purposes).
- *
- * @remarks
- * Both arrays must have same length. The first `src` texture is written to the
- * first `dest` tex, etc.
- *
- * WebGL2 only (uses `texelFetch()`)
- *
- * @param src -
- * @param dest -
- */
-export const passCopy = (src, dest) => {
-    assert(src.length === dest.length, `require same number of in/out textures`);
-    return {
-        fs: (gl, unis, _, outs) => [
-            defMain(() => [
-                ...map((i) => assign(outs[`output${i}`], texelFetch(unis[`input${i}`], ivec2($xy(gl.gl_FragCoord)), INT0)), range(src.length)),
-            ]),
-        ],
-        inputs: src,
-        outputs: dest,
-    };
+const initBuffers = (opts, textures, useMainBuffer) => (useMainBuffer ? opts.passes.slice(0, opts.passes.length - 1) : opts.passes).map(
+  (pass) => defFBO(opts.gl, { tex: pass.outputs.map((id) => textures[id]) })
+);
+const passCopy = (src, dest) => {
+  assert(
+    src.length === dest.length,
+    `require same number of in/out textures`
+  );
+  return {
+    fs: (gl, unis, _, outs) => [
+      defMain(() => [
+        ...map(
+          (i) => assign(
+            outs[`output${i}`],
+            texelFetch(
+              unis[`input${i}`],
+              ivec2($xy(gl.gl_FragCoord)),
+              INT0
+            )
+          ),
+          range(src.length)
+        )
+      ])
+    ],
+    inputs: src,
+    outputs: dest
+  };
+};
+export {
+  defMultiPass,
+  passCopy
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/webgl",
-  "version": "6.6.11",
+  "version": "6.6.12",
   "description": "WebGL & GLSL abstraction layer",
   "type": "module",
   "module": "./index.js",
@@ -28,7 +28,9 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "yarn clean && tsc --declaration",
+    "build": "yarn build:esbuild && yarn build:decl",
+    "build:decl": "tsc --declaration --emitDeclarationOnly",
+    "build:esbuild": "esbuild --format=esm --platform=neutral --target=es2022 --tsconfig=tsconfig.json --outdir=. src/**/*.ts",
     "clean": "rimraf --glob '*.js' '*.d.ts' '*.map' doc api geo shaders textures",
     "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
     "doc:ae": "mkdir -p .ae/doc .ae/temp && api-extractor run --local --verbose",
@@ -37,25 +39,26 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/adapt-dpi": "^2.2.27",
-    "@thi.ng/api": "^8.9.11",
-    "@thi.ng/associative": "^6.3.23",
-    "@thi.ng/checks": "^3.4.11",
-    "@thi.ng/equiv": "^2.1.36",
-    "@thi.ng/errors": "^2.4.5",
-    "@thi.ng/logger": "^2.0.1",
-    "@thi.ng/matrices": "^2.2.12",
-    "@thi.ng/memoize": "^3.1.45",
-    "@thi.ng/pixel": "^5.0.3",
-    "@thi.ng/shader-ast": "^0.12.84",
-    "@thi.ng/shader-ast-glsl": "^0.4.84",
-    "@thi.ng/shader-ast-stdlib": "^0.16.9",
-    "@thi.ng/transducers": "^8.8.14",
-    "@thi.ng/vector-pools": "^3.1.89",
-    "@thi.ng/vectors": "^7.8.8"
+    "@thi.ng/adapt-dpi": "^2.2.28",
+    "@thi.ng/api": "^8.9.12",
+    "@thi.ng/associative": "^6.3.24",
+    "@thi.ng/checks": "^3.4.12",
+    "@thi.ng/equiv": "^2.1.37",
+    "@thi.ng/errors": "^2.4.6",
+    "@thi.ng/logger": "^2.0.2",
+    "@thi.ng/matrices": "^2.2.13",
+    "@thi.ng/memoize": "^3.1.46",
+    "@thi.ng/pixel": "^5.0.4",
+    "@thi.ng/shader-ast": "^0.12.85",
+    "@thi.ng/shader-ast-glsl": "^0.4.85",
+    "@thi.ng/shader-ast-stdlib": "^0.16.10",
+    "@thi.ng/transducers": "^8.8.15",
+    "@thi.ng/vector-pools": "^3.1.90",
+    "@thi.ng/vectors": "^7.8.9"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "typedoc": "^0.25.4",
@@ -217,5 +220,5 @@
     ],
     "year": 2014
   },
-  "gitHead": "25f2ac8ff795a432a930119661b364d4d93b59a0\n"
+  "gitHead": "5e7bafedfc3d53bc131469a28de31dd8e5b4a3ff\n"
 }

package/rbo.js

@@ -1,36 +1,45 @@
 import { error } from "./error.js";
-export class RBO {
-    gl;
-    buffer;
-    format;
-    width;
-    height;
-    constructor(gl, opts) {
-        this.gl = gl;
-        this.buffer = gl.createRenderbuffer() || error("error creating RBO");
-        this.configure(opts);
-    }
-    bind() {
-        this.gl.bindRenderbuffer(this.gl.RENDERBUFFER, this.buffer);
-        return true;
-    }
-    unbind() {
-        this.gl.bindRenderbuffer(this.gl.RENDERBUFFER, null);
-        return true;
-    }
-    release() {
-        this.gl.deleteRenderbuffer(this.buffer);
-        delete this.buffer;
-        return true;
-    }
-    configure(opts, unbind = true) {
-        const gl = this.gl;
-        this.bind();
-        this.format = opts.format || gl.DEPTH_COMPONENT16;
-        this.width = opts.width;
-        this.height = opts.height;
-        gl.renderbufferStorage(gl.RENDERBUFFER, opts.format || gl.DEPTH_COMPONENT16, opts.width, opts.height);
-        return unbind ? this.unbind() : true;
-    }
+class RBO {
+  gl;
+  buffer;
+  format;
+  width;
+  height;
+  constructor(gl, opts) {
+    this.gl = gl;
+    this.buffer = gl.createRenderbuffer() || error("error creating RBO");
+    this.configure(opts);
+  }
+  bind() {
+    this.gl.bindRenderbuffer(this.gl.RENDERBUFFER, this.buffer);
+    return true;
+  }
+  unbind() {
+    this.gl.bindRenderbuffer(this.gl.RENDERBUFFER, null);
+    return true;
+  }
+  release() {
+    this.gl.deleteRenderbuffer(this.buffer);
+    delete this.buffer;
+    return true;
+  }
+  configure(opts, unbind = true) {
+    const gl = this.gl;
+    this.bind();
+    this.format = opts.format || gl.DEPTH_COMPONENT16;
+    this.width = opts.width;
+    this.height = opts.height;
+    gl.renderbufferStorage(
+      gl.RENDERBUFFER,
+      opts.format || gl.DEPTH_COMPONENT16,
+      opts.width,
+      opts.height
+    );
+    return unbind ? this.unbind() : true;
+  }
 }
-export const defRBO = (gl, opts) => new RBO(gl, opts);
+const defRBO = (gl, opts) => new RBO(gl, opts);
+export {
+  RBO,
+  defRBO
+};

package/readpixels.js

@@ -1,13 +1,17 @@
 import { FBO } from "./fbo.js";
-export const readPixels = (gl, x, y, w, h, format, type, out) => {
-    gl.readPixels(x, y, w, h, format, type, out);
-    return out;
+const readPixels = (gl, x, y, w, h, format, type, out) => {
+  gl.readPixels(x, y, w, h, format, type, out);
+  return out;
 };
-export const readTexture = (gl, tex, format, type, out) => {
-    const fbo = new FBO(gl, { tex: [tex] });
-    fbo.bind();
-    gl.readPixels(0, 0, tex.size[0], tex.size[1], format, type, out);
-    fbo.unbind();
-    fbo.release();
-    return out;
+const readTexture = (gl, tex, format, type, out) => {
+  const fbo = new FBO(gl, { tex: [tex] });
+  fbo.bind();
+  gl.readPixels(0, 0, tex.size[0], tex.size[1], format, type, out);
+  fbo.unbind();
+  fbo.release();
+  return out;
+};
+export {
+  readPixels,
+  readTexture
 };