X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=1c564a04557a39b3b0ab951b8c2b86acb7f4b32e;hb=4595453156db0c47926946b0ea1732b1e37e70ce;hp=7eefbf60eb52e96a9ab320e6c9c42e1ccc4d1e40;hpb=d4b030f46c3a643e813cf31e3faa2b4f3662a160;p=libs%2Fgl.git

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index 7eefbf60..1c564a04 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -1,5 +1,6 @@
 import msp_interface;
 import common;
+import environment;
 import shadow;
 
 struct PbrMaterialParameters
@@ -10,17 +11,18 @@ struct PbrMaterialParameters
 	float roughness;
 };
 
-uniform PbrMaterial
+layout(set=1) uniform PbrMaterial
 {
 	PbrMaterialParameters pbr_material;
+	AlphaCutoffParams alpha_cutoff;
 };
 
-uniform sampler2D base_color_map;
-uniform sampler2D metalness_map;
-uniform sampler2D roughness_map;
-uniform sampler2D occlusion_map;
-uniform sampler2D emission_map;
-uniform sampler2D fresnel_lookup;
+layout(set=1) uniform sampler2D base_color_map;
+layout(set=1) uniform sampler2D metalness_map;
+layout(set=1) uniform sampler2D roughness_map;
+layout(set=1) uniform sampler2D occlusion_map;
+layout(set=1) uniform sampler2D emission_map;
+layout(set=1) 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;
@@ -74,7 +76,8 @@ virtual vec3 get_emission_color()
 /* Computes the diffuse reflection of the macrosurface */
 vec3 lambert_diffuse(vec3 base_color)
 {
-	// Scale by pi to get a result per steradian, suitable for integration
+	/* Scale by pi (cosine-weighted area of a hemisphere) because the light
+	scatters in every direction */
 	return base_color/PI;
 }
 
@@ -118,7 +121,7 @@ vec3 fresnel_schlick(vec3 halfway, vec3 look, vec3 base_color, float metalness)
 }
 
 /* Computes the full contribution of a single light */
-vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 light_color, vec3 base_color, float metalness, float roughness)
+vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 base_color, float metalness, float roughness)
 {
 	vec3 halfway = normalize(light-look);
 	float ndist = normal_distribution_ggxtr(normal, halfway, roughness);
@@ -128,7 +131,7 @@ vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 ligh
 	vec3 k_diff = (1.0-k_spec)*(1.0-metalness);
 
 	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);
+	return max(dot(normal, light), 0.0)*(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)
@@ -153,11 +156,11 @@ vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metaln
 {
 	vec3 color = vec3(0.0);
 	for(int i=0; i<max_lights; ++i)
-		if(light_sources[i].enabled!=0)
+		if(light_sources[i].type!=0)
 		{
-			vec3 light = get_light_direction(i);
-			float shadow = get_shadow_factor(i);
-			color += cooktorrance_one_light_direct(normal, look, light, light_sources[i].color, base_color, metalness, roughness)*shadow;
+			IncomingLight incoming = get_incoming_light(i, world_vertex.xyz);
+			float shadow = get_shadow_factor(i, world_vertex);
+			color += cooktorrance_one_light_direct(normal, look, incoming.direction, base_color, metalness, roughness)*incoming.color*shadow;
 		}
 
 	color += cooktorrance_environment(normal, look, base_color, metalness, roughness);
@@ -172,14 +175,16 @@ vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metaln
 
 void main()
 {
+	vec4 base_color = get_base_color();
+	float alpha = apply_alpha_cutoff(base_color.a, alpha_cutoff);
+
 	vec3 normal = get_fragment_normal();
 	vec3 look = normalize(world_look_dir);
 
-	vec4 base_color = get_base_color();
 	float metalness = get_metalness_value();
 	float roughness = get_roughness_value();
 
 	vec3 lit_color = cooktorrance_lighting(normal, look, base_color.rgb, metalness, roughness);
 
-	frag_color = vec4(lit_color, base_color.a);
+	frag_color = vec4(lit_color, alpha);
 }