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

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index e942b49e..1c564a04 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -14,7 +14,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;
@@ -31,7 +31,6 @@ 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()
@@ -177,8 +176,7 @@ 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);
@@ -188,5 +186,5 @@ void main()
 
 	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);
 }