Fix Area Lights and Half angle fresnel changes (playcanvas#3190)

raytranuk · willeastcott · slimbuck · web-flow · commit 445dbc5ca619 · 2021-05-24T19:59:47.000+01:00
* fix area lights

* remove whitespace

Co-authored-by: Will Eastcott &lt;will@playcanvas.com&gt;
Co-authored-by: Donovan Hutchence &lt;slimbuck7@gmail.com&gt;
diff --git a/src/graphics/program-lib/chunks/ltc.frag b/src/graphics/program-lib/chunks/ltc.frag
@@ -407,12 +407,12 @@ float calcRectLightSpecular(vec3 tNormalW, vec2 uv) {
 	return LTC_EvaluateRect( tNormalW, dViewDirW, vPositionW, mInv, dLTCCoords );
 }
 
-float getRectLightSpecular() {
+vec3 getRectLightSpecular() {
     return dLightFresnel * calcRectLightSpecular(dNormalW, dLTCUV);
 }
 
 #ifdef CLEARCOAT
-float getRectLightSpecularCC() {
+vec3 getRectLightSpecularCC() {
     return ccLightFresnel * calcRectLightSpecular(ccNormalW, ccLTCUV);
 }
 #endif
@@ -422,22 +422,22 @@ float calcDiskLightSpecular(vec3 tNormalW, vec2 uv) {
 	return LTC_EvaluateDisk( tNormalW, dViewDirW, vPositionW, mInv, dLTCCoords );
 }
 
-float getDiskLightSpecular() {
+vec3 getDiskLightSpecular() {
     return dLightFresnel * calcDiskLightSpecular(dNormalW, dLTCUV);
 }
 
 #ifdef CLEARCOAT
-float getDiskLightSpecularCC() {
+vec3 getDiskLightSpecularCC() {
     return ccLightFresnel * calcDiskLightSpecular(ccNormalW, ccLTCUV);
 }
 #endif
 
-float getSphereLightSpecular() {
+vec3 getSphereLightSpecular() {
     return dLightFresnel * calcDiskLightSpecular(dNormalW, dLTCUV);
 }
 
 #ifdef CLEARCOAT
-float getSphereLightSpecularCC() {
+vec3 getSphereLightSpecularCC() {
     return ccLightFresnel * calcDiskLightSpecular(ccNormalW, ccLTCUV);
 }
 #endif
diff --git a/src/graphics/program-lib/programs/standard.js b/src/graphics/program-lib/programs/standard.js
@@ -1279,15 +1279,16 @@ var standard = {
 
         if (lighting) {
             code += chunks.lightDiffuseLambertPS;
+
+            // used for energy conservation and to modulate specular with half-angle fresnel
+            code += "vec3 dLightFresnel;\n";
+            code += "vec3 ccLightFresnel;\n\n";
+
             if (hasAreaLights) code += chunks.ltc;
         }
         var useOldAmbient = false;
         if (options.useSpecular) {
             if (lighting) {
-                // used for energy conservation and to modulate specular with half-angle fresnel
-                code += "vec3 dLightFresnel;\n";
-                code += "vec3 ccLightFresnel;\n\n";
-
                 code += options.shadingModel === SPECULAR_PHONG ? chunks.lightSpecularPhongPS : (options.enableGGXSpecular) ? chunks.lightSpecularAnisoGGXPS : chunks.lightSpecularBlinnPS;
             }
             if (options.sphereMap || cubemapReflection || options.dpAtlas || (options.fresnelModel > 0)) {

Original file line number	Diff line number	Diff line change
`@@ -407,12 +407,12 @@ float calcRectLightSpecular(vec3 tNormalW, vec2 uv) {`
`407`	`407`	`return LTC_EvaluateRect( tNormalW, dViewDirW, vPositionW, mInv, dLTCCoords );`
`408`	`408`	`}`
`409`	`409`
`410`		`-float getRectLightSpecular() {`
	`410`	`+vec3 getRectLightSpecular() {`
`411`	`411`	`return dLightFresnel * calcRectLightSpecular(dNormalW, dLTCUV);`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`#ifdef CLEARCOAT`
`415`		`-float getRectLightSpecularCC() {`
	`415`	`+vec3 getRectLightSpecularCC() {`
`416`	`416`	`return ccLightFresnel * calcRectLightSpecular(ccNormalW, ccLTCUV);`
`417`	`417`	`}`
`418`	`418`	`#endif`
`@@ -422,22 +422,22 @@ float calcDiskLightSpecular(vec3 tNormalW, vec2 uv) {`
`422`	`422`	`return LTC_EvaluateDisk( tNormalW, dViewDirW, vPositionW, mInv, dLTCCoords );`
`423`	`423`	`}`
`424`	`424`
`425`		`-float getDiskLightSpecular() {`
	`425`	`+vec3 getDiskLightSpecular() {`
`426`	`426`	`return dLightFresnel * calcDiskLightSpecular(dNormalW, dLTCUV);`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`#ifdef CLEARCOAT`
`430`		`-float getDiskLightSpecularCC() {`
	`430`	`+vec3 getDiskLightSpecularCC() {`
`431`	`431`	`return ccLightFresnel * calcDiskLightSpecular(ccNormalW, ccLTCUV);`
`432`	`432`	`}`
`433`	`433`	`#endif`
`434`	`434`
`435`		`-float getSphereLightSpecular() {`
	`435`	`+vec3 getSphereLightSpecular() {`
`436`	`436`	`return dLightFresnel * calcDiskLightSpecular(dNormalW, dLTCUV);`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`#ifdef CLEARCOAT`
`440`		`-float getSphereLightSpecularCC() {`
	`440`	`+vec3 getSphereLightSpecularCC() {`
`441`	`441`	`return ccLightFresnel * calcDiskLightSpecular(ccNormalW, ccLTCUV);`
`442`	`442`	`}`
`443`	`443`	`#endif`