X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=8a69d473e83935adf8d8d866b2beab07518e22ea;hb=7a5d84b06d0217c5edad5d9f4ef51404de0cb911;hp=ad1a459d2e32932d9cb79a0501fb339b5ad6b7ba;hpb=ae423e6ef278388f92802fbae34b1c7ec339292f;p=libs%2Fgl.git

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index ad1a459d..8a69d473 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -1,27 +1,29 @@
 import msp_interface;
 import common;
+import environment;
 import shadow;
 
 struct PbrMaterialParameters
 {
 	vec4 base_color;
+	vec4 tint;
 	vec4 emission;
 	float metalness;
 	float roughness;
 };
 
-uniform PbrMaterial
+layout(set=1) uniform PbrMaterial
 {
 	PbrMaterialParameters pbr_material;
-	float alpha_cutoff;
+	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;
@@ -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()
@@ -176,8 +177,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);
@@ -187,5 +187,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);
 }