@luma.gl/shadertools 9.1.0-alpha.16 → 9.1.0-alpha.18

package/dist/index.d.ts

@@ -33,10 +33,12 @@ export { picking } from "./modules/engine/picking/picking.js";
 export type { LightingProps, LightingUniforms } from "./modules/lighting/lights/lighting.js";
 export { lighting } from "./modules/lighting/lights/lighting.js";
 export { dirlight } from "./modules/lighting/no-material/dirlight.js";
-export type { PhongMaterialUniforms as GouraudMaterialUniforms } from "./modules/lighting/phong-material/phong-material.js";
+export type { GouraudMaterialProps } from "./modules/lighting/gouraud-material/gouraud-material.js";
 export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-material.js";
-export type { PhongMaterialUniforms } from "./modules/lighting/phong-material/phong-material.js";
+export type { PhongMaterialProps } from "./modules/lighting/phong-material/phong-material.js";
 export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
+export type { PBRMaterialBindings, PBRMaterialProps, PBRMaterialUniforms } from "./modules/lighting/pbr-material/pbr-material.js";
+export type { PBRProjectionProps } from "./modules/lighting/pbr-material/pbr-projection.js";
 export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
 export type { BrightnessContrastProps, BrightnessContrastUniforms } from "./passes/postprocessing/image-adjust-filters/brightnesscontrast.js";
 export { brightnessContrast } from "./passes/postprocessing/image-adjust-filters/brightnesscontrast.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -33,7 +33,6 @@ export { lighting } from "./modules/lighting/lights/lighting.js";
 export { dirlight } from "./modules/lighting/no-material/dirlight.js";
 export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-material.js";
 export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
-// export type {PBRMaterialSettings, PBRMaterialUniforms} from './modules/lighting/pbr-material/pbr';
 export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
 export { brightnessContrast } from "./passes/postprocessing/image-adjust-filters/brightnesscontrast.js";
 export { denoise } from "./passes/postprocessing/image-adjust-filters/denoise.js";

package/dist/lib/shader-module/shader-module.d.ts

@@ -1,23 +1,37 @@
-import type { NumericArray } from '@math.gl/types';
-import { Sampler, Texture } from '@luma.gl/core';
-import type { UniformFormat } from "../../types.js";
+import { UniformFormat } from "../../types.js";
 import { PropType, PropValidator } from "../filters/prop-types.js";
+import type { UniformTypes, UniformValue } from "../utils/uniform-types.js";
 import { ShaderInjection } from "../shader-assembly/shader-injections.js";
-export type BindingValue = Buffer | Texture | Sampler;
-export type UniformValue = number | boolean | Readonly<NumericArray>;
+type Binding = unknown;
 export type UniformInfo = {
     format?: UniformFormat;
 } & PropType;
