@thi.ng/webgl 6.9.87 → 6.9.90

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 210 standalone projects, maintained as part
+> This is one of 211 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -126,7 +126,7 @@ Note: @thi.ng/api is in _most_ cases a type-only import (not used at runtime)
 
 ## Usage examples
 
-23 projects in this repo's
+24 projects in this repo's
 [/examples](https://github.com/thi-ng/umbrella/tree/develop/examples)
 directory are using this package:
 
@@ -143,6 +143,7 @@ directory are using this package:
 | <img src="https://raw.githubusercontent.com/thi-ng/umbrella/develop/assets/examples/shader-ast-tunnel.jpg" width="240"/>      | WebGL & Canvas2D textured tunnel shader                                       | [Demo](https://demo.thi.ng/umbrella/shader-ast-tunnel/)      | [Source](https://github.com/thi-ng/umbrella/tree/develop/examples/shader-ast-tunnel)      |
 | <img src="https://raw.githubusercontent.com/thi-ng/umbrella/develop/assets/examples/shader-graph.jpg" width="240"/>           | Minimal shader graph developed during livestream #2                           | [Demo](https://demo.thi.ng/umbrella/shader-graph/)           | [Source](https://github.com/thi-ng/umbrella/tree/develop/examples/shader-graph)           |
 | <img src="https://raw.githubusercontent.com/thi-ng/umbrella/develop/assets/examples/soa-ecs-100k.png" width="240"/>           | Entity Component System w/ 100k 3D particles                                  | [Demo](https://demo.thi.ng/umbrella/soa-ecs/)                | [Source](https://github.com/thi-ng/umbrella/tree/develop/examples/soa-ecs)                |
+| <img src="https://raw.githubusercontent.com/thi-ng/umbrella/develop/assets/examples/webgl-cube.png" width="240"/>             | 3D arcball controller to rotate the camera view of a colored cube             | [Demo](https://demo.thi.ng/umbrella/webgl-arcball/)          | [Source](https://github.com/thi-ng/umbrella/tree/develop/examples/webgl-arcball)          |
 | <img src="https://raw.githubusercontent.com/thi-ng/umbrella/develop/assets/examples/webgl-channel-mixer.jpg" width="240"/>    | rdom & WebGL-based image channel editor                                       | [Demo](https://demo.thi.ng/umbrella/webgl-channel-mixer/)    | [Source](https://github.com/thi-ng/umbrella/tree/develop/examples/webgl-channel-mixer)    |
 | <img src="https://raw.githubusercontent.com/thi-ng/umbrella/develop/assets/examples/webgl-cube.png" width="240"/>             | WebGL multi-colored cube mesh                                                 | [Demo](https://demo.thi.ng/umbrella/webgl-cube/)             | [Source](https://github.com/thi-ng/umbrella/tree/develop/examples/webgl-cube)             |
 | <img src="https://raw.githubusercontent.com/thi-ng/umbrella/develop/assets/examples/webgl-cubemap.jpg" width="240"/>          | WebGL cube maps with async texture loading                                    | [Demo](https://demo.thi.ng/umbrella/webgl-cubemap/)          | [Source](https://github.com/thi-ng/umbrella/tree/develop/examples/webgl-cubemap)          |

package/buffer.d.ts

@@ -26,15 +26,16 @@ export declare class WebGLArrayBuffer<T extends TypedArray> implements IWebGLBuf
 }
 export declare const defBuffer: (gl: WebGLRenderingContext, data?: TypedArray, target?: GLenum, mode?: GLenum, retain?: boolean) => WebGLArrayBuffer<Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | Uint8ClampedArray<ArrayBufferLike> | Uint16Array<ArrayBufferLike> | Uint32Array<ArrayBufferLike>>;
 /**
- * Takes a model spec and compiles all buffers (attributes, indices) and shader
- * (if not already compiled), then returns compiled spec, ready for use with
- * {@link draw}.
+ * Takes a model spec (or array of specs) and compiles all buffers (attributes,
+ * indices) and shaders (if not already compiled), then returns compiled spec(s),
+ * ready for use with {@link draw}.
  *
  * @param gl
  * @param spec
  * @param mode
  */
-export declare const compileModel: (gl: WebGLRenderingContext, spec: ModelSpec | UncompiledModelSpec, mode?: 35044) => ModelSpec;
+export declare function compileModel(gl: WebGLRenderingContext, spec: ModelSpec | UncompiledModelSpec, mode?: GLenum): ModelSpec;
+export declare function compileModel(gl: WebGLRenderingContext, spec: (ModelSpec | UncompiledModelSpec)[], mode?: GLenum): ModelSpec[];
 export declare const compileIndices: (gl: WebGLRenderingContext, index?: IndexBufferSpec, mode?: GLenum) => IndexBufferSpec | undefined;
 export declare const compileVAO: (gl: WebGLRenderingContext, spec: ModelSpec) => WebGLVertexArrayObject | undefined;
 export declare const compileAttribPool: (gl: WebGLRenderingContext, pool: AttribPool, ids?: string[], target?: GLenum, mode?: GLenum) => ModelAttributeSpecs;

package/buffer.js

@@ -3,6 +3,7 @@ import {
   asGLType,
   typedArrayType
 } from "@thi.ng/api/typedarray";
+import { isArray } from "@thi.ng/checks/is-array";
 import { isPlainObject } from "@thi.ng/checks/is-plain-object";
 import {
   DrawMode
@@ -69,7 +70,10 @@ class WebGLArrayBuffer {
   }
 }
 const defBuffer = (gl, data, target = gl.ARRAY_BUFFER, mode = gl.STATIC_DRAW, retain = false) => new WebGLArrayBuffer(gl, data, target, mode, retain);
-const compileModel = (gl, spec, mode = gl.STATIC_DRAW) => {
+function compileModel(gl, spec, mode) {
+  return isArray(spec) ? spec.map((x) => __compileModel(gl, x, mode)) : __compileModel(gl, spec, mode);
+}
+const __compileModel = (gl, spec, mode = gl.STATIC_DRAW) => {
   if (spec.attribPool) {
     spec.attribs = compileAttribPool(
       gl,
@@ -111,7 +115,7 @@ const __initBuffer = (gl, src, type, mode) => {
 };
 const __compileAttribs = (gl, attribs, mode) => {
   if (attribs) {
-    for (let id in attribs) {
+    for (const id in attribs) {
       __initBuffer(gl, attribs[id], gl.ARRAY_BUFFER, mode);
     }
   }
@@ -154,7 +158,7 @@ const compileVAO = (gl, spec) => {
 const compileAttribPool = (gl, pool, ids, target = gl.ARRAY_BUFFER, mode = gl.STATIC_DRAW) => {
   const buf = defBuffer(gl, pool.bytes(), target, mode, true);
   const spec = {};
-  for (let id of ids || Object.keys(pool.specs)) {
+  for (const id of ids || Object.keys(pool.specs)) {
     const attr = pool.specs[id];
     spec[id] = {
       buffer: buf,

package/canvas.js

@@ -44,7 +44,7 @@ const glCanvas = (opts = {}) => {
 const getExtensions = (gl, ids, required = true) => {
   const ext = {};
   if (ids) {
-    for (let id of ids) {
+    for (const id of ids) {
       ext[id] = gl.getExtension(id);
       required && !ext[id] && error(`extension ${id} not available`);
     }

package/draw.js

@@ -43,7 +43,7 @@ const __drawInstanced = (gl, spec) => {
   const sattribs = spec.shader.attribs;
   const iattribs = spec.instances.attribs;
   spec.shader.bindAttribs(iattribs);
-  for (let id in iattribs) {
+  for (const id in iattribs) {
     const attr = sattribs[id];
     if (attr) {
       let div = iattribs[id].divisor;
@@ -82,7 +82,7 @@ const __drawInstanced = (gl, spec) => {
       spec.instances.num
     );
   }
-  for (let id in iattribs) {
+  for (const id in iattribs) {
     const attr = sattribs[id];
     attr && (isGL2 ? gl.vertexAttribDivisor(attr.loc, 0) : ext.vertexAttribDivisorANGLE(attr.loc, 0));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@thi.ng/webgl",
-	"version": "6.9.87",
+	"version": "6.9.90",
 	"description": "WebGL & GLSL abstraction layer",
 	"type": "module",
 	"module": "./index.js",
@@ -43,22 +43,22 @@
 		"tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
 	},
 	"dependencies": {
-		"@thi.ng/api": "^8.12.8",
-		"@thi.ng/canvas": "^1.1.1",
-		"@thi.ng/checks": "^3.7.24",
-		"@thi.ng/equiv": "^2.1.98",
-		"@thi.ng/errors": "^2.5.48",
-		"@thi.ng/logger": "^3.2.7",
-		"@thi.ng/matrices": "^3.0.28",
-		"@thi.ng/memoize": "^4.0.32",
-		"@thi.ng/object-utils": "^1.3.0",
-		"@thi.ng/pixel": "^7.5.17",
-		"@thi.ng/shader-ast": "^1.1.30",
-		"@thi.ng/shader-ast-glsl": "^1.0.49",
-		"@thi.ng/shader-ast-stdlib": "^1.0.49",
-		"@thi.ng/transducers": "^9.6.17",
-		"@thi.ng/vector-pools": "^3.2.78",
-		"@thi.ng/vectors": "^8.6.13"
+		"@thi.ng/api": "^8.12.10",
+		"@thi.ng/canvas": "^1.1.3",
+		"@thi.ng/checks": "^3.8.0",
+		"@thi.ng/equiv": "^2.1.100",
+		"@thi.ng/errors": "^2.5.50",
+		"@thi.ng/logger": "^3.2.9",
+		"@thi.ng/matrices": "^3.0.30",
+		"@thi.ng/memoize": "^4.0.34",
+		"@thi.ng/object-utils": "^1.3.2",
+		"@thi.ng/pixel": "^7.5.19",
+		"@thi.ng/shader-ast": "^1.1.32",
+		"@thi.ng/shader-ast-glsl": "^1.0.51",
+		"@thi.ng/shader-ast-stdlib": "^1.0.51",
+		"@thi.ng/transducers": "^9.6.19",
+		"@thi.ng/vector-pools": "^3.2.80",
+		"@thi.ng/vectors": "^8.6.15"
 	},
 	"devDependencies": {
 		"esbuild": "^0.27.0",
@@ -227,5 +227,5 @@
 		],
 		"year": 2014
 	},
-	"gitHead": "be6e7657b1e5c54d7d648d1b52888a7297e95a17\n"
+	"gitHead": "824bf9047b5a10f777c5c5b4aeecf0c750a22c75\n"
 }

package/shader.js

@@ -71,7 +71,7 @@ class Shader {
   }
   unbind() {
     let shaderAttrib;
-    for (let id in this.attribs) {
+    for (const id in this.attribs) {
       if (shaderAttrib = this.attribs[id]) {
         this.gl.disableVertexAttribArray(shaderAttrib.loc);
       }
@@ -90,7 +90,7 @@ class Shader {
   bindAttribs(specAttribs) {
     const gl = this.gl;
     let shaderAttrib;
-    for (let id in specAttribs) {
+    for (const id in specAttribs) {
       if (shaderAttrib = this.attribs[id]) {
         const attr = specAttribs[id];
         attr.buffer.bind();
@@ -110,7 +110,7 @@ class Shader {
   }
   bindUniforms(specUnis = {}) {
     const shaderUnis = this.uniforms;
-    for (let id in specUnis) {
+    for (const id in specUnis) {
       const u = shaderUnis[id];
       if (u) {
         let val = specUnis[id];
@@ -120,7 +120,7 @@ class Shader {
         this.warnUni(id);
       }
     }
-    for (let id in shaderUnis) {
+    for (const id in shaderUnis) {
       if (shaderUnis.hasOwnProperty(id) && (!specUnis || !existsAndNotNull(specUnis[id]))) {
         const u = shaderUnis[id];
         const val = u.defaultFn ? u.defaultFn(shaderUnis, specUnis) : u.defaultVal;
@@ -188,7 +188,7 @@ const defShader = (gl, spec, opts) => {
 };
 const __compileVars = (attribs, syntax, prefixes) => {
   let decls = [];
-  for (let id in attribs) {
+  for (const id in attribs) {
     if (attribs.hasOwnProperty(id)) {
       decls.push(syntax(id, attribs[id], prefixes));
     }
@@ -203,7 +203,7 @@ const __compileExtensionPragma = (id, behavior, version) => {
 ` : "";
 };
 const __initShaderExtensions = (gl, exts) => {
-  for (let id in exts) {
+  for (const id in exts) {
     const state = exts[id];
     if (state === true || state === "require") {
       getExtensions(gl, [id], state === "require");
@@ -213,7 +213,7 @@ const __initShaderExtensions = (gl, exts) => {
 const __compilePrelude = (spec, version) => {
   let prelude = spec.pre ? spec.replacePrelude ? spec.pre : spec.pre + "\n" + GLSL_HEADER : GLSL_HEADER;
   if (spec.ext) {
-    for (let id in spec.ext) {
+    for (const id in spec.ext) {
       prelude += __compileExtensionPragma(
         id,
         spec.ext[id],
@@ -224,7 +224,7 @@ const __compilePrelude = (spec, version) => {
   return prelude;
 };
 const __compileIODecls = (decl, src, dest) => {
-  for (let id in src) {
+  for (const id in src) {
     const a = src[id];
     dest[id] = isArray(a) ? decl(a[0], id, { loc: a[1] }) : decl(a, id);
   }
@@ -235,13 +235,13 @@ const __varyingOpts = (v) => {
   return [vtype, opts];
 };
 const __compileVaryingDecls = (spec, decl, acc) => {
-  for (let id in spec.varying) {
+  for (const id in spec.varying) {
     const [vtype, opts] = __varyingOpts(spec.varying[id]);
     acc[id] = decl(vtype, id, opts);
   }
 };
 const __compileUniformDecls = (spec, acc) => {
-  for (let id in spec.uniforms) {
+  for (const id in spec.uniforms) {
     const u = spec.uniforms[id];
     acc[id] = isArray(u) ? uniform(
       u[0],
@@ -266,7 +266,7 @@ const shaderSourceFromAST = (spec, type, version, opts = {}) => {
     if (version >= GLSLVersion.GLES_300) {
       __compileIODecls(output, outs, outputs);
     } else {
-      for (let id in outs) {
+      for (const id in outs) {
         const o = outs[id];
         if (isArray(o) && o[0] === "vec4") {
           prelude += `#define ${id} gl_FragData[${o[1]}]
@@ -342,7 +342,7 @@ ${errors}`);
 };
 const __initAttributes = (gl, prog, attribs) => {
   const res = {};
-  for (let id in attribs) {
+  for (const id in attribs) {
     const val = attribs[id];
     const [type, loc] = isArray(val) ? val : [val, null];
     const aid = id;
@@ -360,7 +360,7 @@ const __initAttributes = (gl, prog, attribs) => {
 };
 const __initUniforms = (gl, prog, uniforms = {}) => {
   const res = {};
-  for (let id in uniforms) {
+  for (const id in uniforms) {
     const val = uniforms[id];
     let type;
     let t1, t2, defaultVal, defaultFn;