@thi.ng/webgl 6.6.24 → 6.6.26

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-01-30T15:21:31Z
+- **Last updated**: 2024-02-06T23:18:11Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ 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.6.26](https://github.com/thi-ng/umbrella/tree/@thi.ng/webgl@6.6.26) (2024-02-06)
+
+#### ♻️ Refactoring
+
+- use shader type consts ([e9f8c4c](https://github.com/thi-ng/umbrella/commit/e9f8c4c))
+
 ### [6.6.6](https://github.com/thi-ng/umbrella/tree/@thi.ng/webgl@6.6.6) (2023-11-09)
 
 #### ♻️ Refactoring

package/README.md

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

package/material.js

@@ -1,12 +1,13 @@
+import { V3 } from "@thi.ng/shader-ast/api/types";
 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: V3,
+  diffuseCol: V3,
+  specularCol: V3
 };
 const defMaterial = (mat = {}, flags = {}, base = DEFAULT_MATERIAL) => Object.keys(base).reduce((acc, id) => {
   flags[id] !== false && (acc[id] = [TYPES[id], mat[id] || base[id]]);

package/multipass.js

@@ -1,4 +1,5 @@
 import { assert } from "@thi.ng/errors/assert";
+import { S2D, 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";
@@ -95,25 +96,20 @@ const initShader = (gl, pass, textures) => {
     vs: pass.vs || PASSTHROUGH_VS,
     fs: pass.fs,
     attribs: pass.attribs || {
-      position: "vec2"
+      position: V2
     },
     varying: pass.varying,
     uniforms: {
       ...pass.uniforms,
       ...transduce(
-        map(
-          (i) => [`input${i}`, ["sampler2D", i]]
-        ),
+        map((i) => [`input${i}`, [S2D, i]]),
         assocObj(),
         range(numIns)
       )
     },
     outputs: numOuts ? transduce(
       map(
-        (i) => [
-          `output${i}`,
-          ["vec4", i]
-        ]
+        (i) => [`output${i}`, [V4, i]]
       ),
       assocObj(),
       range(numOuts)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/webgl",
-  "version": "6.6.24",
+  "version": "6.6.26",
   "description": "WebGL & GLSL abstraction layer",
   "type": "module",
   "module": "./index.js",
@@ -39,22 +39,22 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.21",
-    "@thi.ng/associative": "^6.3.34",
-    "@thi.ng/canvas": "^0.2.3",
-    "@thi.ng/checks": "^3.4.21",
-    "@thi.ng/equiv": "^2.1.45",
-    "@thi.ng/errors": "^2.4.14",
-    "@thi.ng/logger": "^2.1.7",
-    "@thi.ng/matrices": "^2.3.9",
-    "@thi.ng/memoize": "^3.1.55",
-    "@thi.ng/pixel": "^6.1.3",
-    "@thi.ng/shader-ast": "^0.13.5",
-    "@thi.ng/shader-ast-glsl": "^0.4.95",
-    "@thi.ng/shader-ast-stdlib": "^0.16.20",
-    "@thi.ng/transducers": "^8.8.25",
-    "@thi.ng/vector-pools": "^3.1.101",
-    "@thi.ng/vectors": "^7.10.3"
+    "@thi.ng/api": "^8.9.22",
+    "@thi.ng/associative": "^6.3.36",
+    "@thi.ng/canvas": "^0.2.4",
+    "@thi.ng/checks": "^3.4.22",
+    "@thi.ng/equiv": "^2.1.46",
+    "@thi.ng/errors": "^2.4.15",
+    "@thi.ng/logger": "^2.1.9",
+    "@thi.ng/matrices": "^2.3.11",
+    "@thi.ng/memoize": "^3.1.56",
+    "@thi.ng/pixel": "^6.1.5",
+    "@thi.ng/shader-ast": "^0.13.7",
+    "@thi.ng/shader-ast-glsl": "^0.4.97",
+    "@thi.ng/shader-ast-stdlib": "^0.16.22",
+    "@thi.ng/transducers": "^8.9.0",
+    "@thi.ng/vector-pools": "^3.1.103",
+    "@thi.ng/vectors": "^7.10.5"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.39.0",
@@ -219,5 +219,5 @@
     ],
     "year": 2014
   },
-  "gitHead": "ded7c5e87ebc7f6279c24f183c24ff348db8f304\n"
+  "gitHead": "ce8202c237a367c4038d41919a8acf75e1122507\n"
 }

package/shaders/lambert.js

@@ -5,6 +5,7 @@ import {
 } from "@thi.ng/shader-ast-stdlib/light/lambert";
 import { transformMVP } from "@thi.ng/shader-ast-stdlib/matrix/mvp";
 import { surfaceNormal } from "@thi.ng/shader-ast-stdlib/matrix/normal";
+import { M4, S2D, V2, V3 } 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 { vec4 } from "@thi.ng/shader-ast/ast/lit";
@@ -56,30 +57,30 @@ const LAMBERT = (opts = {}) => ({
   ],
   // pre: ALIAS_TEXTURE,
   attribs: {
-    position: "vec3",
-    normal: "vec3",
-    ...opts.uv ? { [opts.uv]: "vec2" } : null,
-    ...opts.color && !opts.instanceColor ? { [opts.color]: "vec3" } : null,
-    ...opts.instancePos ? { [opts.instancePos]: "vec3" } : null,
-    ...opts.instanceColor ? { [opts.instanceColor]: "vec3" } : null
+    position: V3,
+    normal: V3,
+    ...opts.uv ? { [opts.uv]: V2 } : null,
+    ...opts.color && !opts.instanceColor ? { [opts.color]: V3 } : null,
+    ...opts.instancePos ? { [opts.instancePos]: V3 } : null,
+    ...opts.instanceColor ? { [opts.instanceColor]: V3 } : null
   },
   varying: {
-    vcolor: "vec3",
-    vnormal: "vec3",
-    ...opts.uv ? { vuv: "vec2" } : null
+    vcolor: V3,
+    vnormal: V3,
+    ...opts.uv ? { vuv: V2 } : null
   },
   uniforms: {
-    model: "mat4",
-    view: "mat4",
-    proj: "mat4",
-    normalMat: ["mat4", autoNormalMatrix2()],
-    lightDir: ["vec3", [0, 1, 0]],
-    lightCol: ["vec3", [1, 1, 1]],
+    model: M4,
+    view: M4,
+    proj: M4,
+    normalMat: [M4, autoNormalMatrix2()],
+    lightDir: [V3, [0, 1, 0]],
+    lightCol: [V3, [1, 1, 1]],
     ...defMaterial(
       { diffuseCol: [1, 1, 1], ...opts.material },
       { specularCol: false }
     ),
-    ...opts.uv ? { tex: "sampler2D" } : null
+    ...opts.uv ? { tex: S2D } : null
   },
   state: {
     depth: true,

package/shaders/phong.js

@@ -1,3 +1,4 @@
+import { F, M4, V3 } from "@thi.ng/shader-ast/api/types";
 import { diffuseLighting } from "@thi.ng/shader-ast-stdlib/light/lambert";
 import { surfaceNormal } from "@thi.ng/shader-ast-stdlib/matrix/normal";
 import { assign } from "@thi.ng/shader-ast/ast/assign";
@@ -72,27 +73,27 @@ const PHONG = (opts = {}) => ({
     })
   ],
   attribs: {
-    position: "vec3",
-    normal: "vec3",
-    ...opts.color && !opts.instanceColor ? { [opts.color]: "vec3" } : null,
-    ...opts.instancePos ? { [opts.instancePos]: "vec3" } : null,
-    ...opts.instanceColor ? { [opts.instanceColor]: "vec3" } : null
+    position: V3,
+    normal: V3,
+    ...opts.color && !opts.instanceColor ? { [opts.color]: V3 } : null,
+    ...opts.instancePos ? { [opts.instancePos]: V3 } : null,
+    ...opts.instanceColor ? { [opts.instanceColor]: V3 } : null
   },
   varying: {
-    vnormal: "vec3",
-    veye: "vec3",
-    vlight: "vec3",
-    vcolor: "vec3"
+    vnormal: V3,
+    veye: V3,
+    vlight: V3,
+    vcolor: V3
   },
   uniforms: {
-    model: "mat4",
-    normalMat: ["mat4", autoNormalMatrix1()],
-    view: "mat4",
-    proj: "mat4",
-    shininess: ["float", 32],
-    eyePos: "vec3",
-    lightPos: ["vec3", [0, 0, 2]],
-    lightCol: ["vec3", [1, 1, 1]],
+    model: M4,
+    normalMat: [M4, autoNormalMatrix1()],
+    view: M4,
+    proj: M4,
+    shininess: [F, 32],
+    eyePos: V3,
+    lightPos: [V3, [0, 0, 2]],
+    lightCol: [V3, [1, 1, 1]],
     ...defMaterial(opts.material)
   },
   state: {

package/shaders/pipeline.js

@@ -1,3 +1,4 @@
+import { S2D, V2 } 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 { FLOAT0, FLOAT1, vec4 } from "@thi.ng/shader-ast/ast/lit";
@@ -21,7 +22,7 @@ const PASSTHROUGH_FS_UV = (_, unis, ins, outs) => [
 const FX_SHADER_SPEC = {
   vs: PASSTHROUGH_VS,
   fs: PASSTHROUGH_FS,
-  attribs: { position: "vec2" },
+  attribs: { position: V2 },
   varying: {},
   uniforms: {},
   state: { depth: false },
@@ -30,9 +31,9 @@ const FX_SHADER_SPEC = {
 const FX_SHADER_SPEC_UV = {
   vs: PASSTHROUGH_VS_UV,
   fs: PASSTHROUGH_FS_UV,
-  attribs: { position: "vec2", uv: "vec2" },
-  varying: { v_uv: "vec2" },
-  uniforms: { tex: "sampler2D" },
+  attribs: { position: V2, uv: V2 },
+  varying: { v_uv: V2 },
+  uniforms: { tex: S2D },
   state: { depth: false },
   ext: {}
 };