Refactor lightmap part of shader generation by the standard materials (#7527)

mvaligursky · Martin Valigursky · web-flow · commit 178cd3146f46 · 2025-04-04T10:48:31.000+01:00
Co-authored-by: Martin Valigursky &lt;mvaligursky@snapchat.com&gt;
diff --git a/src/framework/lightmapper/lightmapper.js b/src/framework/lightmapper/lightmapper.js
@@ -248,15 +248,20 @@ class Lightmapper {
                     dDiffuseLight += vec3(${scene.ambientBakeOcclusionBrightness.toFixed(1)});
                     dDiffuseLight = saturate(dDiffuseLight);
                     dDiffuseLight *= dAmbientLight;
-                ${bakeLmEndChunk}`;
+                    ${bakeLmEndChunk}
+                `;
             } else {
                 material.ambient = new Color(0, 0, 0);    // don't bake ambient
             }
             material.chunks.basePS = shaderChunks.basePS + (this.bakeHDR ? '' : '\n#define LIGHTMAP_RGBM\n');
             material.chunks.endPS = bakeLmEndChunk;
             material.lightMap = this.blackTex;
         } else {
-            material.chunks.basePS = `${shaderChunks.basePS}\nuniform sampler2D texture_dirLightMap;\nuniform float bakeDir;\n`;
+            material.chunks.basePS = `
+                #define STD_LIGHTMAP_DIR
+                ${shaderChunks.basePS}
+                uniform float bakeDir;
+            `;
             material.chunks.endPS = shaderChunksLightmapper.bakeDirLmEndPS;
         }
 
diff --git a/src/scene/shader-lib/chunks-wgsl/chunks-wgsl.js b/src/scene/shader-lib/chunks-wgsl/chunks-wgsl.js
@@ -66,8 +66,7 @@ import immediateLineVS from './internal/vert/immediateLine.js';
 // import lightFunctionShadowPS from './lit/frag/lighting/lightFunctionShadow.js';
 // import lightingPS from './lit/frag/lighting/lighting.js';
 // import lightmapAddPS from './lit/frag/lightmapAdd.js';
-// import lightmapDirPS from './standard/frag/lightmapDir.js';
-// import lightmapSinglePS from './standard/frag/lightmapSingle.js';
+// import lightmapPS from './standard/frag/lightmap.js';
 // import lightSpecularAnisoGGXPS from './lit/frag/lightSpecularAnisoGGX.js';
 // import lightSpecularBlinnPS from './lit/frag/lightSpecularBlinn.js';
 // import lightSheenPS from './lit/frag/lightSheen.js';
