@luma.gl/shadertools 9.2.6 → 9.3.0-alpha.10

package/dist/modules/lighting/lights/lighting-wgsl.js

@@ -3,6 +3,8 @@
 // Copyright (c) vis.gl contributors
 export const lightingUniformsWGSL = /* wgsl */ `\
 // #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))
+const MAX_LIGHTS: i32 = 5;
+
 struct AmbientLight {
   color: vec3<f32>,
 };
@@ -13,45 +15,71 @@ struct PointLight {
   attenuation: vec3<f32>, // 2nd order x:Constant-y:Linear-z:Exponential
 };
 
+struct SpotLight {
+  color: vec3<f32>,
+  position: vec3<f32>,
+  direction: vec3<f32>,
+  attenuation: vec3<f32>,
+  coneCos: vec2<f32>,
+};
+
 struct DirectionalLight {
   color: vec3<f32>,
   direction: vec3<f32>,
 };
 
+struct UniformLight {
+  color: vec3<f32>,
+  position: vec3<f32>,
+  direction: vec3<f32>,
+  attenuation: vec3<f32>,
+  coneCos: vec2<f32>,
+};
+
 struct lightingUniforms {
   enabled: i32,
-  pointLightCount: i32,
   directionalLightCount: i32,
-
+  pointLightCount: i32,
+  spotLightCount: i32,
   ambientColor: vec3<f32>,
-
-  // TODO - support multiple lights by uncommenting arrays below
-  lightType: i32,
-  lightColor: vec3<f32>,
-  lightDirection: vec3<f32>,
-  lightPosition: vec3<f32>,
-  lightAttenuation: vec3<f32>,
-
-  // AmbientLight ambientLight;
-  // PointLight pointLight[MAX_LIGHTS];
-  // DirectionalLight directionalLight[MAX_LIGHTS];
+  lights: array<UniformLight, 5>,
 };
 
-// Binding 0:1 is reserved for lighting (Note: could go into separate bind group as it is stable across draw calls)
-@binding(1) @group(0) var<uniform> lighting : lightingUniforms;
+@group(2) @binding(auto) var<uniform> lighting : lightingUniforms;
 
 fn lighting_getPointLight(index: i32) -> PointLight {
-  return PointLight(lighting.lightColor, lighting.lightPosition, lighting.lightAttenuation);
+  let light = lighting.lights[index];
+  return PointLight(light.color, light.position, light.attenuation);
+}
+
+fn lighting_getSpotLight(index: i32) -> SpotLight {
+  let light = lighting.lights[lighting.pointLightCount + index];
+  return SpotLight(light.color, light.position, light.direction, light.attenuation, light.coneCos);
 }
 
 fn lighting_getDirectionalLight(index: i32) -> DirectionalLight {
-  return DirectionalLight(lighting.lightColor, lighting.lightDirection);
-} 
+  let light = lighting.lights[lighting.pointLightCount + lighting.spotLightCount + index];
+  return DirectionalLight(light.color, light.direction);
+}
 
 fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
   return pointLight.attenuation.x
        + pointLight.attenuation.y * distance
        + pointLight.attenuation.z * distance * distance;
 }
+
+fn getSpotLightAttenuation(spotLight: SpotLight, positionWorldspace: vec3<f32>) -> f32 {
+  let lightDirection = normalize(positionWorldspace - spotLight.position);
+  let coneFactor = smoothstep(
+    spotLight.coneCos.y,
+    spotLight.coneCos.x,
+    dot(normalize(spotLight.direction), lightDirection)
+  );
+  let distanceAttenuation = getPointLightAttenuation(
+    PointLight(spotLight.color, spotLight.position, spotLight.attenuation),
+    distance(spotLight.position, positionWorldspace)
+  );
+  return distanceAttenuation / max(coneFactor, 0.0001);
+}
 `;
 //# sourceMappingURL=lighting-wgsl.js.map

