asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #12327 from tagcup/zero_roughness

Browse source 
Partially undo #11807.
This commit is contained in:
Rémi Verschelde 2017-10-22 22:49:55 +02:00 committed by GitHub
commit bf4ba3d8c0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gles3/shaders/scene.glsl
View file

@ -169,7 +169,7 @@ void light_compute(vec3 N, vec3 L,vec3 V, vec3 light_color, float roughness, ino
float dotNL = max(dot(N,L), 0.0 ); float dotNL = max(dot(N,L), 0.0 );
diffuse += dotNL * light_color / M_PI; diffuse += dotNL * light_color / M_PI;
if (roughness < 1.0) { if (roughness > 0.0) {
vec3 H = normalize(V + L); vec3 H = normalize(V + L);
float dotNH = max(dot(N,H), 0.0 ); float dotNH = max(dot(N,H), 0.0 );
@ -1034,7 +1034,7 @@ LIGHT_SHADER_CODE
} }
if (roughness < 1.0) { if (roughness > 0.0) { // FIXME: roughness == 0 should not disable specular light entirely
// D // D