@@ -274,8 +273,7 @@ const shaderChunksWGSL = {
     // lightFunctionShadowPS,
     // lightingPS,
     // lightmapAddPS,
-    // lightmapDirPS,
-    // lightmapSinglePS,
+    // lightmapPS,
     // lightSpecularAnisoGGXPS,
     // lightSpecularBlinnPS,
     // lightSheenPS,
diff --git a/src/scene/shader-lib/chunks/chunk-validation.js b/src/scene/shader-lib/chunks/chunk-validation.js
@@ -14,8 +14,6 @@ const chunkVersions = {
     diffusePS: CHUNKAPI_1_57,
     emissivePS: CHUNKAPI_1_57,
     glossPS: CHUNKAPI_1_60,
-    lightmapDirPS: CHUNKAPI_1_55,
-    lightmapSinglePS: CHUNKAPI_1_55,
     metalnessPS: CHUNKAPI_1_57,
     normalMapPS: CHUNKAPI_1_57,
     opacityPS: CHUNKAPI_1_57,
@@ -129,7 +127,9 @@ const removedChunks = {
     normalDetailMapPS: CHUNKAPI_2_7,
     normalXYPS: CHUNKAPI_2_7,
     normalXYZPS: CHUNKAPI_2_7,
-    aoDetailMapPS: CHUNKAPI_2_7
+    aoDetailMapPS: CHUNKAPI_2_7,
+    lightmapDirPS: CHUNKAPI_2_7,
+    lightmapSinglePS: CHUNKAPI_2_7
 };
 
 // compare two "major.minor" semantic version strings and return true if a is a smaller version than b.
diff --git a/src/scene/shader-lib/chunks/chunks.js b/src/scene/shader-lib/chunks/chunks.js
@@ -69,8 +69,7 @@ import lightFunctionLightPS from './lit/frag/lighting/lightFunctionLight.js';
 import lightFunctionShadowPS from './lit/frag/lighting/lightFunctionShadow.js';
 import lightingPS from './lit/frag/lighting/lighting.js';
 import lightmapAddPS from './lit/frag/lightmapAdd.js';
-import lightmapDirPS from './standard/frag/lightmapDir.js';
-import lightmapSinglePS from './standard/frag/lightmapSingle.js';
+import lightmapPS from './standard/frag/lightmap.js';
 import lightSpecularAnisoGGXPS from './lit/frag/lightSpecularAnisoGGX.js';
 import lightSpecularBlinnPS from './lit/frag/lightSpecularBlinn.js';
 import lightSheenPS from './lit/frag/lightSheen.js';
@@ -279,8 +278,7 @@ const shaderChunks = {
     lightFunctionShadowPS,
     lightingPS,
     lightmapAddPS,
-    lightmapDirPS,
-    lightmapSinglePS,
+    lightmapPS,
     lightSpecularAnisoGGXPS,
     lightSpecularBlinnPS,
     lightSheenPS,
diff --git a/src/scene/shader-lib/chunks/standard/frag/lightmap.js b/src/scene/shader-lib/chunks/standard/frag/lightmap.js
@@ -0,0 +1,26 @@
+export default /* glsl */`
+
+#ifdef STD_LIGHTMAP_DIR
+    vec3 dLightmapDir;
+    uniform sampler2D texture_dirLightMap;
+#endif
+
+void getLightMap() {
+
+    dLightmap = vec3(1.0);
+
+    #ifdef STD_LIGHT_TEXTURE
+        dLightmap *= {STD_LIGHT_TEXTURE_DECODE}(texture2DBias({STD_LIGHT_TEXTURE_NAME}, {STD_LIGHT_TEXTURE_UV}, textureBias)).{STD_LIGHT_TEXTURE_CHANNEL};
+
+        #ifdef STD_LIGHTMAP_DIR
+            vec3 dir = texture2DBias(texture_dirLightMap, {STD_LIGHT_TEXTURE_UV}, textureBias).xyz * 2.0 - 1.0;
+            float dirDot = dot(dir, dir);
+            dLightmapDir = (dirDot > 0.001) ? dir / sqrt(dirDot) : vec3(0.0);
+        #endif
+    #endif
+
+    #ifdef STD_LIGHT_VERTEX
+        dLightmap *= saturate(vVertexColor.{STD_LIGHT_VERTEX_CHANNEL});
+    #endif
+}
+`;
diff --git a/src/scene/shader-lib/chunks/standard/frag/lightmapDir.js b/src/scene/shader-lib/chunks/standard/frag/lightmapDir.js
diff --git a/src/scene/shader-lib/chunks/standard/frag/lightmapSingle.js b/src/scene/shader-lib/chunks/standard/frag/lightmapSingle.js
diff --git a/src/scene/shader-lib/programs/standard.js b/src/scene/shader-lib/programs/standard.js
@@ -298,6 +298,9 @@ class ShaderGeneratorStandard extends ShaderGenerator {
             }
         };
 
+        fDefineSet(options.lightMap, 'STD_LIGHTMAP', '');
+        fDefineSet(options.lightVertexColor, 'STD_LIGHT_VERTEX_COLOR', '');
+        fDefineSet(options.dirLightMap && options.litOptions.useSpecular, 'STD_LIGHTMAP_DIR', '');
         fDefineSet(options.heightMap, 'STD_HEIGHT_MAP', '');
         fDefineSet(options.useSpecularColor, 'STD_SPECULAR_COLOR', '');
         fDefineSet(options.aoMap || options.aoVertexColor || options.useAO, 'STD_AO', '');
@@ -510,6 +513,14 @@ class ShaderGeneratorStandard extends ShaderGenerator {
                         uniform sampler2D texture_clearCoatNormalMap;
                     #endif
                 #endif
+
+                // lightmap
+                #if defined(STD_LIGHTMAP) || defined(STD_LIGHT_VERTEX_COLOR)
+                    vec3 dLightmap;
+                    #ifdef STD_LIGHT_TEXTURE_ALLOCATE
+                        uniform sampler2D texture_lightMap;
+                    #endif
+                #endif
             #endif
         `);
 
@@ -597,6 +608,11 @@ class ShaderGeneratorStandard extends ShaderGenerator {
                     #include "clearCoatGlossPS"
                     #include "clearCoatNormalPS"
                 #endif
+
+                // lightmap
+                #if defined(STD_LIGHTMAP) || defined(STD_LIGHT_VERTEX_COLOR)
+                    #include "lightmapPS"
+                #endif
             #endif
         `);
 
@@ -706,6 +722,16 @@ class ShaderGeneratorStandard extends ShaderGenerator {
                     litArgs_clearcoat_gloss = ccGlossiness;
                     litArgs_clearcoat_worldNormal = ccNormalW;
                 #endif
+
+                // lightmap
+                #if defined(STD_LIGHTMAP) || defined(STD_LIGHT_VERTEX_COLOR)
+                    getLightMap();
+                    litArgs_lightmap = dLightmap;
+
+                    #ifdef STD_LIGHTMAP_DIR
+                        litArgs_lightmapDir = dLightmapDir;
+                    #endif
+                #endif
             #endif
         `);
 
@@ -793,24 +819,9 @@ class ShaderGeneratorStandard extends ShaderGenerator {
                 this._addMap(fDefines, 'clearCoatNormal', 'clearCoatNormalPS', options, litShader.chunks, textureMapping, options.clearCoatPackedNormal ? 'xy' : 'xyz');
             }
 
-
-            // STILL TO DO -------------
-
-
             // lightmap
             if (options.lightMap || options.lightVertexColor) {
-                const lightmapDir = (options.dirLightMap && options.litOptions.useSpecular);
-                const lightmapChunkPropName = lightmapDir ? 'lightmapDirPS' : 'lightmapSinglePS';
-                decl.append('vec3 dLightmap;');
-                if (lightmapDir) {
-                    decl.append('vec3 dLightmapDir;');
-                }
-                code.append(this._addMap(fDefines, 'light', lightmapChunkPropName, options, litShader.chunks, textureMapping, options.lightMapEncoding));
-                func.append('getLightMap();');
-                args.append('litArgs_lightmap = dLightmap;');
-                if (lightmapDir) {
-                    args.append('litArgs_lightmapDir = dLightmapDir;');
-                }
+                this._addMap(fDefines, 'light', 'lightmapPS', options, litShader.chunks, textureMapping, options.lightMapEncoding);
             }
 
         } else {
@@ -851,7 +862,8 @@ class ShaderGeneratorStandard extends ShaderGenerator {
             'texture_emissiveMap',
             'texture_clearCoatMap',
             'texture_clearCoatGlossMap',
-            'texture_clearCoatNormalMap'
+            'texture_clearCoatNormalMap',
+            'texture_lightMap'
         ];
 
         // TODO: when refactoring is done, this loop will be removed
