Merge branch 'master' of github.com:supertuxkart/stk-code

This commit is contained in:
hiker 2014-12-14 12:52:13 +11:00
commit 17fe9812b1
2 changed files with 2 additions and 2 deletions

View File

@ -29,5 +29,5 @@ void main(void)
weight += NdotL; weight += NdotL;
} }
FragColor = FinalColor / max(weight, 1.); FragColor = FinalColor / weight;
} }

View File

@ -7,5 +7,5 @@ vec3 SpecularIBL(vec3 normal, vec3 V, float roughness)
// Assume 8 level of lod (ie 256x256 texture) // Assume 8 level of lod (ie 256x256 texture)
float lodval = 8. * (1. - roughness); float lodval = 8. * (1. - roughness);
return textureLod(probe, sampleDirection, lodval).rgb; return clamp( textureLod(probe, sampleDirection, lodval).rgb, 0., 1.);
} }