Skip to content
Snippets Groups Projects
Commit 9aaa03a0 authored by Ptolemy's avatar Ptolemy
Browse files

SL-9632 Fix Haze effecting HUD objects

parent a2ea1aac
No related branches found
No related tags found
No related merge requests found
...@@ -31,6 +31,9 @@ out vec4 frag_color; ...@@ -31,6 +31,9 @@ out vec4 frag_color;
uniform float minimum_alpha; uniform float minimum_alpha;
// render_hud_attachments() -> HUD objects set LLShaderMgr::NO_ATMO;
uniform int no_atmo;
vec3 atmosLighting(vec3 light); vec3 atmosLighting(vec3 light);
vec3 scaleSoftClip(vec3 light); vec3 scaleSoftClip(vec3 light);
...@@ -48,9 +51,12 @@ void default_lighting() ...@@ -48,9 +51,12 @@ void default_lighting()
color *= vertex_color; color *= vertex_color;
color.rgb = atmosLighting(color.rgb); // SL-9632 HUDs are affected by Atmosphere
if (no_atmo == 0)
color.rgb = scaleSoftClip(color.rgb); {
color.rgb = atmosLighting(color.rgb);
color.rgb = scaleSoftClip(color.rgb);
}
frag_color = color; frag_color = color;
} }
......
...@@ -32,6 +32,9 @@ out vec4 frag_color; ...@@ -32,6 +32,9 @@ out vec4 frag_color;
uniform float minimum_alpha; uniform float minimum_alpha;
uniform float texture_gamma; uniform float texture_gamma;
// render_hud_attachments() -> HUD objects set LLShaderMgr::NO_ATMO; used in LLDrawPoolAlpha::beginRenderPass()
uniform int no_atmo;
vec3 fullbrightAtmosTransport(vec3 light); vec3 fullbrightAtmosTransport(vec3 light);
vec3 fullbrightScaleSoftClip(vec3 light); vec3 fullbrightScaleSoftClip(vec3 light);
...@@ -50,9 +53,13 @@ void fullbright_lighting() ...@@ -50,9 +53,13 @@ void fullbright_lighting()
color.rgb *= vertex_color.rgb; color.rgb *= vertex_color.rgb;
color.rgb = pow(color.rgb, vec3(texture_gamma)); color.rgb = pow(color.rgb, vec3(texture_gamma));
color.rgb = fullbrightAtmosTransport(color.rgb);
// SL-9632 HUDs are affected by Atmosphere
color.rgb = fullbrightScaleSoftClip(color.rgb); if (no_atmo == 0)
{
color.rgb = fullbrightAtmosTransport(color.rgb);
color.rgb = fullbrightScaleSoftClip(color.rgb);
}
frag_color = color; frag_color = color;
} }
......
...@@ -34,6 +34,9 @@ VARYING vec2 vary_texcoord0; ...@@ -34,6 +34,9 @@ VARYING vec2 vary_texcoord0;
uniform float texture_gamma; uniform float texture_gamma;
// render_hud_attachments() -> HUD objects set LLShaderMgr::NO_ATMO;
uniform int no_atmo;
vec3 fullbrightAtmosTransport(vec3 light); vec3 fullbrightAtmosTransport(vec3 light);
vec3 fullbrightScaleSoftClip(vec3 light); vec3 fullbrightScaleSoftClip(vec3 light);
...@@ -43,9 +46,12 @@ void fullbright_lighting() ...@@ -43,9 +46,12 @@ void fullbright_lighting()
color.rgb = pow(color.rgb, vec3(texture_gamma)); color.rgb = pow(color.rgb, vec3(texture_gamma));
color.rgb = fullbrightAtmosTransport(color.rgb); // SL-9632 HUDs are affected by Atmosphere
if (no_atmo == 0)
color.rgb = fullbrightScaleSoftClip(color.rgb); {
color.rgb = fullbrightAtmosTransport(color.rgb);
color.rgb = fullbrightScaleSoftClip(color.rgb);
}
color.rgb = pow(color.rgb, vec3(1.0/texture_gamma)); color.rgb = pow(color.rgb, vec3(1.0/texture_gamma));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment