shadertools: Support mulitple lights in lighting module #2166
Conversation
| @@ -36,6 +37,10 @@ void main(void) { | |||
| vPosition = (app.modelMatrix * vec4(positions, 1.0)).xyz; | |||
| vNormal = mat3(app.modelMatrix) * normals; | |||
| vUV = texCoords; | |||
|
|
|||
| #if (defined(LIGHTING_VERTEX)) | |||
| vColor = lighting_getLightColor(vec3(1.0), app.eyePosition, vPosition, normalize(vNormal)); | |||
There was a problem hiding this comment.
Thought: Maybe we could name the vertex and fragment calculation functions differently and export a trivial stub in one of the modules, so that we can avoid #ifdefs which we don't have naturally in WGSL.
This will come into focus on master where we also need to deal with the WGSL implementation.
| vs: GOURAUD_VS, | ||
| fs: GOURAUD_FS, | ||
| vs: PHONG_FS.replace('phongMaterial', 'gouraudMaterial'), | ||
| fs: PHONG_VS.replace('phongMaterial', 'gouraudMaterial'), |
There was a problem hiding this comment.
Hmm... Seems no way to do this that is completely palatable...
Maybe just a single module phongGouraudMaterial with a switch?
There was a problem hiding this comment.
Given that Gouraud shading is still based on the Phong model, why don't we remove the Gouraud material altogether and provide lighting_getLightColor et al in vs and fs. Then the application code can choose whether to perform lighting at the vertex stage (Gouraud) or fragment (Phong). The UBO will always be called phongMaterial and we won't have to worry about which shader module we are using
modules/shadertools/src/modules/lighting/lights/lighting-uniforms-glsl.ts
Outdated
Show resolved
Hide resolved
For visgl/deck.gl#9074
Screen.Recording.2024-08-07.at.16.08.39.mov
Change List
getUniformslighting_getPointLight/lighting_getDirectionalLightpicks correct light by indexlighting_getSpecularLightColorgouraudMaterialgouraudMaterial&phongMaterial