package/dist/modules/lighting/lights/lighting-wgsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"lighting-wgsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-wgsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoD9C,CAAC"}
+{"version":3,"file":"lighting-wgsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-wgsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgF9C,CAAC"}

package/dist/modules/lighting/lights/lighting.d.ts

@@ -1,59 +1,119 @@
-import type { NumberArray3 } from '@math.gl/core';
-/** Shader type field for lights */
-export declare enum LIGHT_TYPE {
-    POINT = 0,
-    DIRECTIONAL = 1
-}
-/** Lighting helper types */
-export type Light = AmbientLight | PointLight | DirectionalLight;
+import type { NumberArray2, NumberArray3 } from '@math.gl/core';
+/** Supported light source descriptions accepted by the lighting shader module. */
+export type Light = AmbientLight | PointLight | SpotLight | DirectionalLight;
+/** Ambient light contribution shared across the entire scene. */
 export type AmbientLight = {
+    /** Discriminator used to identify ambient lights in `lights: Light[]`. */
     type: 'ambient';
+    /** RGB light color in the existing `0..255` convention used by luma.gl materials. */
     color?: Readonly<NumberArray3>;
+    /** Scalar intensity multiplier applied to the light color. */
     intensity?: number;
 };
+/** Omnidirectional point light emitted from a world-space position. */
 export type PointLight = {
+    /** Discriminator used to identify point lights in `lights: Light[]`. */
     type: 'point';
+    /** World-space light position. */
     position: Readonly<NumberArray3>;
+    /** RGB light color in the existing `0..255` convention used by luma.gl materials. */
     color?: Readonly<NumberArray3>;
+    /** Scalar intensity multiplier applied to the light color. */
     intensity?: number;
+    /** Constant, linear, and quadratic attenuation coefficients. */
     attenuation?: Readonly<NumberArray3>;
 };
+/** Directional light defined only by its incoming world-space direction. */
 export type DirectionalLight = {
+    /** Discriminator used to identify directional lights in `lights: Light[]`. */
     type: 'directional';
+    /** World-space light direction. */
     direction: Readonly<NumberArray3>;
+    /** RGB light color in the existing `0..255` convention used by luma.gl materials. */
     color?: Readonly<NumberArray3>;
+    /** Scalar intensity multiplier applied to the light color. */
     intensity?: number;
 };
+/** Cone-shaped light emitted from a position and focused along a direction. */
+export type SpotLight = {
+    /** Discriminator used to identify spot lights in `lights: Light[]`. */
+    type: 'spot';
+    /** World-space light position. */
+    position: Readonly<NumberArray3>;
+    /** World-space light direction. */
+    direction: Readonly<NumberArray3>;
+    /** RGB light color in the existing `0..255` convention used by luma.gl materials. */
+    color?: Readonly<NumberArray3>;
+    /** Scalar intensity multiplier applied to the light color. */
+    intensity?: number;
+    /** Constant, linear, and quadratic attenuation coefficients. */
+    attenuation?: Readonly<NumberArray3>;
+    /** Inner spotlight cone angle in radians. */
+    innerConeAngle?: number;
+    /** Outer spotlight cone angle in radians. */
+    outerConeAngle?: number;
+};
+/** Public JavaScript props accepted by the `lighting` shader module. */
 export type LightingProps = {
+    /** Enables or disables lighting calculations for the module. */
     enabled?: boolean;
+    /** Preferred API for supplying mixed ambient, point, spot, and directional lights. */
     lights?: Light[];
-    /** @deprecated */
+    /**
+     * Legacy ambient-light prop.
+     * @deprecated Use `lights` with `{type: 'ambient', ...}` entries instead.
+     */
     ambientLight?: AmbientLight;
-    /** @deprecated */
+    /**
+     * Legacy point-light prop.
+     * @deprecated Use `lights` with `{type: 'point', ...}` entries instead.
+     */
     pointLights?: PointLight[];
-    /** @deprecated */
+    /**
+     * Legacy spot-light prop.
+     * @deprecated Use `lights` with `{type: 'spot', ...}` entries instead.
+     */
+    spotLights?: SpotLight[];
+    /**
+     * Legacy directional-light prop.
+     * @deprecated Use `lights` with `{type: 'directional', ...}` entries instead.
+     */
     directionalLights?: DirectionalLight[];
 };
