fix for safari - uninitialized variables

raytranuk · raytranuk · commit 4de7304ffff2 · 2021-06-01T17:35:14.000+01:00
diff --git a/src/graphics/program-lib/chunks/lightSpecularPhong.frag b/src/graphics/program-lib/chunks/lightSpecularPhong.frag
@@ -5,6 +5,8 @@ vec3 calcLightSpecular(float tGlossiness, vec3 tReflDirW, vec3 F0, out vec3 tFre
 
     float rl = max(dot(tReflDirW, -dLightDirNormW), 0.0);
 
+    tFresnel = vec3(1);
+
     // Hack: On Mac OS X, calling pow with zero for the exponent generates hideous artifacts so bias up a little
     return vec3(pow(rl, specPow + 0.0001));
 }
diff --git a/src/graphics/program-lib/programs/standard.js b/src/graphics/program-lib/programs/standard.js
@@ -1281,8 +1281,8 @@ var standard = {
             code += chunks.lightDiffuseLambertPS;
 
             // used for energy conservation and to modulate specular with half-angle fresnel
-            code += "vec3 dLightFresnel;\n";
-            code += "vec3 ccLightFresnel;\n\n";
+            code += "vec3 dLightFresnel = vec3(0);\n";
+            code += "vec3 ccLightFresnel = vec3(0);\n\n";
 
             if (hasAreaLights) code += chunks.ltc;
         }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ vec3 calcLightSpecular(float tGlossiness, vec3 tReflDirW, vec3 F0, out vec3 tFre`
`5`	`5`
`6`	`6`	`float rl = max(dot(tReflDirW, -dLightDirNormW), 0.0);`
`7`	`7`
	`8`	`+ tFresnel = vec3(1);`
	`9`	`+`
`8`	`10`	`// Hack: On Mac OS X, calling pow with zero for the exponent generates hideous artifacts so bias up a little`
`9`	`11`	`return vec3(pow(rl, specPow + 0.0001));`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1281,8 +1281,8 @@ var standard = {`
`1281`	`1281`	`code += chunks.lightDiffuseLambertPS;`
`1282`	`1282`
`1283`	`1283`	`// used for energy conservation and to modulate specular with half-angle fresnel`
`1284`		`- code += "vec3 dLightFresnel;\n";`
`1285`		`- code += "vec3 ccLightFresnel;\n\n";`
	`1284`	`+ code += "vec3 dLightFresnel = vec3(0);\n";`
	`1285`	`+ code += "vec3 ccLightFresnel = vec3(0);\n\n";`
`1286`	`1286`
`1287`	`1287`	`if (hasAreaLights) code += chunks.ltc;`
`1288`	`1288`	`}`