@luma.gl/shadertools 9.0.16 → 9.0.19

package/dist/modules/postprocessing/image-blur-filters/tiltshift.d.ts

@@ -5,9 +5,9 @@ import { ShaderPass } from "../../../lib/shader-module/shader-pass.js";
  */
 export type TiltShiftProps = {
     /** The x,y coordinate of the start of the line segment. */
-    start?: number[];
+    start?: [number, number];
     /** The xm y coordinate of the end of the line segment. */
-    end?: number[];
+    end?: [number, number];
     /** The maximum radius of the pyramid blur. */
     blurRadius?: number;
     /** The distance from the line at which the maximum blur radius is reached. */

package/dist/modules/postprocessing/image-blur-filters/tiltshift.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tiltshift.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-blur-filters/tiltshift.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAiDlE;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,cAAc,CAsBhE,CAAC"}
+{"version":3,"file":"tiltshift.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-blur-filters/tiltshift.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAiDlE;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,2DAA2D;IAC3D,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,cAAc,CAsBhE,CAAC"}

package/dist/modules/postprocessing/image-blur-filters/triangleblur.d.ts

@@ -9,7 +9,7 @@ export type TriangleBlurProps = {
     /** The radius of the pyramid convolved with the image. */
     radius?: number;
     /** @deprecated internal property */
-    delta?: number[];
+    delta?: [number, number];
 };
 /**
  * @filter       Triangle Blur

package/dist/modules/postprocessing/image-blur-filters/triangleblur.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangleblur.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-blur-filters/triangleblur.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAwClE;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,CAgBzE,CAAC"}
+{"version":3,"file":"triangleblur.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-blur-filters/triangleblur.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAwClE;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,CAgBzE,CAAC"}

package/dist/modules/postprocessing/image-blur-filters/zoomblur.d.ts

@@ -4,7 +4,7 @@ import { ShaderPass } from "../../../lib/shader-module/shader-pass.js";
  */
 export type ZoomBlurProps = {
     /** - The x, y coordinate of the blur origin. */
-    center?: number[];
+    center?: [number, number];
     /** - The strength of the blur. Values in the range 0 to 1 are usually sufficient, where 0 doesn't change the image and 1 creates a highly blurred image. */
     strength?: number;
 };

package/dist/modules/postprocessing/image-blur-filters/zoomblur.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoomblur.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-blur-filters/zoomblur.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAsClE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,4JAA4J;IAC5J,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,UAAU,CAAC,aAAa,EAAE,aAAa,CAa7D,CAAC"}
+{"version":3,"file":"zoomblur.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-blur-filters/zoomblur.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAsClE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,gDAAgD;IAChD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,4JAA4J;IAC5J,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,UAAU,CAAC,aAAa,EAAE,aAAa,CAa7D,CAAC"}

package/dist/modules/postprocessing/image-fun-filters/colorhalftone.d.ts

@@ -7,7 +7,7 @@ import { ShaderPass } from "../../../lib/shader-module/shader-pass.js";
  */
 export type ColorHalftoneProps = {
     /** The x,y coordinate of the pattern origin. */
-    center?: number[];
+    center?: [number, number];
     /** The rotation of the pattern in radians. */
     angle?: number;
     /** The diameter of a dot in pixels. */

package/dist/modules/postprocessing/image-fun-filters/colorhalftone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"colorhalftone.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/colorhalftone.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAyClE;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,8CAA8C;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,EAAE,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,CAc5E,CAAC"}
+{"version":3,"file":"colorhalftone.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/colorhalftone.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAyClE;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gDAAgD;IAChD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,8CAA8C;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,EAAE,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,CAc5E,CAAC"}

package/dist/modules/postprocessing/image-fun-filters/dotscreen.d.ts

@@ -6,7 +6,7 @@ import { ShaderPass } from "../../../lib/shader-module/shader-pass.js";
  */
 export type DotScreenProps = {
     /** The x, y coordinate of the pattern origin. */
-    center?: number[];
+    center?: [number, number];
     /** The rotation of the pattern in radians. */
     angle?: number;
     /** The diameter of a dot in pixels. */

package/dist/modules/postprocessing/image-fun-filters/dotscreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dotscreen.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/dotscreen.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AA4BlE;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,iDAAiD;IACjD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,8CAA8C;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,cAAc,CAchE,CAAC"}
+{"version":3,"file":"dotscreen.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/dotscreen.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AA4BlE;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,iDAAiD;IACjD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,8CAA8C;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,cAAc,CAchE,CAAC"}

package/dist/modules/postprocessing/image-fun-filters/hexagonalpixelate.d.ts

@@ -6,7 +6,7 @@ import { ShaderPass } from "../../../lib/shader-module/shader-pass.js";
  */
 export type HexagonalPixelateProps = {
     /** The [x, y] coordinates of the pattern center. */
-    center?: number[];
+    center?: [number, number];
     /** The width of an individual tile, in pixels. */
     scale?: number;
 };

package/dist/modules/postprocessing/image-fun-filters/hexagonalpixelate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hexagonalpixelate.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/hexagonalpixelate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAgDlE;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,sBAAsB,EAAE,sBAAsB,CAYxF,CAAC"}
+{"version":3,"file":"hexagonalpixelate.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/hexagonalpixelate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAgDlE;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,oDAAoD;IACpD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,sBAAsB,EAAE,sBAAsB,CAYxF,CAAC"}

package/dist/modules/postprocessing/image-fun-filters/magnify.d.ts

@@ -4,7 +4,7 @@ import { ShaderPass } from "../../../lib/shader-module/shader-pass.js";
  */
 export type MagnifyProps = {
     /** x, y position in screen coords, both x and y is normalized and in range `[0, 1]`. `[0, 0]` is the up left corner, `[1, 1]` is the bottom right corner. Default value is `[0, 0]`. */
-    screenXY?: number[];
+    screenXY?: [number, number];
     /** effect radius in pixels. Default value is `100`. */
     radiusPixels?: number;
     /** magnify level. Default value is `2`. */
@@ -12,7 +12,7 @@ export type MagnifyProps = {
     /** border width of the effect circle, will not show border if value <= 0.0. Default value is `0`. */
     borderWidthPixels?: number;
     /** border color of the effect circle. Default value is `[255, 255, 255, 255]`. */
-    borderColor?: number[];
+    borderColor?: [number, number, number, number];
 };
 /**
  * Magnify - display a circle with magnify effect applied to surrounding the pixels given position

package/dist/modules/postprocessing/image-fun-filters/magnify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"magnify.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/magnify.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AA0BlE;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,wLAAwL;IACxL,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,uDAAuD;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qGAAqG;IACrG,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,YAAY,CAmB1D,CAAC"}
+{"version":3,"file":"magnify.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-fun-filters/magnify.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AA0BlE;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,wLAAwL;IACxL,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,uDAAuD;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qGAAqG;IACrG,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kFAAkF;IAClF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAChD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,YAAY,CAmB1D,CAAC"}

package/dist/modules/postprocessing/image-warp-filters/bulgepinch.d.ts

@@ -2,7 +2,7 @@ import { ShaderPass } from "../../../lib/shader-module/shader-pass.js";
 /** Bulges or pinches the image in a circle. */
 export type BulgePinchProps = {
     /** The [x, y] coordinates of the center of the circle of effect. */
-    center?: number[];
+    center?: [number, number];
     /** The radius of the circle of effect. */
     radius?: number;
     /** strength -1 to 1 (-1 is strong pinch, 0 is no effect, 1 is strong bulge) */

package/dist/modules/postprocessing/image-warp-filters/bulgepinch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bulgepinch.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-warp-filters/bulgepinch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAkClE,+CAA+C;AAC/C,MAAM,MAAM,eAAe,GAAG;IAC5B,oEAAoE;IACpE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,eAAe,EAAE,eAAe,CAenE,CAAC"}
+{"version":3,"file":"bulgepinch.d.ts","sourceRoot":"","sources":["../../../../src/modules/postprocessing/image-warp-filters/bulgepinch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAAC,kDAA+C;AAkClE,+CAA+C;AAC/C,MAAM,MAAM,eAAe,GAAG;IAC5B,oEAAoE;IACpE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,UAAU,CAAC,eAAe,EAAE,eAAe,CAenE,CAAC"}

package/dist/modules-webgl1/project/project.d.ts

@@ -1,9 +1,11 @@
+import { Vector3, Matrix4 } from '@math.gl/core';
 import { ShaderModule } from "../../lib/shader-module/shader-module.js";
+import type { NumberArray3, NumberArray16 } from "../../lib/utils/uniform-types.js";
 type ProjectionProps = {
-    modelMatrix?: readonly number[];
-    viewMatrix?: readonly number[];
-    projectionMatrix?: readonly number[];
-    cameraPositionWorld?: readonly number[];
+    modelMatrix?: Readonly<Matrix4 | NumberArray16>;
+    viewMatrix?: Readonly<Matrix4 | NumberArray16>;
+    projectionMatrix?: Readonly<Matrix4 | NumberArray16>;
+    cameraPositionWorld?: Readonly<Vector3 | NumberArray3>;
 };
 /**
  * Projects coordinates

package/dist/modules-webgl1/project/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/modules-webgl1/project/project.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,YAAY,EAAC,iDAA8C;AAEnE,KAAK,eAAe,GAAG;IACrB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAiHF;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,YAAY,CAAC,eAAe,EAAE,eAAe,CAKlE,CAAC"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/modules-webgl1/project/project.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAE/C,OAAO,EAAC,YAAY,EAAC,iDAA8C;AACnE,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,yCAAsC;AAE/E,KAAK,eAAe,GAAG;IACrB,WAAW,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC;IAChD,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC;IAC/C,gBAAgB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC;IACrD,mBAAmB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;CACxD,CAAC;AAiHF;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,YAAY,CAAC,eAAe,EAAE,eAAe,CAKlE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/shadertools",
-  "version": "9.0.16",
+  "version": "9.0.19",
   "description": "Shader module system for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -53,5 +53,5 @@
     "@math.gl/types": "^4.0.0",
     "wgsl_reflect": "^1.0.1"
   },
-  "gitHead": "b1f2597d6efc8aa223ddb3bf6b1530510f17ea40"
+  "gitHead": "5e1ede7bdaf2c9ccdbd167804601537e93dc4225"
 }

package/src/lib/shader-module/shader-module.ts

@@ -2,47 +2,59 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {NumberArray} from '@math.gl/types';
 import {UniformFormat} from '../../types';
 import {PropType} from '../filters/prop-types';
-import {Sampler, Texture} from '@luma.gl/core';
+import type {UniformTypes, UniformValue} from '../utils/uniform-types';
 
-export type UniformValue = number | boolean | Readonly<NumberArray>; // Float32Array> | Readonly<Int32Array> | Readonly<Uint32Array> | Readonly<number[]>;
+// To avoid dependency on core module, do not import `Binding` type.
+// The ShaderModule is not concerned with the type of `Binding`,
+// it is the repsonsibility of `splitUniformsAndBindings` in
+// ShaderInputs to type the result of `getUniforms()`
+type Binding = unknown; // import type {Binding} from '@luma.gl/core';
 
 export type UniformInfo = {
   format?: UniformFormat;
 } & PropType;
 
+// Helper types
+type BindingKeys<T> = {[K in keyof T]: T[K] extends UniformValue ? never : K}[keyof T];
+type UniformKeys<T> = {[K in keyof T]: T[K] extends UniformValue ? K : never}[keyof T];
+export type PickBindings<T> = {[K in BindingKeys<Required<T>>]: T[K]};
+export type PickUniforms<T> = {[K in UniformKeys<Required<T>>]: T[K]};
+
 /**
  * A shader module definition object
- * @note Can be viewed as the ShaderModuleProps for a ShaderModuleInstance
+ * @note `UniformsT` & `BindingsT` are deduced from `PropsT` by default. If
+ * a custom type for `UniformsT` is used, `BindingsT` should be also be provided.
  */
 export type ShaderModule<
-  PropsT extends Record<string, unknown> = Record<string, unknown>,
-  UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>,
-  BindingsT extends Record<string, Buffer | Texture | Sampler> = {}
+  PropsT extends Record<string, any> = Record<string, any>,
+  UniformsT extends Record<string, UniformValue> = PickUniforms<PropsT>,
+  BindingsT extends Record<string, Binding> = PickBindings<PropsT>
 > = {
   /** Used for type inference not for values */
   props?: Required<PropsT>;
   /** Used for type inference, not currently used for values */
   uniforms?: UniformsT;
+  /** Used for type inference, not currently used for values */
+  bindings?: BindingsT;
 
   name: string;
   fs?: string;
   vs?: string;
 
   /** Uniform shader types @note: Both order and types MUST match uniform block declarations in shader */
-  uniformTypes?: Record<keyof UniformsT, UniformFormat>;
+  uniformTypes?: Required<UniformTypes<UniformsT>>; // Record<keyof UniformsT, UniformFormat>;
   /** Uniform JS prop types  */
   uniformPropTypes?: Record<keyof UniformsT, UniformInfo>;
   /** Default uniform values */
   defaultUniforms?: Required<UniformsT>; // Record<keyof UniformsT, UniformValue>;
 
   /** Function that maps props to uniforms & bindings */
-  getUniforms?: (props?: any, oldProps?: any) => Record<string, UniformValue>;
-
-  /** uniform buffers, textures, samplers, storage, ... */
-  bindings?: Record<keyof BindingsT, {location: number; type: 'texture' | 'sampler' | 'uniforms'}>;
+  getUniforms?: (
+    props?: Partial<PropsT>,
+    prevUniforms?: UniformsT
+  ) => Partial<UniformsT & BindingsT>;
 
   defines?: Record<string, string | number>;
   /** Injections */

package/src/lib/shader-module/shader-pass.ts

@@ -2,16 +2,19 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {ShaderModule, UniformValue} from './shader-module';
+import type {Binding} from '@luma.gl/core';
+import type {PickBindings, PickUniforms, ShaderModule} from './shader-module';
+import type {UniformValue} from '../utils/uniform-types';
 
 /**
  * A shaderpass is a shader module with additional information
  * on how to run
  */
 export type ShaderPass<
-  PropsT extends Record<string, unknown> = Record<string, unknown>,
-  UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>
-> = ShaderModule<PropsT, UniformsT> & {
+  PropsT extends Record<string, any> = Record<string, any>,
+  UniformsT extends Record<string, UniformValue> = PickUniforms<PropsT>,
+  BindingsT extends Record<string, Binding> = PickBindings<PropsT>
+> = ShaderModule<PropsT, UniformsT, BindingsT> & {
   passes: ShaderPassData[];
 };
 

package/src/lib/utils/uniform-types.ts

@@ -0,0 +1,91 @@
+import type {Matrix3, Matrix4, Vector2, Vector3, Vector4} from '@math.gl/core';
+
+export type NumberArray2 = [number, number];
+export type NumberArray3 = [number, number, number];
+export type NumberArray4 = [number, number, number, number];
+export type NumberArray6 = [number, number, number, number, number, number];
+export type NumberArray8 = [number, number, number, number, number, number, number, number];
+export type NumberArray9 = [number, number, number, number, number, number, number, number, number];
+export type NumberArray12 = [
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number
+];
+export type NumberArray16 = [
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number,
+  number
+];
+
+/*
+ * Allowed types to be used for uniform values
+ *
+ * Only allow types whose length we can type-check (not `TypedArray`)
+ */
+export type UniformValue = Readonly<
+  | number
+  | boolean
+  | NumberArray2
+  | NumberArray3
+  | NumberArray4
+  | NumberArray6
+  | NumberArray8
+  | NumberArray9
+  | NumberArray12
+  | NumberArray16
+  | Vector2
+  | Vector3
+  | Vector4
+  | Matrix3
+  | Matrix4
+>;
+
+type UniformType<ValueT extends UniformValue> = ValueT extends number | boolean
+  ? 'f32' | 'i32' | 'u32'
+  : ValueT extends Readonly<NumberArray2 | Vector2>
+  ? 'vec2<f32>' | 'vec2<i32>' | 'vec2<u32>'
+  : ValueT extends Readonly<NumberArray3 | Vector3>
+  ? 'vec3<f32>' | 'vec3<i32>' | 'vec3<u32>'
+  : ValueT extends Readonly<NumberArray4 | Vector4>
+  ? 'vec4<f32>' | 'vec4<i32>' | 'vec4<u32>' | 'mat2x2<f32>'
+  : ValueT extends Readonly<NumberArray6>
+  ? 'mat2x3<f32>' | 'mat3x2<f32>'
+  : ValueT extends Readonly<NumberArray8>
+  ? 'mat2x4<f32>' | 'mat4x2<f32>'
+  : ValueT extends Readonly<NumberArray9 | Matrix3>
+  ? 'mat3x3<f32>'
+  : ValueT extends Readonly<NumberArray12>
+  ? 'mat3x4<f32>' | 'mat4x3<f32>'
+  : ValueT extends Readonly<NumberArray16 | Matrix4>
+  ? 'mat4x4<f32>'
+  : never;
+
+type UniformProps = {
+  [name: string]: UniformValue;
+};
+
+export type UniformTypes<PropsT extends UniformProps> = {
+  [name in keyof PropsT]: UniformType<PropsT[name]>;
+};

package/src/modules/engine/picking/picking.ts

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {NumberArray} from '../../../types';
 import {glsl} from '../../../lib/glsl-utils/highlight';
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
+import type {NumberArray3, NumberArray4} from '../../../lib/utils/uniform-types';
 
 // cyan color
-const DEFAULT_HIGHLIGHT_COLOR = new Float32Array([0, 1, 1, 1]);
+const DEFAULT_HIGHLIGHT_COLOR: NumberArray4 = [0, 1, 1, 1];
 
 /**
  * Props for the picking module, which depending on mode renders picking colors or highlighted item.
@@ -20,9 +20,9 @@ export type PickingProps = {
   /** Set to true when picking an attribute value instead of object index */
   isAttribute?: boolean;
   /** Set to a picking color to visually highlight that item, or `null` to explicitly clear **/
-  highlightedObjectColor?: NumberArray | null;
+  highlightedObjectColor?: NumberArray3 | null;
   /** Color of visual highlight of "selected" item */
-  highlightColor?: NumberArray;
+  highlightColor?: NumberArray3 | NumberArray4;
   /** Color range 0-1 or 0-255 */
   useFloatColors?: boolean;
 };
@@ -45,9 +45,9 @@ export type PickingUniforms = {
   /** Do we have a highlighted item? */
   isHighlightActive?: boolean;
   /** Set to a picking color to visually highlight that item */
-  highlightedObjectColor?: NumberArray;
+  highlightedObjectColor?: NumberArray3;
   /** Color of visual highlight of "selected" item */
-  highlightColor?: NumberArray;
+  highlightColor?: NumberArray4;
 };
 
 const vs = glsl`\
@@ -207,7 +207,7 @@ export const picking: ShaderModule<PickingProps, PickingUniforms> = {
     isAttribute: false,
     isHighlightActive: false,
     useFloatColors: true,
-    highlightedObjectColor: new Float32Array([0, 0, 0]),
+    highlightedObjectColor: [0, 0, 0],
     highlightColor: DEFAULT_HIGHLIGHT_COLOR
   },
   getUniforms
@@ -222,7 +222,7 @@ function getUniforms(opts: PickingProps = {}, prevUniforms?: PickingUniforms): P
     uniforms.isHighlightActive = false;
   } else {
     uniforms.isHighlightActive = true;
-    const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3);
+    const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3) as NumberArray3;
     uniforms.highlightedObjectColor = highlightedObjectColor;
   }
 
@@ -231,7 +231,7 @@ function getUniforms(opts: PickingProps = {}, prevUniforms?: PickingUniforms): P
     if (!Number.isFinite(color[3])) {
       color[3] = 1;
     }
-    uniforms.highlightColor = color;
+    uniforms.highlightColor = color as NumberArray4;
   }
 
   if (opts.isActive !== undefined) {

package/src/modules/engine/project/project.ts

@@ -2,20 +2,21 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {NumericArray as NumberArray, Matrix4, Vector3} from '@math.gl/core';
+import {Matrix4, Vector3} from '@math.gl/core';
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
 import {glsl} from '../../../lib/glsl-utils/highlight';
+import type {NumberArray3, NumberArray16} from '../../../lib/utils/uniform-types';
 
-const IDENTITY_MATRIX: Readonly<NumberArray> = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
+const IDENTITY_MATRIX: Readonly<NumberArray16> = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
 
 /**
  * @note Projection uniforms are normally constant across draw calls,
  * at least for each view.
  */
 export type ProjectionProps = {
-  viewMatrix?: Readonly<Matrix4 | NumberArray>;
-  projectionMatrix?: Readonly<Matrix4 | NumberArray>;
-  cameraPositionWorld?: Readonly<Vector3 | NumberArray>;
+  viewMatrix?: Readonly<Matrix4 | NumberArray16>;
+  projectionMatrix?: Readonly<Matrix4 | NumberArray16>;
+  cameraPositionWorld?: Readonly<Vector3 | NumberArray3>;
 };
 
 /**
@@ -23,10 +24,10 @@ export type ProjectionProps = {
  * at least for each view.
  */
 export type ProjectionUniforms = {
-  viewMatrix?: Readonly<Matrix4 | NumberArray>;
-  projectionMatrix?: Readonly<Matrix4 | NumberArray>;
-  viewProjectionMatrix?: Readonly<Matrix4 | NumberArray>;
-  cameraPositionWorld?: Readonly<Vector3 | NumberArray>;
+  viewMatrix?: Readonly<Matrix4 | NumberArray16>;
+  projectionMatrix?: Readonly<Matrix4 | NumberArray16>;
+  viewProjectionMatrix?: Readonly<Matrix4 | NumberArray16>;
+  cameraPositionWorld?: Readonly<Vector3 | NumberArray3>;
 };
 
 const DEFAULT_MODULE_OPTIONS: Required<ProjectionUniforms> = {

package/src/modules/lighting/gouraud-material/gouraud-material.ts

@@ -18,7 +18,7 @@ export type GouraudMaterialUniforms = {
 
 /** In Gouraud shading, color is calculated for each triangle vertex normal, and then color is interpolated colors across the triangle */
 export const gouraudMaterial: ShaderModule<GouraudMaterialProps, GouraudMaterialUniforms> = {
-  name: 'gouraud-lighting',
+  name: 'gouraudMaterial',
   // Note these are switched between phong and gouraud
   vs: GOURAUD_VS,
   fs: GOURAUD_FS,

package/src/modules/lighting/gouraud-material/gouraud-shaders-glsl.ts

@@ -5,16 +5,7 @@
 import {glsl} from '../../../lib/glsl-utils/highlight';
 
 export const GOURAUD_VS = glsl`\
-uniform materialUniforms {
-  uniform float ambient;
-  uniform float diffuse;
-  uniform float shininess;
-  uniform vec3  specularColor;
-} material;
-`;
-
-export const GOURAUD_FS = glsl`\
-uniform materialUniforms {
+uniform gouraudMaterialUniforms {
   uniform float ambient;
   uniform float diffuse;
   uniform float shininess;
@@ -36,39 +27,41 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_d
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
   vec3 lightColor = surfaceColor;
 
-  if (lighting.enabled) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
-    lightColor = material.ambient * surfaceColor * lighting.ambientColor;
+  if (lighting.enabled == 0) {
+    return lightColor;
+  }
 
-    if (lighting.lightType == 0) {
-      PointLight pointLight = lighting_getPointLight(0);
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    } else if (lighting.lightType == 1) {
-      DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-    /*
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.pointLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting.pointLight[i];
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+  vec3 view_direction = normalize(cameraPosition - position_worldspace);
+  lightColor = material.ambient * surfaceColor * lighting.ambientColor;
+
+  if (lighting.lightType == 0) {
+    PointLight pointLight = lighting_getPointLight(0);
+    vec3 light_position_worldspace = pointLight.position;
+    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+  } else if (lighting.lightType == 1) {
+    DirectionalLight directionalLight = lighting_getDirectionalLight(0);
+    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
+  }
+  /*
+  for (int i = 0; i < MAX_LIGHTS; i++) {
+    if (i >= lighting.pointLightCount) {
+      break;
     }
+    PointLight pointLight = lighting.pointLight[i];
+    vec3 light_position_worldspace = pointLight.position;
+    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+  }
 
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.directionalLightCount) {
-        break;
-      }
-      DirectionalLight directionalLight = lighting.directionalLight[i];
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
+  for (int i = 0; i < MAX_LIGHTS; i++) {
+    if (i >= lighting.directionalLightCount) {
+      break;
     }
-    */
+    DirectionalLight directionalLight = lighting.directionalLight[i];
+    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
   }
+  */
   return lightColor;
 }
 
@@ -76,27 +69,39 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
   vec3 lightColor = vec3(0, 0, 0);
   vec3 surfaceColor = vec3(0, 0, 0);
 
-  if (lighting.enabled) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
+  if (lighting.enabled == 0) {
+    return lightColor;
+  }
 
-    switch (lighting.lightType) {
-      case 0:
-        PointLight pointLight = lighting_getPointLight(0);
-        vec3 light_position_worldspace = pointLight.position;
-        vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-        lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-        break;
+  vec3 view_direction = normalize(cameraPosition - position_worldspace);
 
-      case 1:
-        DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-        lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-        break;
-    }
+  switch (lighting.lightType) {
+    case 0:
+      PointLight pointLight = lighting_getPointLight(0);
+      vec3 light_position_worldspace = pointLight.position;
+      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
+      break;
+
+    case 1:
+      DirectionalLight directionalLight = lighting_getDirectionalLight(0);
+      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
+      break;
   }
+
   return lightColor;
 }
 `;
 
+export const GOURAUD_FS = glsl`\
+uniform gouraudMaterialUniforms {
+  uniform float ambient;
+  uniform float diffuse;
+  uniform float shininess;
+  uniform vec3  specularColor;
+} material;
+`;
+
 // TODO - handle multiple lights
 /**
     for (int i = 0; i < MAX_LIGHTS; i++) {