+/** Packed per-light data written into the module's fixed-size uniform array. */
+export type LightingLightUniform = {
+    /** Light color converted to normalized shader-space RGB. */
+    color: Readonly<NumberArray3>;
+    /** World-space light position or a default placeholder for non-positional lights. */
+    position: Readonly<NumberArray3>;
+    /** World-space light direction or a default placeholder for positional lights. */
+    direction: Readonly<NumberArray3>;
+    /** Constant, linear, and quadratic attenuation coefficients. */
+    attenuation: Readonly<NumberArray3>;
+    /** Cosines of the inner and outer spotlight cone angles. */
+    coneCos: Readonly<NumberArray2>;
+};
+/** Fully normalized uniform values produced by the `lighting` shader module. */
 export type LightingUniforms = {
+    /** `1` when lighting is enabled, otherwise `0`. */
     enabled: number;
-    ambientColor: Readonly<NumberArray3>;
+    /** Number of packed directional lights in the `lights` array. */
     directionalLightCount: number;
+    /** Number of packed point lights in the `lights` array. */
     pointLightCount: number;
-    lightType: number;
-    lightColor0: Readonly<NumberArray3>;
-    lightPosition0: Readonly<NumberArray3>;
-    lightDirection0: Readonly<NumberArray3>;
-    lightAttenuation0: Readonly<NumberArray3>;
-    lightColor1: Readonly<NumberArray3>;
-    lightPosition1: Readonly<NumberArray3>;
-    lightDirection1: Readonly<NumberArray3>;
-    lightAttenuation1: Readonly<NumberArray3>;
-    lightColor2: Readonly<NumberArray3>;
-    lightPosition2: Readonly<NumberArray3>;
-    lightDirection2: Readonly<NumberArray3>;
-    lightAttenuation2: Readonly<NumberArray3>;
+    /** Number of packed spot lights in the `lights` array. */
+    spotLightCount: number;
+    /** Accumulated ambient color converted to normalized shader-space RGB. */
+    ambientColor: Readonly<NumberArray3>;
+    /** Packed trailing array of non-ambient light structs. */
+    lights: ReadonlyArray<LightingLightUniform>;
 };
