Ensure that Lambert is energy conserving.

Also remove the diffuse_color factor in Oren-Nayar (which was already taken care of below, oops).
This commit is contained in:
Ferenc Arn 2017-09-29 09:03:37 -04:00
parent 2c5fa0947d
commit 33c600fedc

View file

@ -932,7 +932,7 @@ LIGHT_SHADER_CODE
vec3 A = 1.0 + sigma2 * (- 0.5 / (sigma2 + 0.33) + 0.17*diffuse_color / (sigma2 + 0.13) );
float B = 0.45 * sigma2 / (sigma2 + 0.09);
light_amount = diffuse_color * dotNL * (A + vec3(B) * s / t) / M_PI;
light_amount = dotNL * (A + vec3(B) * s / t) / M_PI;
}
#elif defined(DIFFUSE_TOON)
@ -965,7 +965,7 @@ LIGHT_SHADER_CODE
}
#else
//lambert
light_amount = dotNL;
light_amount = dotNL / M_PI;
#endif
#if defined(TRANSMISSION_USED)