@luma.gl/shadertools 9.0.15 → 9.0.17

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.15",
+  "version": "9.0.17",
   "description": "Shader module system for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -50,7 +50,8 @@
   },
   "dependencies": {
     "@math.gl/core": "^4.0.0",
-    "@math.gl/types": "^4.0.0"
+    "@math.gl/types": "^4.0.0",
+    "wgsl_reflect": "^1.0.1"
   },
-  "gitHead": "48b6e702cf6ad35748cfa88ffd249c17861ff2af"
+  "gitHead": "f348f3221ab2842ffa877b6c99e0e9e4df82426e"
 }

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/lib/wgsl/get-shader-layout-wgsl.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {ShaderAttributeType, ShaderLayout, log} from '@luma.gl/core';
-import {WgslReflect} from '../../libs/wgsl-reflect/wgsl_reflect.module.js';
+import {WgslReflect} from 'wgsl_reflect';
 
 /**
  * Parse a ShaderLayout from WGSL shader source code.
@@ -23,10 +23,10 @@ export function getShaderLayoutFromWGSL(source: string): ShaderLayout {
 
   for (const uniform of parsedWGSL.uniforms) {
     const members = [];
-    for (const member of uniform.type.members) {
+    for (const attribute of (uniform.type as any)?.members || []) {
       members.push({
-        name: member.name,
-        type: getType(member.type)
+        name: attribute.name,
+        type: getType(attribute.type)
       });
     }
 
@@ -53,7 +53,7 @@ export function getShaderLayoutFromWGSL(source: string): ShaderLayout {
 
       shaderLayout.attributes.push({
         name: wgslAttribute.name,
-        location: wgslAttribute.location,
+        location: Number(wgslAttribute.location),
         type
       });
     }

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/lights/lighting-uniforms.ts

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {NumberArray} from '@math.gl/types';
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
 import {lightingUniforms} from './lighting-uniforms-glsl';
+import type {NumberArray3} from '../../../lib/utils/uniform-types';
 
 /** Max number of supported lights (in addition to ambient light */
 const MAX_LIGHTS = 5;
@@ -24,23 +24,23 @@ export type Light = AmbientLight | PointLight | DirectionalLight;
 
 export type AmbientLight = {
   type: 'ambient';
-  color?: Readonly<NumberArray>;
+  color?: Readonly<NumberArray3>;
   intensity?: number;
 };
 
 export type PointLight = {
   type: 'point';
-  position: Readonly<NumberArray>;
-  color?: Readonly<NumberArray>;
+  position: Readonly<NumberArray3>;
+  color?: Readonly<NumberArray3>;
   intensity?: number;
   attenuation?: number;
 };
 
 export type DirectionalLight = {
   type: 'directional';
-  position: Readonly<NumberArray>;
-  direction: Readonly<NumberArray>;
-  color?: Readonly<NumberArray>;
+  position: Readonly<NumberArray3>;
+  direction: Readonly<NumberArray3>;
+  color?: Readonly<NumberArray3>;
   intensity?: number;
 };
 