-/** UBO ready lighting module */
+/**
+ * Portable lighting shader module shared by the Phong, Gouraud, and PBR material modules.
+ *
+ * The public JavaScript API accepts `lights: Light[]`, while the uniform buffer packs
+ * non-ambient lights into a fixed-size trailing array for portability across WebGL2 and WebGPU.
+ */
 export declare const lighting: {
     readonly props: LightingProps;
     readonly uniforms: LightingUniforms;
@@ -61,47 +121,29 @@ export declare const lighting: {
     readonly defines: {};
     readonly uniformTypes: {
         readonly enabled: "i32";
-        readonly lightType: "i32";
         readonly directionalLightCount: "i32";
         readonly pointLightCount: "i32";
+        readonly spotLightCount: "i32";
         readonly ambientColor: "vec3<f32>";
-        readonly lightColor0: "vec3<f32>";
-        readonly lightPosition0: "vec3<f32>";
-        readonly lightDirection0: "vec3<f32>";
-        readonly lightAttenuation0: "vec3<f32>";
-        readonly lightColor1: "vec3<f32>";
-        readonly lightPosition1: "vec3<f32>";
-        readonly lightDirection1: "vec3<f32>";
-        readonly lightAttenuation1: "vec3<f32>";
-        readonly lightColor2: "vec3<f32>";
-        readonly lightPosition2: "vec3<f32>";
-        readonly lightDirection2: "vec3<f32>";
-        readonly lightAttenuation2: "vec3<f32>";
-    };
-    readonly defaultUniforms: {
-        readonly enabled: 1;
-        readonly lightType: LIGHT_TYPE.POINT;
-        readonly directionalLightCount: 0;
-        readonly pointLightCount: 0;
-        readonly ambientColor: readonly [0.1, 0.1, 0.1];
-        readonly lightColor0: readonly [1, 1, 1];
-        readonly lightPosition0: readonly [1, 1, 2];
-        readonly lightDirection0: readonly [1, 1, 1];
-        readonly lightAttenuation0: readonly [1, 0, 0];
-        readonly lightColor1: readonly [1, 1, 1];
-        readonly lightPosition1: readonly [1, 1, 2];
-        readonly lightDirection1: readonly [1, 1, 1];
-        readonly lightAttenuation1: readonly [1, 0, 0];
-        readonly lightColor2: readonly [1, 1, 1];
-        readonly lightPosition2: readonly [1, 1, 2];
-        readonly lightDirection2: readonly [1, 1, 1];
-        readonly lightAttenuation2: readonly [1, 0, 0];
+        readonly lights: readonly [{
+            readonly color: "vec3<f32>";
+            readonly position: "vec3<f32>";
+            readonly direction: "vec3<f32>";
+            readonly attenuation: "vec3<f32>";
+            readonly coneCos: "vec2<f32>";
+        }, 5];
     };
-    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  pointLightCount: 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 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";
-    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 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";
+    readonly defaultUniforms: LightingUniforms;
+    readonly bindingLayout: readonly [{
+        readonly name: "lighting";
+        readonly group: 2;
+    }];
+    readonly firstBindingSlot: 0;
+    readonly source: "// #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))\nconst MAX_LIGHTS: i32 = 5;\n\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 SpotLight {\n  color: vec3<f32>,\n  position: vec3<f32>,\n  direction: vec3<f32>,\n  attenuation: vec3<f32>,\n  coneCos: vec2<f32>,\n};\n\nstruct DirectionalLight {\n  color: vec3<f32>,\n  direction: vec3<f32>,\n};\n\nstruct UniformLight {\n  color: vec3<f32>,\n  position: vec3<f32>,\n  direction: vec3<f32>,\n  attenuation: vec3<f32>,\n  coneCos: vec2<f32>,\n};\n\nstruct lightingUniforms {\n  enabled: i32,\n  directionalLightCount: i32,\n  pointLightCount: i32,\n  spotLightCount: i32,\n  ambientColor: vec3<f32>,\n  lights: array<UniformLight, 5>,\n};\n\n@group(2) @binding(auto) var<uniform> lighting : lightingUniforms;\n\nfn lighting_getPointLight(index: i32) -> PointLight {\n  let light = lighting.lights[index];\n  return PointLight(light.color, light.position, light.attenuation);\n}\n\nfn lighting_getSpotLight(index: i32) -> SpotLight {\n  let light = lighting.lights[lighting.pointLightCount + index];\n  return SpotLight(light.color, light.position, light.direction, light.attenuation, light.coneCos);\n}\n\nfn lighting_getDirectionalLight(index: i32) -> DirectionalLight {\n  let light = lighting.lights[lighting.pointLightCount + lighting.spotLightCount + index];\n  return DirectionalLight(light.color, light.direction);\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\nfn getSpotLightAttenuation(spotLight: SpotLight, positionWorldspace: vec3<f32>) -> f32 {\n  let lightDirection = normalize(positionWorldspace - spotLight.position);\n  let coneFactor = smoothstep(\n    spotLight.coneCos.y,\n    spotLight.coneCos.x,\n    dot(normalize(spotLight.direction), lightDirection)\n  );\n  let distanceAttenuation = getPointLightAttenuation(\n    PointLight(spotLight.color, spotLight.position, spotLight.attenuation),\n    distance(spotLight.position, positionWorldspace)\n  );\n  return distanceAttenuation / max(coneFactor, 0.0001);\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 SpotLight {\n  vec3 color;\n  vec3 position;\n  vec3 direction;\n  vec3 attenuation;\n  vec2 coneCos;\n};\n\nstruct DirectionalLight {\n  vec3 color;\n  vec3 direction;\n};\n\nstruct UniformLight {\n  vec3 color;\n  vec3 position;\n  vec3 direction;\n  vec3 attenuation;\n  vec2 coneCos;\n};\n\nlayout(std140) uniform lightingUniforms {\n  int enabled;\n  int directionalLightCount;\n  int pointLightCount;\n  int spotLightCount;\n  vec3 ambientColor;\n  UniformLight lights[5];\n} lighting;\n\nPointLight lighting_getPointLight(int index) {\n  UniformLight light = lighting.lights[index];\n  return PointLight(light.color, light.position, light.attenuation);\n}\n\nSpotLight lighting_getSpotLight(int index) {\n  UniformLight light = lighting.lights[lighting.pointLightCount + index];\n  return SpotLight(light.color, light.position, light.direction, light.attenuation, light.coneCos);\n}\n\nDirectionalLight lighting_getDirectionalLight(int index) {\n  UniformLight light =\n    lighting.lights[lighting.pointLightCount + lighting.spotLightCount + index];\n  return DirectionalLight(light.color, light.direction);\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\nfloat getSpotLightAttenuation(SpotLight spotLight, vec3 positionWorldspace) {\n  vec3 light_direction = normalize(positionWorldspace - spotLight.position);\n  float coneFactor = smoothstep(\n    spotLight.coneCos.y,\n    spotLight.coneCos.x,\n    dot(normalize(spotLight.direction), light_direction)\n  );\n  float distanceAttenuation = getPointLightAttenuation(\n    PointLight(spotLight.color, spotLight.position, spotLight.attenuation),\n    distance(spotLight.position, positionWorldspace)\n  );\n  return distanceAttenuation / max(coneFactor, 0.0001);\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 SpotLight {\n  vec3 color;\n  vec3 position;\n  vec3 direction;\n  vec3 attenuation;\n  vec2 coneCos;\n};\n\nstruct DirectionalLight {\n  vec3 color;\n  vec3 direction;\n};\n\nstruct UniformLight {\n  vec3 color;\n  vec3 position;\n  vec3 direction;\n  vec3 attenuation;\n  vec2 coneCos;\n};\n\nlayout(std140) uniform lightingUniforms {\n  int enabled;\n  int directionalLightCount;\n  int pointLightCount;\n  int spotLightCount;\n  vec3 ambientColor;\n  UniformLight lights[5];\n} lighting;\n\nPointLight lighting_getPointLight(int index) {\n  UniformLight light = lighting.lights[index];\n  return PointLight(light.color, light.position, light.attenuation);\n}\n\nSpotLight lighting_getSpotLight(int index) {\n  UniformLight light = lighting.lights[lighting.pointLightCount + index];\n  return SpotLight(light.color, light.position, light.direction, light.attenuation, light.coneCos);\n}\n\nDirectionalLight lighting_getDirectionalLight(int index) {\n  UniformLight light =\n    lighting.lights[lighting.pointLightCount + lighting.spotLightCount + index];\n  return DirectionalLight(light.color, light.direction);\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\nfloat getSpotLightAttenuation(SpotLight spotLight, vec3 positionWorldspace) {\n  vec3 light_direction = normalize(positionWorldspace - spotLight.position);\n  float coneFactor = smoothstep(\n    spotLight.coneCos.y,\n    spotLight.coneCos.x,\n    dot(normalize(spotLight.direction), light_direction)\n  );\n  float distanceAttenuation = getPointLightAttenuation(\n    PointLight(spotLight.color, spotLight.position, spotLight.attenuation),\n    distance(spotLight.position, positionWorldspace)\n  );\n  return distanceAttenuation / max(coneFactor, 0.0001);\n}\n\n// #endif\n";
     readonly getUniforms: typeof getUniforms;
 };
-declare function getUniforms(props?: LightingProps, prevUniforms?: Partial<LightingUniforms>): LightingUniforms;
+declare function getUniforms(props?: LightingProps, _prevUniforms?: Partial<LightingUniforms>): LightingUniforms;
 export {};
 //# sourceMappingURL=lighting.d.ts.map

package/dist/modules/lighting/lights/lighting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lighting.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAQhD,mCAAmC;AAEnC,oBAAY,UAAU;IACpB,KAAK,IAAI;IACT,WAAW,IAAI;CAChB;AAED,4BAA4B;AAE5B,MAAM,MAAM,KAAK,GAAG,YAAY,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,kBAAkB;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kBAAkB;IAClB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,kBAAkB;IAClB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACrC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACpC,cAAc,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvC,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACxC,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1C,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACpC,cAAc,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvC,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACxC,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1C,WAAW,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACpC,cAAc,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvC,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACxC,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;CAC3C,CAAC;AAEF,gCAAgC;AAChC,eAAO,MAAM,QAAQ;oBACN,aAAa;uBACV,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DoC,CAAC;AAEvE,iBAAS,WAAW,CAClB,KAAK,CAAC,EAAE,aAAa,EACrB,YAAY,GAAE,OAAO,CAAC,gBAAgB,CAAM,GAC3C,gBAAgB,CAoClB"}
+{"version":3,"file":"lighting.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting.ts"],"names":[],"mappings":"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"}

