@thi.ng/webgl 6.6.35 → 6.7.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-03-01T15:22:50Z
+- **Last updated**: 2024-03-06T08:50:42Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,16 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+## [6.7.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/webgl@6.7.0) (2024-03-06)
+
+#### 🚀 Features
+
+- update shader prelude, add sampler3D default precision ([73d7818](https://github.com/thi-ng/umbrella/commit/73d7818))
+  - add `precision lowp sampler3D` to prelude (WebGL2 only)
+- update defMultipass(), add sampler3D support ([3f924cf](https://github.com/thi-ng/umbrella/commit/3f924cf))
+  - update texture & shader init
+  - update MultipassOpts
+
 ### [6.6.32](https://github.com/thi-ng/umbrella/tree/@thi.ng/webgl@6.6.32) (2024-02-22)
 
 #### ♻️ Refactoring

package/README.md

@@ -100,7 +100,7 @@ For Node.js REPL:
 const webgl = await import("@thi.ng/webgl");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 11.54 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 11.63 KB
 
 ## Dependencies
 

package/api/multipass.d.ts

@@ -1,6 +1,7 @@
 import type { IObjectOf } from "@thi.ng/api";
 import type { AttribPool } from "@thi.ng/vector-pools";
 import type { IFbo, IndexBufferSpec } from "./buffers.js";
+import type { ExtensionBehaviors } from "./ext.js";
 import type { InstancingSpec, ModelAttributeSpecs, ModelSpec } from "./model.js";
 import type { ShaderAttribSpecs, ShaderFn, ShaderState, ShaderVaryingSpecs, UniformDecl, UniformValues } from "./shader.js";
 import type { ITexture, TextureOpts } from "./texture.js";
@@ -26,6 +27,7 @@ export interface MultipassOpts {
     passes: PassOpts[];
     width: number;
     height: number;
+    depth?: number;
     uniforms?: Partial<PassUniforms>;
     uniformVals?: UniformValues;
 }
@@ -44,6 +46,7 @@ export interface PassOpts {
     replacePrelude?: boolean;
     generateDecls?: boolean;
     state?: Partial<ShaderState>;
+    ext?: ExtensionBehaviors;
 }
 export interface PassUniforms {
     inputs: never;

package/fbo.d.ts

@@ -6,9 +6,11 @@ import type { FboOpts, IFbo } from "./api/buffers.js";
  * available. The max. number of attachments can be obtained via the
  * `maxAttachments` property of the FBO instance.
  *
- * ```
+ * ```ts
+ * import { defFBO } from "@thi.ng/webgl";
+ *
  * // create FBO w/ 2 render targets
- * fbo = new FBO(gl, { tex: [tex1, tex2] });
+ * fbo = defFBO(gl, { tex: [tex1, tex2] });
  * ```
  *
  * https://developer.mozilla.org/en-US/docs/Web/API/WEBGL_draw_buffers

package/multipass.js

@@ -1,15 +1,21 @@
 import { assert } from "@thi.ng/errors/assert";
-import { S2D, V2, V4 } from "@thi.ng/shader-ast/api/types";
+import { S2D, S3D, V2, V4 } from "@thi.ng/shader-ast/api/types";
 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 { mapIndexed } from "@thi.ng/transducers";
 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 {
+  TextureFilter,
+  TextureRepeat,
+  TextureTarget
+} from "./api/texture.js";
 import { compileModel } from "./buffer.js";
 import { isFloatTexture, isGL2Context } from "./checks.js";
 import { draw } from "./draw.js";
@@ -87,24 +93,31 @@ const initPasses = (opts, textures) => {
     return m;
   });
 };
+const TEX_TYPE_MAP = {
+  [TextureTarget.TEXTURE_2D]: S2D,
+  [TextureTarget.TEXTURE_3D]: S3D,
+  [TextureTarget.TEXTURE_CUBE_MAP]: "samplerCube"
+};
 const initShader = (gl, pass, textures) => {
   const isGL2 = isGL2Context(gl);
-  const numIns = pass.inputs.length;
   const numOuts = pass.outputs.length;
-  const ext = {};
+  const ext = { ...pass.ext };
   const spec = {
     vs: pass.vs || PASSTHROUGH_VS,
     fs: pass.fs,
-    attribs: pass.attribs || {
-      position: V2
-    },
+    attribs: pass.attribs || { position: V2 },
     varying: pass.varying,
     uniforms: {
       ...pass.uniforms,
       ...transduce(
-        map((i) => [`input${i}`, [S2D, i]]),
+        mapIndexed(
+          (i, id) => [
+            `input${i}`,
+            [TEX_TYPE_MAP[textures[id].target], i]
+          ]
+        ),
         assocObj(),
-        range(numIns)
+        pass.inputs
       )
     },
     outputs: numOuts ? transduce(
@@ -137,8 +150,9 @@ 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,
+    depth: opts.depth,
+    filter: TextureFilter.NEAREST,
+    wrap: TextureRepeat.CLAMP,
     image: null,
     ...opts.textures[id]
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/webgl",
-  "version": "6.6.35",
+  "version": "6.7.0",
   "description": "WebGL & GLSL abstraction layer",
   "type": "module",
   "module": "./index.js",
@@ -40,21 +40,21 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.9.27",
-    "@thi.ng/associative": "^6.3.44",
+    "@thi.ng/associative": "^6.3.45",
     "@thi.ng/canvas": "^0.2.8",
     "@thi.ng/checks": "^3.5.1",
     "@thi.ng/equiv": "^2.1.50",
     "@thi.ng/errors": "^2.4.19",
     "@thi.ng/logger": "^3.0.4",
-    "@thi.ng/matrices": "^2.3.20",
-    "@thi.ng/memoize": "^3.1.61",
-    "@thi.ng/pixel": "^6.1.14",
-    "@thi.ng/shader-ast": "^0.13.15",
-    "@thi.ng/shader-ast-glsl": "^0.4.105",
-    "@thi.ng/shader-ast-stdlib": "^0.16.30",
-    "@thi.ng/transducers": "^8.9.8",
-    "@thi.ng/vector-pools": "^3.1.112",
-    "@thi.ng/vectors": "^7.10.14"
+    "@thi.ng/matrices": "^2.3.21",
+    "@thi.ng/memoize": "^3.1.62",
+    "@thi.ng/pixel": "^6.1.15",
+    "@thi.ng/shader-ast": "^0.14.0",
+    "@thi.ng/shader-ast-glsl": "^0.4.107",
+    "@thi.ng/shader-ast-stdlib": "^0.17.0",
+    "@thi.ng/transducers": "^8.9.9",
+    "@thi.ng/vector-pools": "^3.1.113",
+    "@thi.ng/vectors": "^7.10.15"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.40.1",
@@ -219,5 +219,5 @@
     ],
     "year": 2014
   },
-  "gitHead": "d660ae8fd1bf64d919b4334f19509f1f539d70f6\n"
+  "gitHead": "f6bb0e172c5dcb574b961f5155a50040d5569685\n"
 }

package/syntax.d.ts

@@ -26,5 +26,5 @@ export declare const EXPORT_FRAGCOL: (body?: string, out?: string) => string;
 /**
  * Default GLSL prelude.
  */
-export declare const GLSL_HEADER = "#ifdef GL_FRAGMENT_PRECISION_HIGH\nprecision highp int;\nprecision highp float;\n#else\nprecision mediump int;\nprecision mediump float;\n#endif\n#ifndef PI\n#define PI 3.141592653589793\n#endif\n#ifndef TAU\n#define TAU 6.283185307179586\n#endif\n#ifndef HALF_PI\n#define HALF_PI 1.570796326794896\n#endif\n";
+export declare const GLSL_HEADER: string;
 //# sourceMappingURL=syntax.d.ts.map

package/syntax.js

@@ -70,6 +70,7 @@ precision highp float;
 precision mediump int;
 precision mediump float;
 #endif
+${VERSION_CHECK(300, "precision lowp sampler3D;")}
 #ifndef PI
 #define PI 3.141592653589793
 #endif