X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=5e933d5a55239d7db0fb18a35b068c2b768975f2;hb=7c797f8445ab02381e358472755e94e5c5125252;hp=fe6179b783ba27fc50fdb164e5e6ba30f3536832;hpb=a741acd5c501c03de5181656498d2bcbe0df9157;p=libs%2Fgl.git

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index fe6179b7..5e933d5a 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -1,10 +1,12 @@
 import msp_interface;
 import common;
+import environment;
 import shadow;
 
 struct PbrMaterialParameters
 {
 	vec4 base_color;
+	vec4 tint;
 	vec4 emission;
 	float metalness;
 	float roughness;
@@ -13,7 +15,7 @@ struct PbrMaterialParameters
 layout(set=1) uniform PbrMaterial
 {
 	PbrMaterialParameters pbr_material;
-	float alpha_cutoff;
+	AlphaCutoffParams alpha_cutoff;
 };
 
 layout(set=1) uniform sampler2D base_color_map;
@@ -30,15 +32,14 @@ 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;
 layout(constant_id=auto) const bool use_image_based_lighting = false;
-layout(constant_id=auto) const bool use_alpha_cutoff = false;
 
 #pragma MSP stage(fragment)
 virtual vec4 get_base_color()
 {
 	if(use_base_color_map)
-		return texture(base_color_map, texcoord.xy);
+		return texture(base_color_map, texcoord.xy)*pbr_material.tint;
 	else
-		return pbr_material.base_color;
+		return pbr_material.base_color*pbr_material.tint;
 }
 
 virtual float get_metalness_value()
@@ -152,7 +153,7 @@ vec3 cooktorrance_environment(vec3 normal, vec3 look, vec3 base_color, float met
 		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 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness, float occlusion)
 {
 	vec3 color = vec3(0.0);
 	for(int i=0; i<max_lights; ++i)
@@ -163,12 +164,7 @@ vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metaln
 			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);
-
-	color *= get_occlusion_value();
-
-	if(use_emission)
-		color += get_emission_color();
+	color += cooktorrance_environment(normal, look, base_color, metalness, roughness)*occlusion;
 
 	return color;
 }
@@ -176,16 +172,18 @@ vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metaln
 void main()
 {
 	vec4 base_color = get_base_color();
-	if(use_alpha_cutoff && base_color.a<alpha_cutoff)
-		discard;
+	float alpha = apply_alpha_cutoff(base_color.a, alpha_cutoff);
 
 	vec3 normal = get_fragment_normal();
 	vec3 look = normalize(world_look_dir);
 
 	float metalness = get_metalness_value();
 	float roughness = get_roughness_value();
+	float occlusion = get_occlusion_value();
 
-	vec3 lit_color = cooktorrance_lighting(normal, look, base_color.rgb, metalness, roughness);
+	vec3 lit_color = cooktorrance_lighting(normal, look, base_color.rgb, metalness, roughness, occlusion);
+	if(use_emission)
+		lit_color += get_emission_color();
 
-	frag_color = vec4(lit_color, base_color.a);
+	frag_color = vec4(lit_color, alpha);
 }