package/dist/modules/lighting/lights/lighting.js

@@ -8,14 +8,19 @@ import { lightingUniformsWGSL } from "./lighting-wgsl.js";
 const MAX_LIGHTS = 5;
 /** Whether to divide */
 const COLOR_FACTOR = 255.0;
-/** Shader type field for lights */
-// eslint-disable-next-line no-shadow
-export var LIGHT_TYPE;
-(function (LIGHT_TYPE) {
-    LIGHT_TYPE[LIGHT_TYPE["POINT"] = 0] = "POINT";
-    LIGHT_TYPE[LIGHT_TYPE["DIRECTIONAL"] = 1] = "DIRECTIONAL";
-})(LIGHT_TYPE || (LIGHT_TYPE = {}));
-/** UBO ready lighting module */
+const LIGHT_UNIFORM_TYPE = {
+    color: 'vec3<f32>',
+    position: 'vec3<f32>',
+    direction: 'vec3<f32>',
+    attenuation: 'vec3<f32>',
+    coneCos: 'vec2<f32>'
+};
+/**
+ * Portable lighting shader module shared by the Phong, Gouraud, and PBR material modules.
+ *
+ * The public JavaScript API accepts `lights: Light[]`, while the uniform buffer packs
+ * non-ambient lights into a fixed-size trailing array for portability across WebGL2 and WebGPU.
+ */
 export const lighting = {
     props: {},
     uniforms: {},
@@ -25,108 +30,112 @@ export const lighting = {
     },
     uniformTypes: {
         enabled: 'i32',
-        lightType: 'i32',
         directionalLightCount: 'i32',
         pointLightCount: 'i32',
+        spotLightCount: 'i32',
         ambientColor: 'vec3<f32>',
-        // TODO define as arrays once we have appropriate uniformTypes
-        lightColor0: 'vec3<f32>',
-        lightPosition0: 'vec3<f32>',
-        // TODO - could combine direction and attenuation
-        lightDirection0: 'vec3<f32>',
-        lightAttenuation0: 'vec3<f32>',
-        lightColor1: 'vec3<f32>',
-        lightPosition1: 'vec3<f32>',
-        lightDirection1: 'vec3<f32>',
-        lightAttenuation1: 'vec3<f32>',
-        lightColor2: 'vec3<f32>',
-        lightPosition2: 'vec3<f32>',
-        lightDirection2: 'vec3<f32>',
-        lightAttenuation2: 'vec3<f32>'
-    },
-    defaultUniforms: {
-        enabled: 1,
-        lightType: LIGHT_TYPE.POINT,
-        directionalLightCount: 0,
-        pointLightCount: 0,
-        ambientColor: [0.1, 0.1, 0.1],
-        lightColor0: [1, 1, 1],
-        lightPosition0: [1, 1, 2],
-        // TODO - could combine direction and attenuation
-        lightDirection0: [1, 1, 1],
-        lightAttenuation0: [1, 0, 0],
-        lightColor1: [1, 1, 1],
-        lightPosition1: [1, 1, 2],
-        lightDirection1: [1, 1, 1],
-        lightAttenuation1: [1, 0, 0],
-        lightColor2: [1, 1, 1],
-        lightPosition2: [1, 1, 2],
-        lightDirection2: [1, 1, 1],
-        lightAttenuation2: [1, 0, 0]
+        lights: [LIGHT_UNIFORM_TYPE, MAX_LIGHTS]
     },
+    defaultUniforms: createDefaultLightingUniforms(),
+    bindingLayout: [{ name: 'lighting', group: 2 }],
+    firstBindingSlot: 0,
     source: lightingUniformsWGSL,
     vs: lightingUniformsGLSL,
     fs: lightingUniformsGLSL,
     getUniforms
 };
