Redesign Light to only have a single color

[libs/gl.git] / shaderlib / cooktorrance.glsl

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index d834cee462d429ca2d439107caca5ad3e1c55c8d..4315b9ec8b7a8328db3b8ead0661cf8ca4016c24 100644 (file)
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -114,7 +114,7 @@ vec3 fresnel_schlick(vec3 halfway, vec3 look, vec3 base_color, float metalness)
 {
        // 0.04 is a decent approximation for dielectric base reflectivity
        vec3 f0 = mix(vec3(0.04), base_color, metalness);
-       return mix(f0, vec3(1.0), pow(1.0-dot(halfway, look), 5.0));
+       return mix(f0, vec3(1.0), pow(max(1.0-dot(halfway, look), 0.0), 5.0));
 }
 
 /* Computes the full contribution of a single light */
@@ -140,7 +140,7 @@ vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metaln
                light = normalize(eye_light_dir);
 
        float shadow = get_shadow_factor(0);
-       vec3 color = cooktorrance_one_light_direct(normal, look, light, light_sources[0].diffuse.rgb, base_color, metalness, roughness)*shadow;
+       vec3 color = cooktorrance_one_light_direct(normal, look, light, light_sources[0].color, base_color, metalness, roughness)*shadow;
 
        color *= get_occlusion_value();