+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 Needs to be initialized with `initializeShaderModules`
+ * @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, BindingValue> = Record<string, BindingValue>> = {
+export type ShaderModule<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?: 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;
     /** WGSL code */
     source?: string;
@@ -26,18 +40,13 @@ export type ShaderModule<PropsT extends Record<string, unknown> = Record<string,
     /** GLSL vertex shader code */
     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>>;
     /** Uniform JS prop types  */
     propTypes?: Record<keyof UniformsT, UniformInfo>;
     /** Default uniform values */
     defaultUniforms?: Required<UniformsT>;
     /** Function that maps props to uniforms & bindings */
-    getUniforms?: (props?: any, oldProps?: any) => Record<string, BindingValue | 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 */
     inject?: Record<string, string | {
@@ -68,6 +77,7 @@ export type ShaderModuleDeprecation = {
 export declare function initializeShaderModules(modules: ShaderModule[]): void;
 export declare function initializeShaderModule(module: ShaderModule): void;
 /** Convert module props to uniforms */
-export declare function getShaderModuleUniforms<ShaderModuleT extends ShaderModule<Record<string, unknown>, Record<string, UniformValue>>>(module: ShaderModuleT, props?: ShaderModuleT['props'], oldUniforms?: ShaderModuleT['uniforms']): Record<string, BindingValue | UniformValue>;
+export declare function getShaderModuleUniforms<ShaderModuleT extends ShaderModule<Record<string, unknown>, Record<string, UniformValue>>>(module: ShaderModuleT, props?: ShaderModuleT['props'], oldUniforms?: ShaderModuleT['uniforms']): Record<string, Binding | UniformValue>;
 export declare function checkShaderModuleDeprecations(shaderModule: ShaderModule, shaderSource: string, log: any): void;
+export {};
 //# sourceMappingURL=shader-module.d.ts.map

package/dist/lib/shader-module/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-module/shader-module.js

@@ -23,24 +23,20 @@ export function initializeShaderModule(module) {
         instance.propValidators = makePropValidators(propTypes);
     }
     module.instance = instance;
-    /* TODO(ib) - we need to apply the original prop types to the default uniforms
+    // TODO(ib) - we need to apply the original prop types to the default uniforms
+    let defaultProps = {};
     if (propTypes) {
-      const defaultProps = Object.entries(propTypes).reduce(
-        (obj: ShaderModule['props'], [key, propType]) => {
-          // @ts-expect-error
-          const value = propType?.value;
-          if (value) {
+        defaultProps = Object.entries(propTypes).reduce((obj, [key, propType]) => {
             // @ts-expect-error
-            obj[key] = value;
-          }
-          return obj;
-        },
-        {} as ShaderModule['props']
-      );
-      const defaultUniforms = getShaderModuleUniforms(module, defaultProps);
-      module.defaultUniforms = {...module.defaultUniforms, ...defaultUniforms} as any;
+            const value = propType?.value;
+            if (value) {
+                // @ts-expect-error
+                obj[key] = value;
+            }
+            return obj;
+        }, {});
     }
-    */
+    module.defaultUniforms = { ...module.defaultUniforms, ...defaultProps };
 }
 /** Convert module props to uniforms */
 export function getShaderModuleUniforms(module, props, oldUniforms) {

package/dist/lib/shader-module/shader-pass.d.ts

@@ -1,10 +1,12 @@
-import type { ShaderModule, UniformValue } from "./shader-module.js";
+import type { Binding } from '@luma.gl/core';
+import type { PickBindings, PickUniforms, ShaderModule } from "./shader-module.js";
+import type { UniformValue } from "../utils/uniform-types.js";
 /**
  * A ShaderPass is a ShaderModule that can be run "standalone" (e.g. post processing effects)
  * It adds additional information on how to run the module.
  * A ShaderPass can require one or more sub passes.
  */
-export type ShaderPass<PropsT extends Record<string, unknown> = Record<string, unknown>, UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>> = ShaderModule<PropsT, UniformsT> & {
+export type ShaderPass<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> & {
     /** A shader pass can run multiple sub passes */
     passes?: ShaderSubPass<UniformsT>[];
 };

package/dist/lib/shader-module/shader-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-pass.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-pass.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,2BAAwB;AAEhE;;;;GAIG;AACH,MAAM,MAAM,UAAU,CACpB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAC3E,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG;IACpC,gDAAgD;IAChD,MAAM,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;CAGrC,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,aAAa,CACvB,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAC3E;IACF;;;;OAIG;IACH,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC"}
+{"version":3,"file":"shader-pass.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-pass.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAC,2BAAwB;AAC9E,OAAO,KAAK,EAAC,YAAY,EAAC,kCAA+B;AAEzD;;;;GAIG;AACH,MAAM,MAAM,UAAU,CACpB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACxD,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,EACrE,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,IAC9D,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,GAAG;IAC/C,gDAAgD;IAChD,MAAM,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;CAGrC,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,aAAa,CACvB,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAC3E;IACF;;;;OAIG;IACH,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC"}

package/dist/lib/utils/uniform-types.d.ts

@@ -0,0 +1,11 @@
+import type { Matrix3, Matrix4, Vector2, Vector3, Vector4, NumberArray2, NumberArray3, NumberArray4, NumberArray6, NumberArray8, NumberArray9, NumberArray12, NumberArray16 } from '@math.gl/core';
+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]>;
+};
+export {};
+//# sourceMappingURL=uniform-types.d.ts.map

package/dist/lib/utils/uniform-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uniform-types.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/uniform-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACd,MAAM,eAAe,CAAC;AAOvB,MAAM,MAAM,YAAY,GAAG,QAAQ,CAC/B,MAAM,GACN,OAAO,GACP,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,aAAa,GACb,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,CACV,CAAC;AAEF,KAAK,WAAW,CAAC,MAAM,SAAS,YAAY,IAAI,MAAM,SAAS,MAAM,GAAG,OAAO,GAC3E,KAAK,GAAG,KAAK,GAAG,KAAK,GACrB,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GACvC,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GACvC,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,aAAa,GACvD,MAAM,SAAS,QAAQ,CAAC,YAAY,CAAC,GACnC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,YAAY,CAAC,GACnC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,aAAa,GACb,MAAM,SAAS,QAAQ,CAAC,aAAa,CAAC,GACpC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,aAAa,GAAG,OAAO,CAAC,GAC9C,aAAa,GACb,KAAK,CAAC;AAE1B,KAAK,YAAY,GAAG;IAClB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,YAAY,IAAI;KACrD,IAAI,IAAI,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC"}

package/dist/lib/utils/uniform-types.js

@@ -0,0 +1 @@
+export {};

package/dist/modules/engine/picking/picking.d.ts

@@ -1,4 +1,4 @@
-import { NumericArray } from "../../../types.js";
+import type { NumberArray3, NumberArray4 } from '@math.gl/core';
 /**
  * Props for the picking module, which depending on mode renders picking colors or highlighted item.
  * When active, renders picking colors, assumed to be rendered to off-screen "picking" buffer.
@@ -10,9 +10,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?: NumericArray | null;
+    highlightedObjectColor?: NumberArray3 | null;
     /** Color of visual highlight of "selected" item */
-    highlightColor?: NumericArray;
+    highlightColor?: NumberArray3 | NumberArray4;
     /** Color range 0-1 or 0-255 */
     useFloatColors?: boolean;
 };
@@ -34,9 +34,9 @@ export type PickingUniforms = {
     /** Do we have a highlighted item? */
     isHighlightActive?: boolean;
     /** Set to a picking color to visually highlight that item */
-    highlightedObjectColor?: NumericArray;
+    highlightedObjectColor?: NumberArray3;
     /** Color of visual highlight of "selected" item */
-    highlightColor?: NumericArray;
+    highlightColor?: NumberArray4;
 };
 /**
  * Provides support for color-coding-based picking and highlighting.
@@ -62,8 +62,8 @@ export declare const picking: {
         readonly isAttribute: false;
         readonly isHighlightActive: false;
         readonly useFloatColors: true;
-        readonly highlightedObjectColor: Float32Array;
-        readonly highlightColor: Float32Array;
+        readonly highlightedObjectColor: [0, 0, 0];
+        readonly highlightColor: NumberArray4;
     };
     readonly vs: "uniform pickingUniforms {\n  float isActive;\n  float isAttribute;\n  float isHighlightActive;\n  float useFloatColors;\n  vec3 highlightedObjectColor;\n  vec4 highlightColor;\n} picking;\n\nout vec4 picking_vRGBcolor_Avalid;\n\n// Normalize unsigned byte color to 0-1 range\nvec3 picking_normalizeColor(vec3 color) {\n  return picking.useFloatColors > 0.5 ? color : color / 255.0;\n}\n\n// Normalize unsigned byte color to 0-1 range\nvec4 picking_normalizeColor(vec4 color) {\n  return picking.useFloatColors > 0.5 ? color : color / 255.0;\n}\n\nbool picking_isColorZero(vec3 color) {\n  return dot(color, vec3(1.0)) < 0.00001;\n}\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.00001;\n}\n\n// Check if this vertex is highlighted \nbool isVertexHighlighted(vec3 vertexColor) {\n  vec3 highlightedObjectColor = picking_normalizeColor(picking.highlightedObjectColor);\n  return\n    bool(picking.isHighlightActive) && picking_isColorZero(abs(vertexColor - highlightedObjectColor));\n}\n\n// Set the current picking color\nvoid picking_setPickingColor(vec3 pickingColor) {\n  pickingColor = picking_normalizeColor(pickingColor);\n\n  if (bool(picking.isActive)) {\n    // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable\n    picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));\n\n    if (!bool(picking.isAttribute)) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor;\n    }\n  } else {\n    // Do the comparison with selected item color in vertex shader as it should mean fewer compares\n    picking_vRGBcolor_Avalid.a = float(isVertexHighlighted(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\n\nvoid picking_setPickingAttribute(vec2 value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\n\nvoid picking_setPickingAttribute(vec3 value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n";
     readonly fs: "uniform pickingUniforms {\n  float isActive;\n  float isAttribute;\n  float isHighlightActive;\n  float useFloatColors;\n  vec3 highlightedObjectColor;\n  vec4 highlightColor;\n} picking;\n\nin vec4 picking_vRGBcolor_Avalid;\n\n/*\n * Returns highlight color if this item is selected.\n */\nvec4 picking_filterHighlightColor(vec4 color) {\n  // If we are still picking, we don't highlight\n  if (picking.isActive > 0.5) {\n    return color;\n  }\n\n  bool selected = bool(picking_vRGBcolor_Avalid.a);\n\n  if (selected) {\n    // Blend in highlight color based on its alpha value\n    float highLightAlpha = picking.highlightColor.a;\n    float blendedAlpha = highLightAlpha + color.a * (1.0 - highLightAlpha);\n    float highLightRatio = highLightAlpha / blendedAlpha;\n\n    vec3 blendedRGB = mix(color.rgb, picking.highlightColor.rgb, highLightRatio);\n    return vec4(blendedRGB, blendedAlpha);\n  } else {\n    return color;\n  }\n}\n\n/*\n * Returns picking color if picking enabled else unmodified argument.\n */\nvec4 picking_filterPickingColor(vec4 color) {\n  if (bool(picking.isActive)) {\n    if (picking_vRGBcolor_Avalid.a == 0.0) {\n      discard;\n    }\n    return picking_vRGBcolor_Avalid;\n  }\n  return color;\n}\n\n/*\n * Returns picking color if picking is enabled if not\n * highlight color if this item is selected, otherwise unmodified argument.\n */\nvec4 picking_filterColor(vec4 color) {\n  vec4 highlightColor = picking_filterHighlightColor(color);\n  return picking_filterPickingColor(highlightColor);\n}\n";

package/dist/modules/engine/picking/picking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"picking.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/picking/picking.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,0BAAuB;AAM5C;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6FAA6F;IAC7F,sBAAsB,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7C,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,CAAC;IAC9B,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,6DAA6D;IAC7D,sBAAsB,CAAC,EAAE,YAAY,CAAC;IACtC,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAC;AAuIF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;oBACL,YAAY;uBACT,eAAe;;;;;;;;;;;;;;;;;;;;;CAwB+B,CAAC;AAEjE,iBAAS,WAAW,CAAC,IAAI,GAAE,YAAiB,EAAE,YAAY,CAAC,EAAE,eAAe,GAAG,eAAe,CA+B7F"}
+{"version":3,"file":"picking.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/picking/picking.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAK9D;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6FAA6F;IAC7F,sBAAsB,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7C,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC;IAC7C,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,6DAA6D;IAC7D,sBAAsB,CAAC,EAAE,YAAY,CAAC;IACtC,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAC;AAuIF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;oBACL,YAAY;uBACT,eAAe;;;;;;;;;;;;;;;;;;;;;CAwB+B,CAAC;AAEjE,iBAAS,WAAW,CAAC,IAAI,GAAE,YAAiB,EAAE,YAAY,CAAC,EAAE,eAAe,GAAG,eAAe,CA+B7F"}

package/dist/modules/engine/picking/picking.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 // cyan color
-const DEFAULT_HIGHLIGHT_COLOR = new Float32Array([0, 1, 1, 1]);
+const DEFAULT_HIGHLIGHT_COLOR = [0, 1, 1, 1];
 const vs = /* glsl */ `\
 uniform pickingUniforms {
   float isActive;
@@ -158,7 +158,7 @@ export const picking = {
         isAttribute: false,
         isHighlightActive: false,
         useFloatColors: true,
-        highlightedObjectColor: new Float32Array([0, 0, 0]),
+        highlightedObjectColor: [0, 0, 0],
         highlightColor: DEFAULT_HIGHLIGHT_COLOR
     },
     vs,

package/dist/modules/engine/project/project.d.ts

@@ -1,22 +1,23 @@
-import { NumericArray as NumberArray, Matrix4, Vector3 } from '@math.gl/core';
+import { Matrix4, Vector3 } from '@math.gl/core';
+import type { NumberArray3, NumberArray16 } from '@math.gl/core';
 /**
  * @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>;
 };
 /**
  * @note Projection uniforms are normally constant across draw calls,
  * 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>;
 };
 declare function getUniforms(opts?: ProjectionProps, prevUniforms?: ProjectionUniforms): ProjectionUniforms;
 /**

package/dist/modules/engine/project/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/project/project.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,IAAI,WAAW,EAAE,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAK5E;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;IACnD,mBAAmB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;CACvD,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;IACnD,oBAAoB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;IACvD,mBAAmB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;CACvD,CAAC;AASF,iBAAS,WAAW,CAClB,IAAI,GAAE,eAAwC,EAC9C,YAAY,GAAE,kBAAuB,GACpC,kBAAkB,CAuBpB;AAmFD;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;CAY+C,CAAC"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/project/project.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAE/C,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAI/D;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,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;AAEF;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC;IAC/C,gBAAgB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC;IACrD,oBAAoB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC;IACzD,mBAAmB,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;CACxD,CAAC;AASF,iBAAS,WAAW,CAClB,IAAI,GAAE,eAAwC,EAC9C,YAAY,GAAE,kBAAuB,GACpC,kBAAkB,CAuBpB;AAmFD;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;CAY+C,CAAC"}

package/dist/modules/lighting/gouraud-material/gouraud-material.d.ts

@@ -1,5 +1,5 @@
-export type GouraudMaterialProps = GouraudMaterialUniforms;
-export type GouraudMaterialUniforms = {
+import { ShaderModule } from "../../../lib/shader-module/shader-module.js";
+export type GouraudMaterialProps = {
     ambient?: number;
     diffuse?: number;
     /** Specularity exponent */
@@ -7,59 +7,5 @@ export type GouraudMaterialUniforms = {
     specularColor?: [number, number, number];
 };
 /** In Gouraud shading, color is calculated for each triangle vertex normal, and then color is interpolated colors across the triangle */
-export declare const gouraudMaterial: {
-    readonly props: GouraudMaterialProps;
-    readonly uniforms: GouraudMaterialUniforms;
-    readonly name: "gouraud-lighting";
-    readonly vs: "uniform materialUniforms {\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n";
-    readonly fs: "uniform materialUniforms {\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {\n  vec3 halfway_direction = normalize(light_direction + view_direction);\n  float lambertian = dot(light_direction, normal_worldspace);\n  float specular = 0.0;\n  if (lambertian > 0.0) {\n    float specular_angle = max(dot(normal_worldspace, halfway_direction), 0.0);\n    specular = pow(specular_angle, material.shininess);\n  }\n  lambertian = max(lambertian, 0.0);\n  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;\n}\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n  vec3 lightColor = surfaceColor;\n\n  if (lighting.enabled) {\n    vec3 view_direction = normalize(cameraPosition - position_worldspace);\n    lightColor = material.ambient * surfaceColor * lighting.ambientColor;\n\n    if (lighting.lightType == 0) {\n      PointLight pointLight = lighting_getPointLight(0);\n      vec3 light_position_worldspace = pointLight.position;\n      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);\n    } else if (lighting.lightType == 1) {\n      DirectionalLight directionalLight = lighting_getDirectionalLight(0);\n      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n    }\n    /*\n    for (int i = 0; i < MAX_LIGHTS; i++) {\n      if (i >= lighting.pointLightCount) {\n        break;\n      }\n      PointLight pointLight = lighting.pointLight[i];\n      vec3 light_position_worldspace = pointLight.position;\n      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);\n    }\n\n    for (int i = 0; i < MAX_LIGHTS; i++) {\n      if (i >= lighting.directionalLightCount) {\n        break;\n      }\n      DirectionalLight directionalLight = lighting.directionalLight[i];\n      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n    }\n    */\n  }\n  return lightColor;\n}\n\nvec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n  vec3 lightColor = vec3(0, 0, 0);\n  vec3 surfaceColor = vec3(0, 0, 0);\n\n  if (lighting.enabled) {\n    vec3 view_direction = normalize(cameraPosition - position_worldspace);\n\n    switch (lighting.lightType) {\n      case 0:\n        PointLight pointLight = lighting_getPointLight(0);\n        vec3 light_position_worldspace = pointLight.position;\n        vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n        lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);\n        break;\n\n      case 1:\n        DirectionalLight directionalLight = lighting_getDirectionalLight(0);\n        lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n        break;\n    }\n  }\n  return lightColor;\n}\n";
-    readonly defines: {
-        readonly LIGHTING_VERTEX: 1;
-    };
-    readonly dependencies: [{
-        readonly props: import("../lights/lighting").LightingProps;
-        readonly uniforms: import("../lights/lighting").LightingUniforms;
-        readonly name: "lighting";
-        readonly defines: {
-            readonly MAX_LIGHTS: 5;
-        };
-        readonly uniformTypes: {
-            readonly enabled: "i32";
-            readonly ambientLightColor: "vec3<f32>";
-            readonly numberOfLights: "i32";
-            readonly lightType: "i32";
-            readonly lightColor: "vec3<f32>";
-            readonly lightPosition: "vec3<f32>";
-            readonly lightDirection: "vec3<f32>";
-            readonly lightAttenuation: "vec3<f32>";
-        };
-        readonly defaultUniforms: {
-            readonly enabled: 1;
-            readonly ambientLightColor: readonly [0.1, 0.1, 0.1];
-            readonly numberOfLights: 0;
-            readonly lightType: import("../lights/lighting").LIGHT_TYPE.POINT;
-            readonly lightColor: readonly [1, 1, 1];
-            readonly lightPosition: readonly [1, 1, 2];
-            readonly lightDirection: readonly [1, 1, 1];
-            readonly lightAttenuation: readonly [1, 1, 1];
-        };
-        readonly source: "// #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))\nstruct AmbientLight {\n  color: vec3<f32>,\n};\n\nstruct PointLight {\n  color: vec3<f32>,\n  position: vec3<f32>,\n  attenuation: vec3<f32>, // 2nd order x:Constant-y:Linear-z:Exponential\n};\n\nstruct DirectionalLight {\n  color: vec3<f32>,\n  direction: vec3<f32>,\n};\n\nstruct lightingUniforms {\n  enabled: i32,\n  poightCount: i32,\n  directionalLightCount: i32,\n\n  ambientColor: vec3<f32>,\n\n  // TODO - support multiple lights by uncommenting arrays below\n  lightType: i32,\n  lightColor: vec3<f32>,\n  lightDirection: vec3<f32>,\n  lightPosition: vec3<f32>,\n  lightAttenuation: vec3<f32>,\n\n  // AmbientLight ambientLight;\n  // PointLight pointLight[MAX_LIGHTS];\n  // DirectionalLight directionalLight[MAX_LIGHTS];\n};\n\n// Binding 0:1 is reserved for lighting (Note: could go into separate bind group as it is stable across draw calls)\n@binding(1) @group(0) var<uniform> lighting : lightingUniforms;\n\nfn lighting_getPointLight(index: i32) -> PointLight {\n  return PointLight(lighting.lightColor, lighting.lightPosition, lighting.lightAttenuation);\n}\n\nfn lighting_getDirectionalLight(index: i32) -> DirectionalLight {\n  return DirectionalLight(lighting.lightColor, lighting.lightDirection);\n} \n\nfn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {\n  return pointLight.attenuation.x\n       + pointLight.attenuation.y * distance\n       + pointLight.attenuation.z * distance * distance;\n}\n";
-        readonly vs: "precision highp int;\n\n// #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))\nstruct AmbientLight {\n  vec3 color;\n};\n\nstruct PointLight {\n  vec3 color;\n  vec3 position;\n  vec3 attenuation; // 2nd order x:Constant-y:Linear-z:Exponential\n};\n\nstruct DirectionalLight {\n  vec3 color;\n  vec3 direction;\n};\n\nuniform lightingUniforms {\n  int enabled;\n  int pointLightCount;\n  int directionalLightCount;\n\n  vec3 ambientColor;\n\n  int lightType;\n  vec3 lightColor;\n  vec3 lightDirection;\n  vec3 lightPosition;\n  vec3 lightAttenuation;\n\n  // AmbientLight ambientLight;\n  // PointLight pointLight[MAX_LIGHTS];\n  // DirectionalLight directionalLight[MAX_LIGHTS];\n} lighting;\n\nPointLight lighting_getPointLight(int index) {\n  return PointLight(lighting.lightColor, lighting.lightPosition, lighting.lightAttenuation);\n}\n\nDirectionalLight lighting_getDirectionalLight(int index) {\n  return DirectionalLight(lighting.lightColor, lighting.lightDirection);\n} \n\nfloat getPointLightAttenuation(PointLight pointLight, float distance) {\n  return pointLight.attenuation.x\n       + pointLight.attenuation.y * distance\n       + pointLight.attenuation.z * distance * distance;\n}\n\n// #endif\n";
-        readonly fs: "precision highp int;\n\n// #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))\nstruct AmbientLight {\n  vec3 color;\n};\n\nstruct PointLight {\n  vec3 color;\n  vec3 position;\n  vec3 attenuation; // 2nd order x:Constant-y:Linear-z:Exponential\n};\n\nstruct DirectionalLight {\n  vec3 color;\n  vec3 direction;\n};\n\nuniform lightingUniforms {\n  int enabled;\n  int pointLightCount;\n  int directionalLightCount;\n\n  vec3 ambientColor;\n\n  int lightType;\n  vec3 lightColor;\n  vec3 lightDirection;\n  vec3 lightPosition;\n  vec3 lightAttenuation;\n\n  // AmbientLight ambientLight;\n  // PointLight pointLight[MAX_LIGHTS];\n  // DirectionalLight directionalLight[MAX_LIGHTS];\n} lighting;\n\nPointLight lighting_getPointLight(int index) {\n  return PointLight(lighting.lightColor, lighting.lightPosition, lighting.lightAttenuation);\n}\n\nDirectionalLight lighting_getDirectionalLight(int index) {\n  return DirectionalLight(lighting.lightColor, lighting.lightDirection);\n} \n\nfloat getPointLightAttenuation(PointLight pointLight, float distance) {\n  return pointLight.attenuation.x\n       + pointLight.attenuation.y * distance\n       + pointLight.attenuation.z * distance * distance;\n}\n\n// #endif\n";
-        readonly getUniforms: (props?: import("../lights/lighting").LightingProps, prevUniforms?: Partial<import("../lights/lighting").LightingUniforms>) => import("../lights/lighting").LightingUniforms;
-    }];
-    readonly uniformTypes: {
-        readonly ambient: "f32";
-        readonly diffuse: "f32";
-        readonly shininess: "f32";
-        readonly specularColor: "vec3<f32>";
-    };
-    readonly defaultUniforms: {
-        readonly ambient: 0.35;
-        readonly diffuse: 0.6;
-        readonly shininess: 32;
-        readonly specularColor: [0.15, 0.15, 0.15];
-    };
-    readonly getUniforms: (props: GouraudMaterialProps) => GouraudMaterialUniforms;
-};
+export declare const gouraudMaterial: ShaderModule<GouraudMaterialProps>;
 //# sourceMappingURL=gouraud-material.d.ts.map

package/dist/modules/lighting/gouraud-material/gouraud-material.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gouraud-material.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/gouraud-material/gouraud-material.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AAE3D,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,CAAC;AAEF,yIAAyI;AACzI,eAAO,MAAM,eAAe;oBACb,oBAAoB;uBACjB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kCAuBpB,oBAAoB,KAAG,uBAAuB;CAGa,CAAC"}
+{"version":3,"file":"gouraud-material.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/gouraud-material/gouraud-material.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAItE,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,CAAC;AAEF,yIAAyI;AACzI,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,oBAAoB,CA+B9D,CAAC"}

package/dist/modules/lighting/gouraud-material/gouraud-material.js

@@ -2,15 +2,14 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { lighting } from "../lights/lighting.js";
-import { GOURAUD_VS, GOURAUD_FS } from "./gouraud-shaders-glsl.js";
+import { PHONG_VS, PHONG_FS } from "../phong-material/phong-shaders-glsl.js";
 /** In Gouraud shading, color is calculated for each triangle vertex normal, and then color is interpolated colors across the triangle */
 export const gouraudMaterial = {
     props: {},
-    uniforms: {},
-    name: 'gouraud-lighting',
+    name: 'gouraudMaterial',
     // Note these are switched between phong and gouraud
-    vs: GOURAUD_VS,
-    fs: GOURAUD_FS,
+    vs: PHONG_FS.replace('phongMaterial', 'gouraudMaterial'),
+    fs: PHONG_VS.replace('phongMaterial', 'gouraudMaterial'),
     defines: {
         LIGHTING_VERTEX: 1
     },
@@ -28,6 +27,10 @@ export const gouraudMaterial = {
         specularColor: [0.15, 0.15, 0.15]
     },
     getUniforms(props) {
-        return { ...gouraudMaterial.defaultUniforms, ...props };
+        const uniforms = { ...props };
+        if (uniforms.specularColor) {
+            uniforms.specularColor = uniforms.specularColor.map(x => x / 255);
+        }
+        return { ...gouraudMaterial.defaultUniforms, ...uniforms };
     }
 };

package/dist/modules/lighting/lights/lighting-uniforms-glsl.d.ts

@@ -1,2 +1,2 @@
-export declare const lightingUniformsGLSL = "precision highp int;\n\n// #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))\nstruct AmbientLight {\n  vec3 color;\n};\n\nstruct PointLight {\n  vec3 color;\n  vec3 position;\n  vec3 attenuation; // 2nd order x:Constant-y:Linear-z:Exponential\n};\n\nstruct DirectionalLight {\n  vec3 color;\n  vec3 direction;\n};\n\nuniform lightingUniforms {\n  int enabled;\n  int pointLightCount;\n  int directionalLightCount;\n\n  vec3 ambientColor;\n\n  int lightType;\n  vec3 lightColor;\n  vec3 lightDirection;\n  vec3 lightPosition;\n  vec3 lightAttenuation;\n\n  // AmbientLight ambientLight;\n  // PointLight pointLight[MAX_LIGHTS];\n  // DirectionalLight directionalLight[MAX_LIGHTS];\n} lighting;\n\nPointLight lighting_getPointLight(int index) {\n  return PointLight(lighting.lightColor, lighting.lightPosition, lighting.lightAttenuation);\n}\n\nDirectionalLight lighting_getDirectionalLight(int index) {\n  return DirectionalLight(lighting.lightColor, lighting.lightDirection);\n} \n\nfloat getPointLightAttenuation(PointLight pointLight, float distance) {\n  return pointLight.attenuation.x\n       + pointLight.attenuation.y * distance\n       + pointLight.attenuation.z * distance * distance;\n}\n\n// #endif\n";
+export declare const lightingUniformsGLSL = "precision highp int;\n\n// #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))\nstruct AmbientLight {\n  vec3 color;\n};\n\nstruct PointLight {\n  vec3 color;\n  vec3 position;\n  vec3 attenuation; // 2nd order x:Constant-y:Linear-z:Exponential\n};\n\nstruct DirectionalLight {\n  vec3 color;\n  vec3 direction;\n};\n\nuniform lightingUniforms {\n  int enabled;\n  int lightType;\n\n  int directionalLightCount;\n  int pointLightCount;\n\n  vec3 ambientColor;\n\n  vec3 lightColor0;\n  vec3 lightPosition0;\n  vec3 lightDirection0;\n  vec3 lightAttenuation0;\n\n  vec3 lightColor1;\n  vec3 lightPosition1;\n  vec3 lightDirection1;\n  vec3 lightAttenuation1;\n\n  vec3 lightColor2;\n  vec3 lightPosition2;\n  vec3 lightDirection2;\n  vec3 lightAttenuation2;\n} lighting;\n\nPointLight lighting_getPointLight(int index) {\n  switch (index) {\n    case 0:\n      return PointLight(lighting.lightColor0, lighting.lightPosition0, lighting.lightAttenuation0);\n    case 1:\n      return PointLight(lighting.lightColor1, lighting.lightPosition1, lighting.lightAttenuation1);\n    case 2:\n    default:  \n      return PointLight(lighting.lightColor2, lighting.lightPosition2, lighting.lightAttenuation2);\n  }\n}\n\nDirectionalLight lighting_getDirectionalLight(int index) {\n  switch (index) {\n    case 0:\n      return DirectionalLight(lighting.lightColor0, lighting.lightDirection0);\n    case 1:\n      return DirectionalLight(lighting.lightColor1, lighting.lightDirection1);\n    case 2:\n    default:   \n      return DirectionalLight(lighting.lightColor2, lighting.lightDirection2);\n  }\n} \n\nfloat getPointLightAttenuation(PointLight pointLight, float distance) {\n  return pointLight.attenuation.x\n       + pointLight.attenuation.y * distance\n       + pointLight.attenuation.z * distance * distance;\n}\n\n// #endif\n";
 //# sourceMappingURL=lighting-uniforms-glsl.d.ts.map

package/dist/modules/lighting/lights/lighting-uniforms-glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lighting-uniforms-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms-glsl.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,6wCAoDhC,CAAC"}
+{"version":3,"file":"lighting-uniforms-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms-glsl.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,g3DA2EhC,CAAC"}

package/dist/modules/lighting/lights/lighting-uniforms-glsl.js

@@ -22,28 +22,51 @@ struct DirectionalLight {
 
 uniform lightingUniforms {
   int enabled;
-  int pointLightCount;
+  int lightType;
+
   int directionalLightCount;
+  int pointLightCount;
 
   vec3 ambientColor;
 
-  int lightType;
-  vec3 lightColor;
-  vec3 lightDirection;
-  vec3 lightPosition;
-  vec3 lightAttenuation;
-
-  // AmbientLight ambientLight;
-  // PointLight pointLight[MAX_LIGHTS];
-  // DirectionalLight directionalLight[MAX_LIGHTS];
+  vec3 lightColor0;
+  vec3 lightPosition0;
+  vec3 lightDirection0;
+  vec3 lightAttenuation0;
+
+  vec3 lightColor1;
+  vec3 lightPosition1;
+  vec3 lightDirection1;
+  vec3 lightAttenuation1;
+
+  vec3 lightColor2;
+  vec3 lightPosition2;
+  vec3 lightDirection2;
+  vec3 lightAttenuation2;
 } lighting;
 
 PointLight lighting_getPointLight(int index) {
-  return PointLight(lighting.lightColor, lighting.lightPosition, lighting.lightAttenuation);
+  switch (index) {
+    case 0:
+      return PointLight(lighting.lightColor0, lighting.lightPosition0, lighting.lightAttenuation0);
+    case 1:
+      return PointLight(lighting.lightColor1, lighting.lightPosition1, lighting.lightAttenuation1);
+    case 2:
+    default:  
+      return PointLight(lighting.lightColor2, lighting.lightPosition2, lighting.lightAttenuation2);
+  }
 }
 
 DirectionalLight lighting_getDirectionalLight(int index) {
-  return DirectionalLight(lighting.lightColor, lighting.lightDirection);
+  switch (index) {
+    case 0:
+      return DirectionalLight(lighting.lightColor0, lighting.lightDirection0);
+    case 1:
+      return DirectionalLight(lighting.lightColor1, lighting.lightDirection1);
+    case 2:
+    default:   
+      return DirectionalLight(lighting.lightColor2, lighting.lightDirection2);
+  }
 } 
 
 float getPointLightAttenuation(PointLight pointLight, float distance) {