summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2/windlight
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-19 08:26:03 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-19 08:26:03 -0700
commitf30a649f1cd789510b2f4e0b2b2f85043cdfd700 (patch)
treec1b445fc42c4676136f15da32104adddbad075cc /indra/newview/app_settings/shaders/class2/windlight
parentea9c8e4325b1f3629b57c36208c7669e1f028c10 (diff)
SL-10967
All paths now use the same atmospheric transport calcs.
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/windlight')
-rw-r--r--indra/newview/app_settings/shaders/class2/windlight/transportF.glsl23
1 files changed, 2 insertions, 21 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl
index 868f5fe601..2e8946252b 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl
@@ -43,25 +43,6 @@ vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
return light;
}
-vec3 fullbrightAtmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
-{
- if (no_atmo == 1)
- {
- return light;
- }
- float brightness = dot(light.rgb, vec3(0.33333));
- return mix(atmosTransportFrag(light.rgb, additive, atten), light.rgb + additive.rgb, brightness * brightness * 0.1);
-}
-
-vec3 fullbrightShinyAtmosTransportFrag(vec3 light, vec3 additive, vec3 atten) {
- if (no_atmo == 1)
- {
- return light;
- }
- float brightness = dot(light.rgb, vec3(0.33333));
- return mix(atmosTransportFrag(light.rgb, additive, atten), (light.rgb + additive.rgb) * (2.0 - brightness), brightness * brightness * 0.1);
-}
-
vec3 atmosTransport(vec3 light)
{
return atmosTransportFrag(light, getAdditiveColor(), getAtmosAttenuation());
@@ -69,10 +50,10 @@ vec3 atmosTransport(vec3 light)
vec3 fullbrightAtmosTransport(vec3 light)
{
- return fullbrightAtmosTransportFrag(light,getAdditiveColor(), getAtmosAttenuation());
+ return atmosTransportFrag(light,getAdditiveColor(), getAtmosAttenuation());
}
vec3 fullbrightShinyAtmosTransport(vec3 light)
{
- return fullbrightShinyAtmosTransportFrag(light,getAdditiveColor(), getAtmosAttenuation());
+ return atmosTransportFrag(light,getAdditiveColor(), getAtmosAttenuation());
}