X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=f8aed8267273fcb4f1ac97c929e3823ba29dbcb0;hb=e05c77d2e3582a6962f42dcec0fc5f7845ff448d;hp=d834cee462d429ca2d439107caca5ad3e1c55c8d;hpb=70d9d2d28e5fe723c6b46894276e4c935f578e2d;p=libs%2Fgl.git

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index d834cee4..f8aed826 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -20,6 +20,7 @@ uniform sampler2D metalness_map;
 uniform sampler2D roughness_map;
 uniform sampler2D occlusion_map;
 uniform sampler2D emission_map;
+uniform sampler2D fresnel_lookup;
 
 layout(constant_id=auto) const bool use_base_color_map = false;
 layout(constant_id=auto) const bool use_metalness_map = false;
@@ -114,7 +115,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 */
@@ -127,20 +128,28 @@ vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 ligh
 	vec3 k_spec = fresnel_schlick(halfway, light, base_color, metalness);
 	vec3 k_diff = (1.0-k_spec)*(1.0-metalness);
 
-	float denom = max(4.0*max(dot(normal, -look), 0.0)*max(dot(normal, light), 0.0), 0.001);
-	return max(dot(normal, light), 0.0)*light_color*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/denom);
+	float spec_denom = max(4.0*max(dot(normal, -look), 0.0)*max(dot(normal, light), 0.0), 0.001);
+	return max(dot(normal, light), 0.0)*light_color*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/spec_denom);
+}
+
+vec3 cooktorrance_environment(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness)
+{
+	vec3 f0 = mix(vec3(0.04), base_color, metalness);
+	vec2 scale_bias = texture(fresnel_lookup, vec2(roughness, max(dot(normal, -look), 0.0))).rg;
+	vec3 k_spec = f0*scale_bias.x+scale_bias.y;
+	vec3 k_diff = (1.0-k_spec)*(1.0-metalness);
+
+	return (k_diff*base_color+k_spec)*ambient_color.rgb;
 }
 
 vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness)
 {
-	vec3 light;
-	if(use_normal_map)
-		light = normalize(tbn_light_dir);
-	else
-		light = normalize(eye_light_dir);
+	vec3 light = normalize(world_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 += cooktorrance_environment(normal, look, base_color, metalness, roughness);
 
 	color *= get_occlusion_value();
 
@@ -152,18 +161,8 @@ vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metaln
 
 void main()
 {
-	vec3 normal;
-	vec3 look;
-	if(use_normal_map)
-	{
-		normal = get_fragment_normal();
-		look = normalize(tbn_look_dir);
-	}
-	else
-	{
-		normal = normalize(eye_normal);
-		look = normalize(eye_look_dir);
-	}
+	vec3 normal = get_fragment_normal();
+	vec3 look = normalize(world_look_dir);
 
 	vec4 base_color = get_base_color();
 	float metalness = get_metalness_value();