diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-06-06 14:34:14 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-06-06 14:34:14 -0700 |
| commit | a7856d4fc5b765b2e381f7606633db9431a3a80c (patch) | |
| tree | fd553b76f323241ec3c63f12ed577caeedf4913f /indra/newview/app_settings/shaders | |
| parent | 7049757342a45a60d1d35bd59a6af307a17cf0d4 (diff) | |
SL-11374
Use color channel for trees instead of shenanigans to get proper diffuse colors to shaders.
Remove fudge factors on density modifier in class1 sky.
Diffstat (limited to 'indra/newview/app_settings/shaders')
3 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl index 46d09c5aae..9f49432c7d 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl @@ -103,7 +103,7 @@ void main() vec4 sunlight = sunlight_color; vec4 light_atten; - float dens_mul = density_multiplier * 0.45; + float dens_mul = density_multiplier; // Sunlight attenuation effect (hue and brightness) due to atmosphere // this is used later for sunlight modulation at various altitudes diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl index de8327eff3..1ab0bc4c20 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl @@ -87,7 +87,7 @@ void main() vec4 sunlight = (sun_up_factor == 1) ? sunlight_color : moonlight_color; vec4 light_atten; - float dens_mul = density_multiplier * 0.45; + float dens_mul = density_multiplier; // Sunlight attenuation effect (hue and brightness) due to atmosphere // this is used later for sunlight modulation at various altitudes diff --git a/indra/newview/app_settings/shaders/class1/objects/treeV.glsl b/indra/newview/app_settings/shaders/class1/objects/treeV.glsl index 179d3c42a4..0227e6e3b8 100644 --- a/indra/newview/app_settings/shaders/class1/objects/treeV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/treeV.glsl @@ -56,6 +56,4 @@ void main() vec4 color = calcLighting(pos.xyz, norm, diffuse_color); vertex_color = color; - - } |