@luma.gl/shadertools 9.0.17 → 9.0.20

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

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { lighting } from "../lights/lighting-uniforms.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 = {
-    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
     },

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":"AAMA,eAAO,MAAM,gBAAgB,QAoD5B,CAAC"}
+{"version":3,"file":"lighting-uniforms-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms-glsl.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,gBAAgB,QA2E5B,CAAC"}

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

@@ -18,20 +18,44 @@ vec3 direction;
 };
 uniform lightingUniforms {
 int enabled;
-int pointLightCount;
+int lightType;
 int directionalLightCount;
+int pointLightCount;
 vec3 ambientColor;
-int lightType;
-vec3 lightColor;
-vec3 lightDirection;
-vec3 lightPosition;
-vec3 lightAttenuation;
+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) {
 return pointLight.attenuation.x

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

@@ -16,7 +16,6 @@ export type PointLight = {
 };
 export type DirectionalLight = {
     type: 'directional';
-    position: Readonly<NumberArray3>;
     direction: Readonly<NumberArray3>;
     color?: Readonly<NumberArray3>;
     intensity?: number;
@@ -34,12 +33,21 @@ export type LightingProps = {
 export type LightingUniforms = {
     enabled: number;
     ambientLightColor: Readonly<NumberArray3>;
-    numberOfLights: number;
+    directionalLightCount: number;
+    pointLightCount: number;
     lightType: number;
-    lightColor: Readonly<NumberArray3>;
-    lightPosition: Readonly<NumberArray3>;
-    lightDirection: Readonly<NumberArray3>;
-    lightAttenuation: Readonly<NumberArray3>;
+    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>;
 };
 /** UBO ready lighting module */
 export declare const lighting: ShaderModule<LightingProps, LightingUniforms, {}>;

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

@@ -1 +1 @@
-{"version":3,"file":"lighting-uniforms.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAEtE,OAAO,KAAK,EAAC,YAAY,EAAC,4CAAyC;AAcnE,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,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACjC,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,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACnC,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACtC,cAAc,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IACvC,gBAAgB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;CAC1C,CAAC;AAEF,gCAAgC;AAChC,eAAO,MAAM,QAAQ,EAAE,YAAY,CAAC,aAAa,EAAE,gBAAgB,EAAE,EAAE,CAoCtE,CAAC"}
+{"version":3,"file":"lighting-uniforms.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAEtE,OAAO,KAAK,EAAC,YAAY,EAAC,4CAAyC;AAenE,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,MAAM,CAAC;CACtB,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,iBAAiB,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1C,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,EAAE,YAAY,CAAC,aAAa,EAAE,gBAAgB,EAAE,EAAE,CA8DtE,CAAC"}

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

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { lightingUniforms } from "./lighting-uniforms-glsl.js";
+import { log } from '@luma.gl/core';
 /** Max number of supported lights (in addition to ambient light */
-const MAX_LIGHTS = 5;
+const MAX_LIGHTS = 3;
 /** Whether to divide */
 const COLOR_FACTOR = 255.0;
 /** Shader type field for lights */
@@ -25,25 +26,44 @@ export const lighting = {
     },
     uniformTypes: {
         enabled: 'i32',
+        lightType: 'i32',
+        directionalLightCount: 'i32',
+        pointLightCount: 'i32',
         ambientLightColor: 'vec3<f32>',
-        numberOfLights: 'i32', // , array: MAX_LIGHTS,
-        lightType: 'i32', // , array: MAX_LIGHTS,
-        lightColor: 'vec3<f32>', // , array: MAX_LIGHTS,
-        lightPosition: 'vec3<f32>', // , array: MAX_LIGHTS,
+        // TODO define as arrays once we have appropriate uniformTypes
+        lightColor0: 'vec3<f32>',
+        lightPosition0: 'vec3<f32>',
         // TODO - could combine direction and attenuation
-        lightDirection: 'vec3<f32>', // , array: MAX_LIGHTS,
-        lightAttenuation: 'vec3<f32>' // , array: MAX_LIGHTS},
+        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,
-        ambientLightColor: [0.1, 0.1, 0.1],
-        numberOfLights: 0,
         lightType: LIGHT_TYPE.POINT,
-        lightColor: [1, 1, 1],
-        lightPosition: [1, 1, 2],
+        directionalLightCount: 0,
+        pointLightCount: 0,
+        ambientLightColor: [0.1, 0.1, 0.1],
+        lightColor0: [1, 1, 1],
+        lightPosition0: [1, 1, 2],
         // TODO - could combine direction and attenuation
-        lightDirection: [1, 1, 1],
-        lightAttenuation: [1, 1, 1]
+        lightDirection0: [1, 1, 1],
+        lightAttenuation0: [1, 1, 1],
+        lightColor1: [1, 1, 1],
+        lightPosition1: [1, 1, 2],
+        lightDirection1: [1, 1, 1],
+        lightAttenuation1: [1, 1, 1],
+        lightColor2: [1, 1, 1],
+        lightPosition2: [1, 1, 2],
+        lightDirection2: [1, 1, 1],
+        lightAttenuation2: [1, 1, 1]
     }
 };
 function getUniforms(props, prevUniforms = {}) {
@@ -77,38 +97,29 @@ function getUniforms(props, prevUniforms = {}) {
     return uniforms;
 }
 function getLightSourceUniforms({ ambientLight, pointLights = [], directionalLights = [] }) {
-    const lightSourceUniforms = {
-    // lightType: new Array(MAX_LIGHTS).fill(0),
-    // lightColor: new Array(MAX_LIGHTS).fill([0, 0, 0]),
-    // lightPosition: new Array(MAX_LIGHTS).fill([0, 0, 0]),
-    // lightDirection: new Array(MAX_LIGHTS).fill([0, 0, 0]),
-    // lightAttenuation: new Array(MAX_LIGHTS).fill([0, 0, 0])
-    };
+    const lightSourceUniforms = {};
     lightSourceUniforms.ambientLightColor = convertColor(ambientLight);
     let currentLight = 0;
     for (const pointLight of pointLights) {
-        // lightSourceUniforms.lightType[currentLight] = LIGHT_TYPE.POINT;
-        // lightSourceUniforms.lightColor[currentLight] = convertColor(pointLight);
-        // lightSourceUniforms.lightPosition[currentLight] = pointLight.position;
-        // lightSourceUniforms.lightAttenuation[currentLight] = [pointLight.attenuation || 1, 0, 0];
         lightSourceUniforms.lightType = LIGHT_TYPE.POINT;
-        lightSourceUniforms.lightColor = convertColor(pointLight);
-        lightSourceUniforms.lightPosition = pointLight.position;
-        lightSourceUniforms.lightAttenuation = [pointLight.attenuation || 1, 0, 0];
+        const i = currentLight;
+        lightSourceUniforms[`lightColor${i}`] = convertColor(pointLight);
+        lightSourceUniforms[`lightPosition${i}`] = pointLight.position;
+        lightSourceUniforms[`lightAttenuation${i}`] = [pointLight.attenuation || 1, 0, 0];
         currentLight++;
     }
     for (const directionalLight of directionalLights) {
-        // lightSourceUniforms.lightType[currentLight] = LIGHT_TYPE.DIRECTIONAL;
-        // lightSourceUniforms.lightColor[currentLight] = convertColor(directionalLight);
-        // lightSourceUniforms.lightPosition[currentLight] = directionalLight.position;
-        // lightSourceUniforms.lightDirection[currentLight] = directionalLight.direction;
         lightSourceUniforms.lightType = LIGHT_TYPE.DIRECTIONAL;
-        lightSourceUniforms.lightColor = convertColor(directionalLight);
-        lightSourceUniforms.lightPosition = directionalLight.position;
-        lightSourceUniforms.lightDirection = directionalLight.direction;
+        const i = currentLight;
+        lightSourceUniforms[`lightColor${i}`] = convertColor(directionalLight);
+        lightSourceUniforms[`lightDirection${i}`] = directionalLight.direction;
         currentLight++;
     }
-    lightSourceUniforms.numberOfLights = currentLight;
+    if (currentLight > MAX_LIGHTS) {
+        log.warn('MAX_LIGHTS exceeded')();
+    }
+    lightSourceUniforms.directionalLightCount = directionalLights.length;
+    lightSourceUniforms.pointLightCount = pointLights.length;
     return lightSourceUniforms;
 }
 function extractLightTypes(lights) {

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

@@ -5,7 +5,7 @@ import { lighting } from "../lights/lighting-uniforms.js";
 import { PHONG_VS, PHONG_FS } from "./phong-shaders-glsl.js";
 /** In Phong shading, the normal vector is linearly interpolated across the surface of the polygon from the polygon's vertex normals. */
 export const phongMaterial = {
-    name: 'phong-lighting',
+    name: 'phongMaterial',
     // Note these are switched between phong and gouraud
     vs: PHONG_VS,
     fs: PHONG_FS,

package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts

@@ -1,42 +1,3 @@
 export declare const PHONG_VS: string;
 export declare const PHONG_FS: string;
-/**
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.pointLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getPointLight(i);
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    }
-
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.directionalLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getDirectionalLight(i);
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-  }
-    /**
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.pointLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getPointLight(i);
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    }
-
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.directionalLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getDirectionalLight(i);
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-  }
-  */
 //# sourceMappingURL=phong-shaders-glsl.d.ts.map

package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"phong-shaders-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ,QAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ,QAqFpB,CAAC;AAGF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsCI"}
+{"version":3,"file":"phong-shaders-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ,QAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ,QA+CpB,CAAC"}

package/dist/modules/lighting/phong-material/phong-shaders-glsl.js

@@ -35,75 +35,18 @@ return lightColor;
 }
 vec3 view_direction = normalize(cameraPosition - position_worldspace);
 lightColor = material.ambient * surfaceColor * lighting.ambientColor;
-if (lighting.lightType == 0) {
-PointLight pointLight = lighting_getPointLight(0);
+for (int i = 0; i < lighting.pointLightCount; i++) {
+PointLight pointLight = lighting_getPointLight(i);
 vec3 light_position_worldspace = pointLight.position;
 vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-} else if (lighting.lightType == 1) {
-DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-}
-return lightColor;
+float light_attenuation = getPointLightAttenuation(pointLight, distance(light_position_worldspace, position_worldspace));
+lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color / light_attenuation);
 }
-vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
-vec3 lightColor = vec3(0, 0, 0);
-vec3 surfaceColor = vec3(0, 0, 0);
-if (lighting.enabled == 0) {
-vec3 view_direction = normalize(cameraPosition - position_worldspace);
-switch (lighting.lightType) {
-case 0:
-PointLight pointLight = lighting_getPointLight(0);
-vec3 light_position_worldspace = pointLight.position;
-vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-break;
-case 1:
-DirectionalLight directionalLight = lighting_getDirectionalLight(0);
+int totalLights = min(MAX_LIGHTS, lighting.pointLightCount + lighting.directionalLightCount);
+for (int i = lighting.pointLightCount; i < totalLights; i++) {
+DirectionalLight directionalLight = lighting_getDirectionalLight(i);
 lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-break;
-}
 }
 return lightColor;
 }
 `;
-// TODO - handle multiple lights
-/**
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.pointLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getPointLight(i);
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    }
-
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.directionalLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getDirectionalLight(i);
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-  }
-    /**
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.pointLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getPointLight(i);
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    }
-
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.directionalLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting_getDirectionalLight(i);
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-  }
-  */

package/package.json

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

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

@@ -4,7 +4,7 @@
 
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
 import {lighting} from '../lights/lighting-uniforms';
-import {GOURAUD_VS, GOURAUD_FS} from './gouraud-shaders-glsl';
+import {PHONG_VS, PHONG_FS} from '../phong-material/phong-shaders-glsl';
 
 export type GouraudMaterialProps = GouraudMaterialUniforms;
 
@@ -18,10 +18,10 @@ export type GouraudMaterialUniforms = {
 
 /** In Gouraud shading, color is calculated for each triangle vertex normal, and then color is interpolated colors across the triangle */
 export const gouraudMaterial: ShaderModule<GouraudMaterialProps, GouraudMaterialUniforms> = {
-  name: 'gouraud-lighting',
+  name: 'gouraudMaterial',
   // Note these are switched between phong and gouraud
-  vs: GOURAUD_VS,
-  fs: GOURAUD_FS,
+  vs: PHONG_FS.replace('phongMaterial', 'gouraudMaterial'),
+  fs: PHONG_VS.replace('phongMaterial', 'gouraudMaterial'),
   defines: {
     LIGHTING_VERTEX: 1
   },

package/src/modules/lighting/lights/lighting-uniforms-glsl.ts

@@ -25,28 +25,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) {