X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=4b0c4dc814ca5b16e903d7003f1371b96b3c6503;hb=b6dbbbee0c7e6a3af10391f2d9f4bb9e007afb29;hp=2a03e2c51c049095ca23a23dbefbdc432e2d40e0;hpb=55e3f2d494d939280a4ea48676fd17ca2342b457;p=libs%2Fgl.git

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index 2a03e2c5..4b0c4dc8 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;
@@ -27,8 +28,7 @@ layout(constant_id=auto) const bool use_roughness_map = false;
 layout(constant_id=auto) const bool use_occlusion_map = false;
 layout(constant_id=auto) const bool use_emission = false;
 layout(constant_id=auto) const bool use_emission_map = false;
-
-const float PI = 3.1415926535;
+layout(constant_id=auto) const bool use_image_based_lighting = false;
 
 #pragma MSP stage(fragment)
 virtual vec4 get_base_color()
@@ -131,17 +131,33 @@ vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 ligh
 	return max(dot(normal, light), 0.0)*light_color*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/spec_denom);
 }
 
-vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness)
+vec3 cooktorrance_environment(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness)
 {
-	vec3 light;
-	if(use_normal_map)
-		light = normalize(tbn_light_dir);
+	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);
+
+	if(use_image_based_lighting)
+	{
+		vec3 irradiance = get_irradiance_sample(normal);
+		vec3 reflection = get_environment_sample(reflect(look, normal), roughness).rgb;
+
+		return k_diff*irradiance*base_color+k_spec*reflection;
+	}
 	else
-		light = normalize(eye_light_dir);
+		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 = normalize(world_light_dir);
 
 	float shadow = get_shadow_factor(0);
 	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();
 
 	if(use_emission)
@@ -152,18 +168,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();