@@ -57,17 +57,17 @@ export type LightingProps = {
 
 export type LightingUniforms = {
   enabled: number;
-  ambientLightColor: Readonly<NumberArray>;
+  ambientLightColor: Readonly<NumberArray3>;
   numberOfLights: number;
   lightType: number; // [];
-  lightColor: Readonly<NumberArray>; // [];
-  lightPosition: Readonly<NumberArray>; // [];
-  lightDirection: Readonly<NumberArray>; // [];
-  lightAttenuation: Readonly<NumberArray>; // [];
+  lightColor: Readonly<NumberArray3>; // [];
+  lightPosition: Readonly<NumberArray3>; // [];
+  lightDirection: Readonly<NumberArray3>; // [];
+  lightAttenuation: Readonly<NumberArray3>; // [];
 };
 
 /** UBO ready lighting module */
-export const lighting: ShaderModule<LightingProps, LightingUniforms> = {
+export const lighting: ShaderModule<LightingProps, LightingUniforms, {}> = {
   name: 'lighting',
   vs: lightingUniforms,
   fs: lightingUniforms,
@@ -217,8 +217,8 @@ function extractLightTypes(lights: Light[]): LightingProps {
 
 /** Take color 0-255 and intensity as input and output 0.0-1.0 range */
 function convertColor(
-  colorDef: {color?: Readonly<NumberArray>; intensity?: number} = {}
-): NumberArray {
+  colorDef: {color?: Readonly<NumberArray3>; intensity?: number} = {}
+): NumberArray3 {
   const {color = [0, 0, 0], intensity = 1.0} = colorDef;
-  return color.map(component => (component * intensity) / COLOR_FACTOR);
+  return color.map(component => (component * intensity) / COLOR_FACTOR) as NumberArray3;
 }

package/src/modules/lighting/no-material/dirlight.ts

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {NumberArray} from '@math.gl/types';
+import type {Vector3} from '@math.gl/core';
 import {glsl} from '../../../lib/glsl-utils/highlight';
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
 
 export type DirlightProps = {
-  lightDirection?: NumberArray | [number, number, number];
+  lightDirection?: Vector3 | [number, number, number];
 };
 
 export type DirlightUniforms = DirlightProps;
@@ -72,7 +72,7 @@ export const dirlight: ShaderModule<DirlightProps, DirlightUniforms> = {
     lightDirection: 'vec3<f32>'
   },
   defaultUniforms: {
-    lightDirection: new Float32Array([1, 1, 2])
+    lightDirection: [1, 1, 2]
   },
   getUniforms
 };

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

@@ -4,8 +4,9 @@
 
 /* eslint-disable camelcase */
 
-import type {NumberArray, Texture} from '@luma.gl/core';
+import type {Texture} from '@luma.gl/core';
 import type {Vector2, Vector3, Vector4} from '@math.gl/core';
+import type {NumberArray2, NumberArray3, NumberArray4} from '../../../lib/utils/uniform-types';
 
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
 import {lighting} from '../lights/lighting-uniforms';
@@ -18,15 +19,15 @@ export type PBRMaterialProps = PBRMaterialBindings & {
 
   // Base color map
   baseColorMapEnabled: boolean;
-  baseColorFactor: Readonly<Vector4 | NumberArray>;
+  baseColorFactor: Readonly<Vector4 | NumberArray4>;
 
   normalMapEnabled: boolean;
   normalScale: number; // #ifdef HAS_NORMALMAP
 
   emissiveMapEnabled: boolean;
-  emissiveFactor: Readonly<Vector3 | NumberArray>; // #ifdef HAS_EMISSIVEMAP
+  emissiveFactor: Readonly<Vector3 | NumberArray3>; // #ifdef HAS_EMISSIVEMAP
 
-  metallicRoughnessValues: Readonly<Vector2 | NumberArray>;
+  metallicRoughnessValues: Readonly<Vector2 | NumberArray2>;
   metallicRoughnessMapEnabled: boolean;
 
   occlusionMapEnabled: boolean;
@@ -37,12 +38,12 @@ export type PBRMaterialProps = PBRMaterialBindings & {
 
   // IBL
   IBLenabled: boolean;
-  scaleIBLAmbient: Readonly<Vector2 | NumberArray>; // #ifdef USE_IBL
+  scaleIBLAmbient: Readonly<Vector2 | NumberArray2>; // #ifdef USE_IBL
 
   // debugging flags used for shader output of intermediate PBR variables
   // #ifdef PBR_DEBUG
-  scaleDiffBaseMR: Readonly<Vector4 | NumberArray>;
-  scaleFGDSpec: Readonly<Vector4 | NumberArray>;
+  scaleDiffBaseMR: Readonly<Vector4 | NumberArray4>;
+  scaleFGDSpec: Readonly<Vector4 | NumberArray4>;
 };
 
 /** Non-uniform block bindings for pbr module */
@@ -65,15 +66,15 @@ export type PBRMaterialUniforms = {
 
   // Base color map
   baseColorMapEnabled: boolean;
-  baseColorFactor: Readonly<Vector4 | NumberArray>;
+  baseColorFactor: Readonly<Vector4 | NumberArray4>;
 
   normalMapEnabled: boolean;
   normalScale: number; // #ifdef HAS_NORMALMAP
 
   emissiveMapEnabled: boolean;
-  emissiveFactor: Readonly<Vector3 | NumberArray>; // #ifdef HAS_EMISSIVEMAP
+  emissiveFactor: Readonly<Vector3 | NumberArray3>; // #ifdef HAS_EMISSIVEMAP
 
-  metallicRoughnessValues: Readonly<Vector2 | NumberArray>;
+  metallicRoughnessValues: Readonly<Vector2 | NumberArray2>;
   metallicRoughnessMapEnabled: boolean;
 
   occlusionMapEnabled: boolean;
@@ -84,12 +85,12 @@ export type PBRMaterialUniforms = {
 
   // IBL
   IBLenabled: boolean;
-  scaleIBLAmbient: Readonly<Vector2 | NumberArray>; // #ifdef USE_IBL
+  scaleIBLAmbient: Readonly<Vector2 | NumberArray2>; // #ifdef USE_IBL
 
   // debugging flags used for shader output of intermediate PBR variables
   // #ifdef PBR_DEBUG
-  scaleDiffBaseMR: Readonly<Vector4 | NumberArray>;
-  scaleFGDSpec: Readonly<Vector4 | NumberArray>;
+  scaleDiffBaseMR: Readonly<Vector4 | NumberArray4>;
+  scaleFGDSpec: Readonly<Vector4 | NumberArray4>;
 };
 
 /**
@@ -143,16 +144,5 @@ export const pbrMaterial: ShaderModule<PBRMaterialProps, PBRMaterialUniforms> =
     scaleDiffBaseMR: 'vec4<f32>',
     scaleFGDSpec: 'vec4<f32>'
   },
-  bindings: {
-    baseColorSampler: {type: 'texture', location: 8}, // #ifdef HAS_BASECOLORMAP
-    normalSampler: {type: 'texture', location: 9}, // #ifdef HAS_NORMALMAP
-    emissiveSampler: {type: 'texture', location: 10}, // #ifdef HAS_EMISSIVEMAP
-    metallicRoughnessSampler: {type: 'texture', location: 11}, // #ifdef HAS_METALROUGHNESSMAP
-    occlusionSampler: {type: 'texture', location: 12}, // #ifdef HAS_OCCLUSIONMAP
-    // IBL Samplers
-    diffuseEnvSampler: {type: 'texture', location: 13}, // #ifdef USE_IBL (samplerCube)
-    specularEnvSampler: {type: 'texture', location: 14}, // #ifdef USE_IBL (samplerCube)
-    brdfLUT: {type: 'texture', location: 15} // #ifdef USE_IBL
-  },
   dependencies: [lighting]
 };

package/src/modules/postprocessing/image-blur-filters/tiltshift.ts

@@ -58,9 +58,9 @@ vec4 tiltShift_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
  */
 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/src/modules/postprocessing/image-blur-filters/triangleblur.ts

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

package/src/modules/postprocessing/image-blur-filters/zoomblur.ts

@@ -45,7 +45,7 @@ vec4 zoomBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
  */
 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/src/modules/postprocessing/image-fun-filters/colorhalftone.ts

@@ -51,7 +51,7 @@ vec4 colorHalftone_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
  */
 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/src/modules/postprocessing/image-fun-filters/dotscreen.ts

@@ -37,7 +37,7 @@ vec4 dotScreen_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
  */
 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/src/modules/postprocessing/image-fun-filters/hexagonalpixelate.ts

@@ -57,7 +57,7 @@ vec4 hexagonalPixelate_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord
  */
 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;
 };