-function getUniforms(props, prevUniforms = {}) {
+function getUniforms(props, _prevUniforms = {}) {
     // Copy props so we can modify
     props = props ? { ...props } : props;
     // TODO legacy
     if (!props) {
-        return { ...lighting.defaultUniforms };
+        return createDefaultLightingUniforms();
     }
     // Support for array of lights. Type of light is detected by type field
     if (props.lights) {
         props = { ...props, ...extractLightTypes(props.lights), lights: undefined };
     }
     // Specify lights separately
-    const { ambientLight, pointLights, directionalLights } = props || {};
+    const { ambientLight, pointLights, spotLights, directionalLights } = props || {};
     const hasLights = ambientLight ||
         (pointLights && pointLights.length > 0) ||
+        (spotLights && spotLights.length > 0) ||
         (directionalLights && directionalLights.length > 0);
     // TODO - this may not be the correct decision
     if (!hasLights) {
-        return { ...lighting.defaultUniforms, enabled: 0 };
+        return {
+            ...createDefaultLightingUniforms(),
+            enabled: 0
+        };
     }
     const uniforms = {
-        ...lighting.defaultUniforms,
-        ...prevUniforms,
-        ...getLightSourceUniforms({ ambientLight, pointLights, directionalLights })
+        ...createDefaultLightingUniforms(),
+        ...getLightSourceUniforms({ ambientLight, pointLights, spotLights, directionalLights })
     };
     if (props.enabled !== undefined) {
         uniforms.enabled = props.enabled ? 1 : 0;
     }
     return uniforms;
 }
-function getLightSourceUniforms({ ambientLight, pointLights = [], directionalLights = [] }) {
-    const lightSourceUniforms = {};
-    lightSourceUniforms.ambientColor = convertColor(ambientLight);
+function getLightSourceUniforms({ ambientLight, pointLights = [], spotLights = [], directionalLights = [] }) {
+    const lights = createDefaultLightUniforms();
     let currentLight = 0;
+    let pointLightCount = 0;
+    let spotLightCount = 0;
+    let directionalLightCount = 0;
     for (const pointLight of pointLights) {
-        lightSourceUniforms.lightType = LIGHT_TYPE.POINT;
-        const i = currentLight;
-        lightSourceUniforms[`lightColor${i}`] = convertColor(pointLight);
-        lightSourceUniforms[`lightPosition${i}`] = pointLight.position;
-        lightSourceUniforms[`lightAttenuation${i}`] = pointLight.attenuation || [1, 0, 0];
+        if (currentLight >= MAX_LIGHTS) {
+            break;
+        }
+        lights[currentLight] = {
+            ...lights[currentLight],
+            color: convertColor(pointLight),
+            position: pointLight.position,
+            attenuation: pointLight.attenuation || [1, 0, 0]
+        };
+        currentLight++;
+        pointLightCount++;
+    }
+    for (const spotLight of spotLights) {
+        if (currentLight >= MAX_LIGHTS) {
+            break;
+        }
+        lights[currentLight] = {
+            ...lights[currentLight],
+            color: convertColor(spotLight),
+            position: spotLight.position,
+            direction: spotLight.direction,
+            attenuation: spotLight.attenuation || [1, 0, 0],
+            coneCos: getSpotConeCos(spotLight)
+        };
         currentLight++;
+        spotLightCount++;
     }
     for (const directionalLight of directionalLights) {
-        lightSourceUniforms.lightType = LIGHT_TYPE.DIRECTIONAL;
-        const i = currentLight;
-        lightSourceUniforms[`lightColor${i}`] = convertColor(directionalLight);
-        lightSourceUniforms[`lightDirection${i}`] = directionalLight.direction;
+        if (currentLight >= MAX_LIGHTS) {
+            break;
+        }
+        lights[currentLight] = {
+            ...lights[currentLight],
+            color: convertColor(directionalLight),
+            direction: directionalLight.direction
+        };
         currentLight++;
+        directionalLightCount++;
     }
-    if (currentLight > MAX_LIGHTS) {
-        log.warn('MAX_LIGHTS exceeded')();
+    if (pointLights.length + spotLights.length + directionalLights.length > MAX_LIGHTS) {
+        log.warn(`MAX_LIGHTS exceeded, truncating to ${MAX_LIGHTS}`)();
     }
-    lightSourceUniforms.directionalLightCount = directionalLights.length;
-    lightSourceUniforms.pointLightCount = pointLights.length;
-    return lightSourceUniforms;
+    return {
+        ambientColor: convertColor(ambientLight),
+        directionalLightCount,
+        pointLightCount,
+        spotLightCount,
+        lights
+    };
 }
 function extractLightTypes(lights) {
-    const lightSources = { pointLights: [], directionalLights: [] };
+    const lightSources = { pointLights: [], spotLights: [], directionalLights: [] };
     for (const light of lights || []) {
         switch (light.type) {
             case 'ambient':
@@ -140,6 +149,9 @@ function extractLightTypes(lights) {
             case 'point':
                 lightSources.pointLights?.push(light);
                 break;
+            case 'spot':
+                lightSources.spotLights?.push(light);
+                break;
             default:
             // eslint-disable-next-line
             // console.warn(light.type);
@@ -152,4 +164,31 @@ function convertColor(colorDef = {}) {
     const { color = [0, 0, 0], intensity = 1.0 } = colorDef;
     return color.map(component => (component * intensity) / COLOR_FACTOR);
 }
+function createDefaultLightingUniforms() {
+    return {
+        enabled: 1,
+        directionalLightCount: 0,
+        pointLightCount: 0,
+        spotLightCount: 0,
+        ambientColor: [0.1, 0.1, 0.1],
+        lights: createDefaultLightUniforms()
+    };
+}
+function createDefaultLightUniforms() {
+    return Array.from({ length: MAX_LIGHTS }, () => createDefaultLightUniform());
+}
+function createDefaultLightUniform() {
+    return {
+        color: [1, 1, 1],
+        position: [1, 1, 2],
+        direction: [1, 1, 1],
+        attenuation: [1, 0, 0],
+        coneCos: [1, 0]
+    };
+}
+function getSpotConeCos(spotLight) {
+    const innerConeAngle = spotLight.innerConeAngle ?? 0;
+    const outerConeAngle = spotLight.outerConeAngle ?? Math.PI / 4;
+    return [Math.cos(innerConeAngle), Math.cos(outerConeAngle)];
+}
 //# sourceMappingURL=lighting.js.map

package/dist/modules/lighting/lights/lighting.js.map

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