Directional lightmap fix (playcanvas#2590)

slimbuck · web-flow · commit c3d15da88f3a · 2020-12-03T18:09:26.000Z
* lightmap fix
diff --git a/src/graphics/program-lib/chunks/lightmapDir.frag b/src/graphics/program-lib/chunks/lightmapDir.frag
@@ -2,29 +2,19 @@ uniform sampler2D texture_lightMap;
 uniform sampler2D texture_dirLightMap;
 
 void addLightMap() {
-
     vec3 color = $texture2DSAMPLE(texture_lightMap, $UV).$CH;
-    vec4 dir = texture2D(texture_dirLightMap, $UV);
-
-    if (dot(dir.xyz,vec3(1.0)) < 0.00001) {
+    vec3 dir = texture2D(texture_dirLightMap, $UV).xyz;
+    if (dot(dir, vec3(1.0)) < 0.00001) {
         dDiffuseLight += color;
-        return;
-    }
-
-    dLightDirNormW = normalize(dir.xyz * 2.0 - vec3(1.0));
+    } else {
+        dLightDirNormW = normalize(dir * 2.0 - vec3(1.0));
 
-    float vlight = saturate(dot(dLightDirNormW, -dVertexNormalW));
-    float flight = saturate(dot(dLightDirNormW, -dNormalW));
-    float nlight = (flight / max(vlight,0.01)) * 0.5;
+        float vlight = saturate(dot(dLightDirNormW, -dVertexNormalW));
+        float flight = saturate(dot(dLightDirNormW, -dNormalW));
+        float nlight = (flight / max(vlight, 0.01)) * 0.5;
 
-    dDiffuseLight += color * nlight * 2.0;
-}
-
-void addDirLightMap() {
-    vec4 dir = texture2D(texture_dirLightMap, $UV);
-    if (dot(dir.xyz,vec3(1.0)) < 0.00001) return;
-    vec3 color = $texture2DSAMPLE(texture_lightMap, $UV).$CH;
+        dDiffuseLight += color * nlight * 2.0;
+    }
 
-    dLightDirNormW = normalize(dir.xyz * 2.0 - vec3(1.0));
-    dSpecularLight += vec3(getLightSpecular()) * color;
+    dSpecularLight += color * getLightSpecular();
 }
diff --git a/src/graphics/program-lib/programs/standard.js b/src/graphics/program-lib/programs/standard.js
@@ -1454,10 +1454,6 @@ var standard = {
                 code += "   addReflection();\n";
             }
 
-            if (options.dirLightMap) {
-                code += "   addDirLightMap();\n";
-            }
-
             for (i = 0; i < options.lights.length; i++) {
                 // The following code is not decoupled to separate shader files, because most of it can be actually changed to achieve different behaviors like:
                 // - different falloffs
