Only apply ambient occlusion to the ambient lighting component

[libs/gl.git] / shaderlib / cooktorrance.glsl

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index e942b49ebab2bb5cb9e5553b004e5e112b36fe5e..25289ed57bc916af3eb41a4f9893d99289399618 100644 (file)
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -6,6 +6,7 @@ import shadow;
 struct PbrMaterialParameters
 {
        vec4 base_color;
+       vec4 tint;
        vec4 emission;
        float metalness;
        float roughness;
@@ -14,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;
@@ -31,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()
@@ -164,9 +164,8 @@ 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();
+       float occlusion = get_occlusion_value();
+       color += cooktorrance_environment(normal, look, base_color, metalness, roughness)*occlusion;
 
        if(use_emission)
                color += get_emission_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);
 }