diff options
author | Graham Linden <graham@lindenlab.com> | 2018-07-10 23:26:35 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-07-10 23:26:35 +0100 |
commit | ffdd6c3d7dad87e9873067a923d4e7ce9e6d4d2c (patch) | |
tree | b28dd084c3e016e91c2860a90d52507cd29c0dcc /indra/newview/app_settings | |
parent | a90e61b798711306496c2ed7aa5cce6d096ea466 (diff) |
Make advanced atmo sky shader compile again.
Make atmospheric model avoid redundant work when settings don't change.
Point autobuild.xml at libatmosphere with op== to compare density profiles.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/skyF.glsl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class3/deferred/skyF.glsl index 0fb990611e..43c0505046 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/skyF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/skyF.glsl @@ -60,17 +60,17 @@ void main() vec3 radiance_sun = GetSkyLuminance(camPos, view_direction, 0.0f, sun_direction, transmittance); vec3 radiance2_sun = GetSunAndSkyIlluminance(camPos, view_direction, sun_direction, sky_illum); - radiance *= transmittance; + radiance_sun *= transmittance; vec3 solar_luminance = transmittance * GetSolarLuminance(); // If the view ray intersects the Sun, add the Sun radiance. if (dot(view_direction, sun_direction) >= sun_size) { - radiance = radiance + solar_luminance; + radiance_sun = radiance_sun + solar_luminance; } - vec3 color = radiance; + vec3 color = radiance_sun; color = vec3(1.0) - exp(-color * 0.0001); @@ -79,7 +79,7 @@ void main() frag_color.rgb = color; //frag_color.rgb = vec3(dot(view_direction, sun_direction) > 0.95f ? 1.0 : 0.0, 0,0); - frag_color.rgb = normalize(view_pos); + //frag_color.rgb = normalize(view_pos); frag_color.a = 1.0; } |