diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:46:30 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:46:30 +0000 |
| commit | 72270213f5eebd019b10bdd6ec15020ba3d2ecf5 (patch) | |
| tree | be92c250563eedb720940b32cf42e328a49ea6b6 /indra/newview | |
| parent | 31017934581437836e847d8fcb5a76489f3baf50 (diff) | |
Add 3p package for adv atmospherics to autobuild.
Mark legacy atmospherics code with ifdefs.
Fix up legacy uplift to include new atmospherics settings.
Diffstat (limited to 'indra/newview')
45 files changed, 2137 insertions, 203 deletions
diff --git a/indra/newview/app_settings/shaders/class3/windlight/advancedAtmoF.glsl b/indra/newview/app_settings/shaders/class3/windlight/advancedAtmoF.glsl index c71eaf4b13..d27363a60c 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/advancedAtmoF.glsl +++ b/indra/newview/app_settings/shaders/class3/windlight/advancedAtmoF.glsl @@ -33,9 +33,7 @@ in vec3 view_dir; uniform vec3 cameraPosLocal; uniform vec3 sun_direction; -uniform vec2 sun_size; -uniform sampler2D cloud_noise_texture; uniform sampler2D transmittance_texture; uniform sampler3D scattering_texture; uniform sampler3D mie_scattering_texture; diff --git a/indra/newview/app_settings/shaders/class3/windlight/skyF.glsl b/indra/newview/app_settings/shaders/class3/windlight/skyF.glsl index e2a2367626..c71eaf4b13 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/skyF.glsl +++ b/indra/newview/app_settings/shaders/class3/windlight/skyF.glsl @@ -1,5 +1,5 @@ /** - * @file WLSkyF.glsl + * @file advancedAtmoF.glsl * * $LicenseInfo:firstyear=2005&license=viewerlgpl$ * Second Life Viewer Source Code @@ -29,37 +29,43 @@ out vec4 frag_color; #define frag_color gl_FragColor #endif -///////////////////////////////////////////////////////////////////////// -// The fragment shader for the sky -///////////////////////////////////////////////////////////////////////// +in vec3 view_dir; -VARYING vec4 vary_HazeColor; +uniform vec3 cameraPosLocal; +uniform vec3 sun_direction; +uniform vec2 sun_size; uniform sampler2D cloud_noise_texture; -uniform vec4 gamma; +uniform sampler2D transmittance_texture; +uniform sampler3D scattering_texture; +uniform sampler3D mie_scattering_texture; -/// Soft clips the light with a gamma correction -vec3 scaleSoftClip(vec3 light) { - //soft clip effect: - light = 1. - clamp(light, vec3(0.), vec3(1.)); - light = 1. - pow(light, gamma.xxx); - - return light; -} +vec3 GetSolarLuminance(); +vec3 GetSkyLuminance(vec3 camPos, vec3 view_dir, float shadow_length, vec3 sun_dir, out vec3 transmittance); +vec3 GetSkyLuminanceToPoint(vec3 camPos, vec3 pos, float shadow_length, vec3 sun_dir, out vec3 transmittance); +vec3 GetSunAndSkyIlluminance(vec3 pos, vec3 norm, vec3 sun_dir, out vec3 sky_irradiance); void main() { - // Potential Fill-rate optimization. Add cloud calculation - // back in and output alpha of 0 (so that alpha culling kills - // the fragment) if the sky wouldn't show up because the clouds - // are fully opaque. + vec3 view_direction = normalize(view_dir); + + vec3 camPos = cameraPosLocal; + vec3 transmittance; + vec3 radiance = GetSkyLuminance(camPos, view_direction, 0.0f, sun_direction, transmittance); - vec4 color; - color = vary_HazeColor; - color *= 2.; + radiance *= transmittance; - /// Gamma correct for WL (soft clip effect). - frag_color.rgb = scaleSoftClip(color.rgb); - frag_color.a = 1.0; + // If the view ray intersects the Sun, add the Sun radiance. + if (dot(view_direction, sun_direction) >= sun_size.y) + { + radiance = radiance + transmittance * GetSolarLuminance(); + } + + vec3 color = vec3(1.0) - exp(-radiance); + color = pow(color, vec3(1.0 / 2.2)); + + frag_color.rgb = color; + + frag_color.a = 1.0; } diff --git a/indra/newview/app_settings/shaders/class3/windlight/skyV.glsl b/indra/newview/app_settings/shaders/class3/windlight/skyV.glsl index 3788ddaf2d..52a7595379 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/skyV.glsl +++ b/indra/newview/app_settings/shaders/class3/windlight/skyV.glsl @@ -1,5 +1,5 @@ /** - * @file WLSkyV.glsl + * @file advancedAtmoV.glsl * * $LicenseInfo:firstyear=2005&license=viewerlgpl$ * Second Life Viewer Source Code @@ -27,130 +27,17 @@ uniform mat4 modelview_projection_matrix; ATTRIBUTE vec3 position; -// SKY //////////////////////////////////////////////////////////////////////// -// The vertex shader for creating the atmospheric sky -/////////////////////////////////////////////////////////////////////////////// - -// Output parameters -VARYING vec4 vary_HazeColor; - // Inputs uniform vec3 camPosLocal; -uniform vec4 lightnorm; -uniform vec4 sunlight_color; -uniform vec4 ambient; -uniform vec4 blue_horizon; -uniform vec4 blue_density; -uniform float haze_horizon; -uniform float haze_density; - -uniform float cloud_shadow; -uniform float density_multiplier; -uniform float max_y; - -uniform vec4 glow; - -uniform vec4 cloud_color; +out vec3 view_dir; void main() { - // World / view / projection gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); - // Get relative position - vec3 P = position.xyz - camPosLocal.xyz + vec3(0,50,0); - //vec3 P = position.xyz + vec3(0,50,0); - - // Set altitude - if (P.y > 0.) - { - P *= (max_y / P.y); - } - else - { - P *= (-32000. / P.y); - } - - // Can normalize then - vec3 Pn = normalize(P); - float Plen = length(P); - - // Initialize temp variables - vec4 temp1 = vec4(0.); - vec4 temp2 = vec4(0.); - vec4 blue_weight; - vec4 haze_weight; - vec4 sunlight = sunlight_color; - vec4 light_atten; - - // Sunlight attenuation effect (hue and brightness) due to atmosphere - // this is used later for sunlight modulation at various altitudes - light_atten = (blue_density + vec4(haze_density * 0.25)) * (density_multiplier * max_y); - - // Calculate relative weights - temp1 = blue_density + haze_density; - blue_weight = blue_density / temp1; - haze_weight = haze_density / temp1; - - // Compute sunlight from P & lightnorm (for long rays like sky) - temp2.y = max(0., max(0., Pn.y) * 1.0 + lightnorm.y ); - temp2.y = 1. / temp2.y; - sunlight *= exp( - light_atten * temp2.y); - - // Distance - temp2.z = Plen * density_multiplier; - - // Transparency (-> temp1) - // ATI Bugfix -- can't store temp1*temp2.z in a variable because the ati - // compiler gets confused. - temp1 = exp(-temp1 * temp2.z); - - - // Compute haze glow - temp2.x = dot(Pn, lightnorm.xyz); - temp2.x = 1. - temp2.x; - // temp2.x is 0 at the sun and increases away from sun - temp2.x = max(temp2.x, .001); - // Set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot) - temp2.x *= glow.x; - // Higher glow.x gives dimmer glow (because next step is 1 / "angle") - temp2.x = pow(temp2.x, glow.z); - // glow.z should be negative, so we're doing a sort of (1 / "angle") function - - // Add "minimum anti-solar illumination" - temp2.x += .25; - - - // Haze color above cloud - vary_HazeColor = ( blue_horizon * blue_weight * (sunlight + ambient) - + (haze_horizon * haze_weight) * (sunlight * temp2.x + ambient) - ); - - - // Increase ambient when there are more clouds - vec4 tmpAmbient = ambient; - tmpAmbient += (1. - tmpAmbient) * cloud_shadow * 0.5; - - // Dim sunlight by cloud shadow percentage - sunlight *= (1. - cloud_shadow); - - // Haze color below cloud - vec4 additiveColorBelowCloud = ( blue_horizon * blue_weight * (sunlight + tmpAmbient) - + (haze_horizon * haze_weight) * (sunlight * temp2.x + tmpAmbient) - ); - - // Final atmosphere additive - vary_HazeColor *= (1. - temp1); - - // Attenuate cloud color by atmosphere - temp1 = sqrt(temp1); //less atmos opacity (more transparency) below clouds - - // At horizon, blend high altitude sky color towards the darker color below the clouds - vary_HazeColor += (additiveColorBelowCloud - vary_HazeColor) * (1. - sqrt(temp1)); - - // won't compile on mac without this being set - //vary_AtmosAttenuation = vec3(0.0,0.0,0.0); + // this will be normalized in the frag shader... + view_dir = position.xyz - camPosLocal.xyz; } diff --git a/indra/newview/app_settings/windlight/skies/A%2D12AM.xml b/indra/newview/app_settings/windlight/skies/A%2D12AM.xml index 0aba31214a..93ef76d73c 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D12AM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D12AM.xml @@ -137,5 +137,61 @@ <real>0.65999996662139893</real> <real>0.2199999988079071</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/A%2D12PM.xml b/indra/newview/app_settings/windlight/skies/A%2D12PM.xml index 119b3e1418..87b2f09e30 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D12PM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D12PM.xml @@ -137,5 +137,61 @@ <real>0.89999997615814209</real> <real>0.29999998211860657</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/A%2D3AM.xml b/indra/newview/app_settings/windlight/skies/A%2D3AM.xml index f790d3d961..cf1ce5faf2 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D3AM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D3AM.xml @@ -137,5 +137,61 @@ <real>1.1399999856948853</real> <real>0.37999999523162842</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/A%2D3PM.xml b/indra/newview/app_settings/windlight/skies/A%2D3PM.xml index ec9706773e..3d94ea0d38 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D3PM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D3PM.xml @@ -137,5 +137,61 @@ <real>0.89999997615813498</real> <real>0.29999998211860301</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/A%2D6AM.xml b/indra/newview/app_settings/windlight/skies/A%2D6AM.xml index bbc7aeec59..3932f67f29 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D6AM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D6AM.xml @@ -137,5 +137,61 @@ <real>2.369999885559082</real> <real>0.78999996185302734</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/A%2D6PM.xml b/indra/newview/app_settings/windlight/skies/A%2D6PM.xml index ebf08e1a3f..a597a1245a 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D6PM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D6PM.xml @@ -137,6 +137,62 @@ <real>2.8385701179504395</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/A%2D9AM.xml b/indra/newview/app_settings/windlight/skies/A%2D9AM.xml index 413e3a27d9..76f08de1b5 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D9AM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D9AM.xml @@ -137,5 +137,61 @@ <real>0.89999995470046912</real> <real>0.29999997496605069</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/A%2D9PM.xml b/indra/newview/app_settings/windlight/skies/A%2D9PM.xml index 292f6713b7..771bb564a4 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D9PM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D9PM.xml @@ -137,5 +137,61 @@ <real>0.66003586768772493</real> <real>0.22001197576412324</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Barcelona.xml b/indra/newview/app_settings/windlight/skies/Barcelona.xml index ea9cab8fbb..4cc92e9005 100644 --- a/indra/newview/app_settings/windlight/skies/Barcelona.xml +++ b/indra/newview/app_settings/windlight/skies/Barcelona.xml @@ -137,5 +137,61 @@ <real>1.1699999570846558</real> <real>0.38999998569488525</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Blizzard.xml b/indra/newview/app_settings/windlight/skies/Blizzard.xml index d17d2790a8..84a923d008 100644 --- a/indra/newview/app_settings/windlight/skies/Blizzard.xml +++ b/indra/newview/app_settings/windlight/skies/Blizzard.xml @@ -137,5 +137,61 @@ <real>3</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml b/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml index 570f059961..8cb31d879a 100644 --- a/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml +++ b/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml @@ -137,5 +137,61 @@ <real>1.2300000190734863</real> <real>0.40999999642372131</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml b/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml index 4925b29eea..17f5a60209 100644 --- a/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml +++ b/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml @@ -137,5 +137,61 @@ <real>3</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml b/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml index f4736cf4c6..4f80a3366c 100644 --- a/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml +++ b/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml @@ -137,5 +137,61 @@ <real>3</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Default.xml b/indra/newview/app_settings/windlight/skies/Default.xml index 13a2c75046..381c7fb49d 100644 --- a/indra/newview/app_settings/windlight/skies/Default.xml +++ b/indra/newview/app_settings/windlight/skies/Default.xml @@ -137,5 +137,61 @@ <real>0.89999997615814209</real> <real>0.29999998211860657</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml b/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml index b2a611163d..39d84a5ced 100644 --- a/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml +++ b/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml @@ -137,5 +137,61 @@ <real>2.8385701179504395</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Fine%20Day.xml b/indra/newview/app_settings/windlight/skies/Fine%20Day.xml index e053815be1..b15e7c6236 100644 --- a/indra/newview/app_settings/windlight/skies/Fine%20Day.xml +++ b/indra/newview/app_settings/windlight/skies/Fine%20Day.xml @@ -137,5 +137,61 @@ <real>0.59999996423721313</real> <real>2.25</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml b/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml index 8576ec125c..95dd872736 100644 --- a/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml +++ b/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml @@ -137,5 +137,61 @@ <real>1.0199999809265137</real> <real>1.7999999523162842</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Foggy.xml b/indra/newview/app_settings/windlight/skies/Foggy.xml index cb7395d589..313c922a4e 100644 --- a/indra/newview/app_settings/windlight/skies/Foggy.xml +++ b/indra/newview/app_settings/windlight/skies/Foggy.xml @@ -137,5 +137,61 @@ <real>0.53999996185302734</real> <real>0.17999999225139618</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml b/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml index 32be0d25e6..f627575d31 100644 --- a/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml +++ b/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml @@ -137,5 +137,61 @@ <real>2.8385701179504395</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml b/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml index ae16b2d135..245fec5999 100644 --- a/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml +++ b/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml @@ -137,5 +137,61 @@ <real>2.2200000286102295</real> <real>0.74000000953674316</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Gelatto.xml b/indra/newview/app_settings/windlight/skies/Gelatto.xml index 66b3d317b8..69f758d4f5 100644 --- a/indra/newview/app_settings/windlight/skies/Gelatto.xml +++ b/indra/newview/app_settings/windlight/skies/Gelatto.xml @@ -137,5 +137,61 @@ <real>0.37800011038780212</real> <real>0.80999994277954102</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Ghost.xml b/indra/newview/app_settings/windlight/skies/Ghost.xml index 447202ed51..2707cae7f9 100644 --- a/indra/newview/app_settings/windlight/skies/Ghost.xml +++ b/indra/newview/app_settings/windlight/skies/Ghost.xml @@ -137,5 +137,61 @@ <real>0.33000001311302185</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml b/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml index 098844e16e..d5f2305e84 100644 --- a/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml +++ b/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml @@ -137,5 +137,61 @@ <real>1.170000433921814</real> <real>0.75</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Midday%201.xml b/indra/newview/app_settings/windlight/skies/Midday%201.xml index 13a2c75046..381c7fb49d 100644 --- a/indra/newview/app_settings/windlight/skies/Midday%201.xml +++ b/indra/newview/app_settings/windlight/skies/Midday%201.xml @@ -137,5 +137,61 @@ <real>0.89999997615814209</real> <real>0.29999998211860657</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Midday%202.xml b/indra/newview/app_settings/windlight/skies/Midday%202.xml index 04f2ba85ee..91d70c2228 100644 --- a/indra/newview/app_settings/windlight/skies/Midday%202.xml +++ b/indra/newview/app_settings/windlight/skies/Midday%202.xml @@ -137,5 +137,61 @@ <real>0.80999994277954102</real> <real>0.26999998092651367</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Midday%203.xml b/indra/newview/app_settings/windlight/skies/Midday%203.xml index a23dcab60b..816a4da670 100644 --- a/indra/newview/app_settings/windlight/skies/Midday%203.xml +++ b/indra/newview/app_settings/windlight/skies/Midday%203.xml @@ -137,5 +137,61 @@ <real>1.2599999904632568</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Midday%204.xml b/indra/newview/app_settings/windlight/skies/Midday%204.xml index 255e314e0f..df64ed371c 100644 --- a/indra/newview/app_settings/windlight/skies/Midday%204.xml +++ b/indra/newview/app_settings/windlight/skies/Midday%204.xml @@ -137,5 +137,61 @@ <real>1.2599999904632568</real> <real>0.41999998688697815</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Midday.xml b/indra/newview/app_settings/windlight/skies/Midday.xml index 119b3e1418..87b2f09e30 100644 --- a/indra/newview/app_settings/windlight/skies/Midday.xml +++ b/indra/newview/app_settings/windlight/skies/Midday.xml @@ -137,5 +137,61 @@ <real>0.89999997615814209</real> <real>0.29999998211860657</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Midnight.xml b/indra/newview/app_settings/windlight/skies/Midnight.xml index 0aba31214a..00cfc64420 100644 --- a/indra/newview/app_settings/windlight/skies/Midnight.xml +++ b/indra/newview/app_settings/windlight/skies/Midnight.xml @@ -137,5 +137,61 @@ <real>0.65999996662139893</real> <real>0.2199999988079071</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Night.xml b/indra/newview/app_settings/windlight/skies/Night.xml index c4938949ce..c56177e821 100644 --- a/indra/newview/app_settings/windlight/skies/Night.xml +++ b/indra/newview/app_settings/windlight/skies/Night.xml @@ -137,5 +137,61 @@ <real>0.65999994893325931</real> <real>0.22000000284673543</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Pirate.xml b/indra/newview/app_settings/windlight/skies/Pirate.xml index dcb9c27ba4..1f5c18dd65 100644 --- a/indra/newview/app_settings/windlight/skies/Pirate.xml +++ b/indra/newview/app_settings/windlight/skies/Pirate.xml @@ -137,5 +137,61 @@ <real>2.8385701179504395</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Purple.xml b/indra/newview/app_settings/windlight/skies/Purple.xml index 0e9ac3f36e..3d937660ad 100644 --- a/indra/newview/app_settings/windlight/skies/Purple.xml +++ b/indra/newview/app_settings/windlight/skies/Purple.xml @@ -137,5 +137,61 @@ <real>2.8385701179504395</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml b/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml index 70df6b0e60..b3a631f482 100644 --- a/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml +++ b/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml @@ -137,5 +137,61 @@ <real>1.0777359008789062</real> <real>0.56000000238418579</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml b/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml index 4c44a1bdb2..252ba58a9a 100644 --- a/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml +++ b/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml @@ -137,5 +137,61 @@ <real>0.53999996185302734</real> <real>1.5899999141693115</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Sunrise.xml b/indra/newview/app_settings/windlight/skies/Sunrise.xml index bbc7aeec59..3932f67f29 100644 --- a/indra/newview/app_settings/windlight/skies/Sunrise.xml +++ b/indra/newview/app_settings/windlight/skies/Sunrise.xml @@ -137,5 +137,61 @@ <real>2.369999885559082</real> <real>0.78999996185302734</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/windlight/skies/Sunset.xml b/indra/newview/app_settings/windlight/skies/Sunset.xml index ebf08e1a3f..a597a1245a 100644 --- a/indra/newview/app_settings/windlight/skies/Sunset.xml +++ b/indra/newview/app_settings/windlight/skies/Sunset.xml @@ -137,6 +137,62 @@ <real>2.8385701179504395</real> <real>1</real> </array> + <key>planet_radius</key> + <real>6360.0</real> + <key>sky_min_radius</key> + <real>6360.0</real> + <key>sky_max_radius</key> + <real>6420.0</real> + <key>rayleigh_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>absorption_config</key> + <map> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> + <key>mie_config</key> + <map> + <key>anisotropy</key> + <real>0.5f</real> + <key>density</key> + <map> + <key>width</key> + <real>0.0</real> + <key>exp_term</key> + <real>1.0</real> + <key>exp_scale</key> + <real>-0.00001</real> + <key>linear_term</key> + <real>0.0</real> + <key>constant_term</key> + <real>1.0</real> + </map> + </map> </map> </llsd> diff --git a/indra/newview/llenvadapters.cpp b/indra/newview/llenvadapters.cpp index 34fd862655..85da9e853d 100644 --- a/indra/newview/llenvadapters.cpp +++ b/indra/newview/llenvadapters.cpp @@ -33,23 +33,28 @@ LLSkySettingsAdapter::LLSkySettingsAdapter(): mWLGamma(1.0f, LLSettingsSky::SETTING_GAMMA), + +#if SUPPORT_LEGACY_ATMOSPHERICS + mAmbient(LLColor4(0.5f, 0.75f, 1.0f, 1.19f), LLSettingsSky::SETTING_AMBIENT, "WLAmbient"), mBlueHorizon(LLColor4(0.25f, 0.25f, 1.0f, 1.0f), LLSettingsSky::SETTING_BLUE_HORIZON, "WLBlueHorizon"), - mHazeDensity(1.0f, LLSettingsSky::SETTING_HAZE_DENSITY), mBlueDensity(LLColor4(0.25f, 0.25f, 0.25f, 1.0f), LLSettingsSky::SETTING_BLUE_DENSITY, "WLBlueDensity"), + mHazeDensity(1.0f, LLSettingsSky::SETTING_HAZE_DENSITY), + mHazeHorizon(1.0f, LLSettingsSky::SETTING_HAZE_HORIZON), mDensityMult(1.0f, LLSettingsSky::SETTING_DENSITY_MULTIPLIER, 1000), - mHazeHorizon(1.0f, LLSettingsSky::SETTING_HAZE_HORIZON), + mDistanceMult(1.0f, LLSettingsSky::SETTING_DISTANCE_MULTIPLIER), mMaxAlt(4000.0f, LLSettingsSky::SETTING_MAX_Y), +#endif + // Lighting mLightnorm(LLColor4(0.f, 0.707f, -0.707f, 1.f), LLSettingsSky::SETTING_LIGHT_NORMAL), mSunlight(LLColor4(0.5f, 0.5f, 0.5f, 1.0f), LLSettingsSky::SETTING_SUNLIGHT_COLOR, "WLSunlight"), - mAmbient(LLColor4(0.5f, 0.75f, 1.0f, 1.19f), LLSettingsSky::SETTING_AMBIENT, "WLAmbient"), + mGlow(LLColor4(18.0f, 0.0f, -0.01f, 1.0f), LLSettingsSky::SETTING_GLOW), // Clouds mCloudColor(LLColor4(0.5f, 0.5f, 0.5f, 1.0f), LLSettingsSky::SETTING_CLOUD_COLOR, "WLCloudColor"), mCloudMain(LLColor4(0.5f, 0.5f, 0.125f, 1.0f), LLSettingsSky::SETTING_CLOUD_POS_DENSITY1), mCloudCoverage(0.0f, LLSettingsSky::SETTING_CLOUD_SHADOW), - mCloudDetail(LLColor4(0.0f, 0.0f, 0.0f, 1.0f), LLSettingsSky::SETTING_CLOUD_POS_DENSITY2), - mDistanceMult(1.0f, LLSettingsSky::SETTING_DISTANCE_MULTIPLIER), + mCloudDetail(LLColor4(0.0f, 0.0f, 0.0f, 1.0f), LLSettingsSky::SETTING_CLOUD_POS_DENSITY2), mCloudScale(0.42f, LLSettingsSky::SETTING_CLOUD_SCALE) { diff --git a/indra/newview/llenvadapters.h b/indra/newview/llenvadapters.h index 8b93bbbe9f..c48311863e 100644 --- a/indra/newview/llenvadapters.h +++ b/indra/newview/llenvadapters.h @@ -31,6 +31,7 @@ #include "v3color.h" #include "v4math.h" #include "llsettingsbase.h" +#include "llsettingssky.h" class WLColorControl { @@ -364,25 +365,27 @@ public: WLFloatControl mWLGamma; /// Atmospherics +#if SUPPORT_LEGACY_ATMOSPHERICS + WLColorControl mAmbient; WLColorControl mBlueHorizon; WLFloatControl mHazeDensity; WLColorControl mBlueDensity; WLFloatControl mDensityMult; + WLFloatControl mDistanceMult; WLFloatControl mHazeHorizon; WLFloatControl mMaxAlt; +#endif /// Lighting WLColorControl mLightnorm; - WLColorControl mSunlight; - WLColorControl mAmbient; + WLColorControl mSunlight; WLColorControl mGlow; /// Clouds WLColorControl mCloudColor; WLColorControl mCloudMain; WLFloatControl mCloudCoverage; - WLColorControl mCloudDetail; - WLFloatControl mDistanceMult; + WLColorControl mCloudDetail; WLFloatControl mCloudScale; }; diff --git a/indra/newview/llfloatereditsky.cpp b/indra/newview/llfloatereditsky.cpp index 1574e73caa..c2b7bb17da 100644 --- a/indra/newview/llfloatereditsky.cpp +++ b/indra/newview/llfloatereditsky.cpp @@ -152,20 +152,21 @@ void LLFloaterEditSky::initCallbacks(void) LLRegionInfoModel::instance().setUpdateCallback(boost::bind(&LLFloaterEditSky::onRegionInfoUpdate, this)); //------------------------------------------------------------------------- +#if SUPPORT_LEGACY_ATMOSPHERICS + // ambient + getChild<LLUICtrl>("WLAmbient")->setCommitCallback(boost::bind(&LLFloaterEditSky::onColorControlMoved, this, _1, &mSkyAdapter->mAmbient)); - // blue horizon + // blue horizon/density getChild<LLUICtrl>("WLBlueHorizon")->setCommitCallback(boost::bind(&LLFloaterEditSky::onColorControlMoved, this, _1, &mSkyAdapter->mBlueHorizon)); + getChild<LLUICtrl>("WLBlueDensity")->setCommitCallback(boost::bind(&LLFloaterEditSky::onColorControlMoved, this, _1, &mSkyAdapter->mBlueDensity)); // haze density, horizon, mult, and altitude getChild<LLUICtrl>("WLHazeDensity")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mHazeDensity)); getChild<LLUICtrl>("WLHazeHorizon")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mHazeHorizon)); getChild<LLUICtrl>("WLDensityMult")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mDensityMult)); + getChild<LLUICtrl>("WLDistanceMult")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mDistanceMult)); getChild<LLUICtrl>("WLMaxAltitude")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mMaxAlt)); - - // blue density - getChild<LLUICtrl>("WLBlueDensity")->setCommitCallback(boost::bind(&LLFloaterEditSky::onColorControlMoved, this, _1, &mSkyAdapter->mBlueDensity)); - - // Lighting +#endif // sunlight getChild<LLUICtrl>("WLSunlight")->setCommitCallback(boost::bind(&LLFloaterEditSky::onColorControlMoved, this, _1, &mSkyAdapter->mSunlight)); @@ -174,9 +175,6 @@ void LLFloaterEditSky::initCallbacks(void) getChild<LLUICtrl>("WLGlowR")->setCommitCallback(boost::bind(&LLFloaterEditSky::onGlowRMoved, this, _1, &mSkyAdapter->mGlow)); getChild<LLUICtrl>("WLGlowB")->setCommitCallback(boost::bind(&LLFloaterEditSky::onGlowBMoved, this, _1, &mSkyAdapter->mGlow)); - // ambient - getChild<LLUICtrl>("WLAmbient")->setCommitCallback(boost::bind(&LLFloaterEditSky::onColorControlMoved, this, _1, &mSkyAdapter->mAmbient)); - // time of day // getChild<LLUICtrl>("WLSunPos")->setCommitCallback(boost::bind(&LLFloaterEditSky::onSunMoved, this, _1, &mSkyAdapter->mLightnorm)); // multi-slider // getChild<LLTimeCtrl>("WLDayTime")->setCommitCallback(boost::bind(&LLFloaterEditSky::onTimeChanged, this)); // time ctrl @@ -204,7 +202,7 @@ void LLFloaterEditSky::initCallbacks(void) getChild<LLUICtrl>("WLCloudScale")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mCloudScale)); getChild<LLUICtrl>("WLCloudScrollX")->setCommitCallback(boost::bind(&LLFloaterEditSky::onCloudScrollXMoved, this, _1)); getChild<LLUICtrl>("WLCloudScrollY")->setCommitCallback(boost::bind(&LLFloaterEditSky::onCloudScrollYMoved, this, _1)); - getChild<LLUICtrl>("WLDistanceMult")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mDistanceMult)); + // Dome getChild<LLUICtrl>("WLGamma")->setCommitCallback(boost::bind(&LLFloaterEditSky::onFloatControlMoved, this, _1, &mSkyAdapter->mWLGamma)); @@ -223,9 +221,16 @@ void LLFloaterEditSky::syncControls() mSkyPresetNameEditor->setText(name); mSkyPresetCombo->setValue(name); - // blue horizon +#if SUPPORT_LEGACY_ATMOSPHERICS + // ambient + mSkyAdapter->mAmbient.setColor3( psky->getAmbientColor() ); + setColorSwatch("WLAmbient", mSkyAdapter->mAmbient, WL_SUN_AMBIENT_SLIDER_SCALE); + + // blue horizon / density mSkyAdapter->mBlueHorizon.setColor3( psky->getBlueHorizon() ); setColorSwatch("WLBlueHorizon", mSkyAdapter->mBlueHorizon, WL_BLUE_HORIZON_DENSITY_SCALE); + mSkyAdapter->mBlueDensity.setColor3( psky->getBlueDensity() ); + setColorSwatch("WLBlueDensity", mSkyAdapter->mBlueDensity, WL_BLUE_HORIZON_DENSITY_SCALE); // haze density, horizon, mult, and altitude mSkyAdapter->mHazeDensity = psky->getHazeDensity(); @@ -235,11 +240,10 @@ void LLFloaterEditSky::syncControls() mSkyAdapter->mDensityMult = psky->getDensityMultiplier(); childSetValue("WLDensityMult", ((F32) mSkyAdapter->mDensityMult) * mSkyAdapter->mDensityMult.getMult()); mSkyAdapter->mMaxAlt = psky->getMaxY(); + mSkyAdapter->mDistanceMult = psky->getDistanceMultiplier(); + childSetValue("WLDistanceMult", (F32) mSkyAdapter->mDistanceMult); childSetValue("WLMaxAltitude", (F32) mSkyAdapter->mMaxAlt); - - // blue density - mSkyAdapter->mBlueDensity.setColor3( psky->getBlueDensity() ); - setColorSwatch("WLBlueDensity", mSkyAdapter->mBlueDensity, WL_BLUE_HORIZON_DENSITY_SCALE); +#endif // Lighting @@ -252,9 +256,7 @@ void LLFloaterEditSky::syncControls() childSetValue("WLGlowR", 2 - mSkyAdapter->mGlow.getRed() / 20.0f); childSetValue("WLGlowB", -mSkyAdapter->mGlow.getBlue() / 5.0f); - // ambient - mSkyAdapter->mAmbient.setColor3( psky->getAmbientColor() ); - setColorSwatch("WLAmbient", mSkyAdapter->mAmbient, WL_SUN_AMBIENT_SLIDER_SCALE); + // LLSettingsSky::azimalt_t azal = psky->getSunRotationAzAl(); // @@ -304,9 +306,6 @@ void LLFloaterEditSky::syncControls() childSetValue("WLCloudScrollX", scroll_rate[0] - 10.0f); childSetValue("WLCloudScrollY", scroll_rate[1] - 10.0f); - mSkyAdapter->mDistanceMult = psky->getDistanceMultiplier(); - childSetValue("WLDistanceMult", (F32) mSkyAdapter->mDistanceMult); - // Tweak extras mSkyAdapter->mWLGamma = psky->getGamma(); diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index db68b39f75..84930ee425 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -150,25 +150,27 @@ LLSD LLSettingsVOSky::convertToLegacy(const LLSettingsSky::ptr_t &psky) LLSD legacy(LLSD::emptyMap()); LLSD settings = psky->getSettings(); +// These will need to be inferred from new settings' density profiles +#if SUPPORT_LEGACY_ATMOSPHERICS legacy[SETTING_AMBIENT] = ensureArray4(settings[SETTING_AMBIENT], 1.0f); legacy[SETTING_BLUE_DENSITY] = ensureArray4(settings[SETTING_BLUE_DENSITY], 1.0); legacy[SETTING_BLUE_HORIZON] = ensureArray4(settings[SETTING_BLUE_HORIZON], 1.0); + legacy[SETTING_DENSITY_MULTIPLIER] = LLSDArray(settings[SETTING_DENSITY_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); + legacy[SETTING_DISTANCE_MULTIPLIER] = LLSDArray(settings[SETTING_DISTANCE_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); + legacy[SETTING_HAZE_DENSITY] = LLSDArray(settings[SETTING_HAZE_DENSITY])(0.0f)(0.0f)(1.0f); + legacy[SETTING_HAZE_HORIZON] = LLSDArray(settings[SETTING_HAZE_HORIZON])(0.0f)(0.0f)(1.0f); +#endif + legacy[SETTING_CLOUD_COLOR] = ensureArray4(settings[SETTING_CLOUD_COLOR], 1.0); legacy[SETTING_CLOUD_POS_DENSITY1] = ensureArray4(settings[SETTING_CLOUD_POS_DENSITY1], 1.0); legacy[SETTING_CLOUD_POS_DENSITY2] = ensureArray4(settings[SETTING_CLOUD_POS_DENSITY2], 1.0); - legacy[SETTING_CLOUD_SCALE] = LLSDArray(settings[SETTING_CLOUD_SCALE])(LLSD::Real(0.0))(LLSD::Real(0.0))(LLSD::Real(1.0)); - + legacy[SETTING_CLOUD_SCALE] = LLSDArray(settings[SETTING_CLOUD_SCALE])(LLSD::Real(0.0))(LLSD::Real(0.0))(LLSD::Real(1.0)); legacy[SETTING_CLOUD_SCROLL_RATE] = settings[SETTING_CLOUD_SCROLL_RATE]; legacy[SETTING_LEGACY_ENABLE_CLOUD_SCROLL] = LLSDArray(LLSD::Boolean(!is_approx_zero(settings[SETTING_CLOUD_SCROLL_RATE][0].asReal()))) - (LLSD::Boolean(!is_approx_zero(settings[SETTING_CLOUD_SCROLL_RATE][1].asReal()))); - - legacy[SETTING_CLOUD_SHADOW] = LLSDArray(settings[SETTING_CLOUD_SHADOW].asReal())(0.0f)(0.0f)(1.0f); - legacy[SETTING_DENSITY_MULTIPLIER] = LLSDArray(settings[SETTING_DENSITY_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); - legacy[SETTING_DISTANCE_MULTIPLIER] = LLSDArray(settings[SETTING_DISTANCE_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); + (LLSD::Boolean(!is_approx_zero(settings[SETTING_CLOUD_SCROLL_RATE][1].asReal()))); + legacy[SETTING_CLOUD_SHADOW] = LLSDArray(settings[SETTING_CLOUD_SHADOW].asReal())(0.0f)(0.0f)(1.0f); legacy[SETTING_GAMMA] = LLSDArray(settings[SETTING_GAMMA])(0.0f)(0.0f)(1.0f); legacy[SETTING_GLOW] = ensureArray4(settings[SETTING_GLOW], 1.0); - legacy[SETTING_HAZE_DENSITY] = LLSDArray(settings[SETTING_HAZE_DENSITY])(0.0f)(0.0f)(1.0f); - legacy[SETTING_HAZE_HORIZON] = LLSDArray(settings[SETTING_HAZE_HORIZON])(0.0f)(0.0f)(1.0f); legacy[SETTING_LIGHT_NORMAL] = ensureArray4(psky->getLightDirection().getValue(), 0.0f); legacy[SETTING_MAX_Y] = LLSDArray(settings[SETTING_MAX_Y])(0.0f)(0.0f)(1.0f); legacy[SETTING_STAR_BRIGHTNESS] = settings[SETTING_STAR_BRIGHTNESS]; @@ -218,21 +220,26 @@ LLSettingsSky::parammapping_t LLSettingsVOSky::getParameterMap() const if (param_map.empty()) { +#if SUPPORT_LEGACY_ATMOSPHERICS param_map[SETTING_AMBIENT] = LLShaderMgr::AMBIENT; param_map[SETTING_BLUE_DENSITY] = LLShaderMgr::BLUE_DENSITY; param_map[SETTING_BLUE_HORIZON] = LLShaderMgr::BLUE_HORIZON; - param_map[SETTING_CLOUD_COLOR] = LLShaderMgr::CLOUD_COLOR; + param_map[SETTING_HAZE_DENSITY] = LLShaderMgr::HAZE_DENSITY; + param_map[SETTING_HAZE_HORIZON] = LLShaderMgr::HAZE_HORIZON; + param_map[SETTING_DENSITY_MULTIPLIER] = LLShaderMgr::DENSITY_MULTIPLIER; + param_map[SETTING_DISTANCE_MULTIPLIER] = LLShaderMgr::DISTANCE_MULTIPLIER; +#endif + param_map[SETTING_CLOUD_COLOR] = LLShaderMgr::CLOUD_COLOR; param_map[SETTING_CLOUD_POS_DENSITY2] = LLShaderMgr::CLOUD_POS_DENSITY2; param_map[SETTING_CLOUD_SCALE] = LLShaderMgr::CLOUD_SCALE; - param_map[SETTING_CLOUD_SHADOW] = LLShaderMgr::CLOUD_SHADOW; - param_map[SETTING_DENSITY_MULTIPLIER] = LLShaderMgr::DENSITY_MULTIPLIER; - param_map[SETTING_DISTANCE_MULTIPLIER] = LLShaderMgr::DISTANCE_MULTIPLIER; - param_map[SETTING_GLOW] = LLShaderMgr::GLOW; - param_map[SETTING_HAZE_DENSITY] = LLShaderMgr::HAZE_DENSITY; - param_map[SETTING_HAZE_HORIZON] = LLShaderMgr::HAZE_HORIZON; + param_map[SETTING_CLOUD_SHADOW] = LLShaderMgr::CLOUD_SHADOW; + param_map[SETTING_GLOW] = LLShaderMgr::GLOW; param_map[SETTING_MAX_Y] = LLShaderMgr::MAX_Y; param_map[SETTING_SUNLIGHT_COLOR] = LLShaderMgr::SUNLIGHT_COLOR; + +// AdvancedAtmospherics TODO +// Provide mappings for new shader params here } return param_map; diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index ad68408836..c1ba7b1efd 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -397,6 +397,7 @@ void LLVOSky::init() calcAtmospherics(); +#if SUPPORT_LEGACY_ATMOSPHERICS // Initialize the cached normalized direction vectors for (S32 side = 0; side < 6; ++side) { @@ -412,6 +413,7 @@ void LLVOSky::init() mSkyTex[i].create(1.0f); mShinyTex[i].create(1.0f); } +#endif initCubeMap(); mInitialized = true; @@ -494,6 +496,7 @@ void LLVOSky::restoreGL() } +#if SUPPORT_LEGACY_ATMOSPHERICS void LLVOSky::initSkyTextureDirs(const S32 side, const S32 tile) { S32 tile_x = tile % NUM_TILES_X; @@ -816,6 +819,7 @@ LLColor3 LLVOSky::calcSkyColorWLFrag(LLVector3 & Pn, LLColor3 & vary_HazeColor, return res; } + LLColor3 LLVOSky::createDiffuseFromWL(LLColor3 diffuse, LLColor3 ambient, LLColor3 sundiffuse, LLColor3 sunambient) { return componentMult(diffuse, sundiffuse) * 4.0f + @@ -826,7 +830,7 @@ LLColor3 LLVOSky::createAmbientFromWL(LLColor3 ambient, LLColor3 sundiffuse, LLC { return (componentMult(ambient, sundiffuse) + sunambient) * 0.8f; } - +#endif void LLVOSky::calcAtmospherics(void) { @@ -878,6 +882,7 @@ BOOL LLVOSky::updateSky() return TRUE; } +#if SUPPORT_LEGACY_ATMOSPHERICS static S32 next_frame = 0; const S32 total_no_tiles = 6 * NUM_TILES; const S32 cycle_frame_no = total_no_tiles + 1; @@ -927,6 +932,7 @@ BOOL LLVOSky::updateSky() if (mForceUpdate) { updateFog(LLViewerCamera::getInstance()->getFar()); + for (int side = 0; side < 6; side++) { for (int tile = 0; tile < NUM_TILES; tile++) @@ -995,6 +1001,8 @@ BOOL LLVOSky::updateSky() { gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE); } +#endif + return TRUE; } @@ -1856,6 +1864,8 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H, void LLVOSky::updateFog(const F32 distance) { + +#if SUPPORT_LEGACY_ATMOSPHERICS if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FOG)) { if (!LLGLSLShader::sNoFixedFunction) @@ -2000,6 +2010,9 @@ void LLVOSky::updateFog(const F32 distance) glHint(GL_FOG_HINT, GL_NICEST); } stop_glerror(); + +#endif + } diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index 9123381c3d..4f6bc55bbe 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -34,7 +34,7 @@ #include "llviewerobject.h" #include "llframetimer.h" #include "v3colorutil.h" - +#include "llsettingssky.h" ////////////////////////////////// // @@ -382,6 +382,8 @@ class LLVOSky : public LLStaticViewerObject public: void calcAtmospherics(void); + +#if SUPPORT_LEGACY_ATMOSPHERICS LLColor3 createDiffuseFromWL(LLColor3 diffuse, LLColor3 ambient, LLColor3 sundiffuse, LLColor3 sunambient); LLColor3 createAmbientFromWL(LLColor3 ambient, LLColor3 sundiffuse, LLColor3 sunambient); @@ -392,8 +394,17 @@ public: LLColor3 calcSkyColorWLFrag(LLVector3 & Pn, LLColor3 & vary_HazeColor, LLColor3 & vary_CloudColorSun, LLColor3 & vary_CloudColorAmbient, F32 & vary_CloudDensity, LLVector2 vary_HorizontalProjection[2]); + LLColor4 calcSkyColorInDir(const LLVector3& dir, bool isShiny = false); + + LLColor3 calcRadianceAtPoint(const LLVector3& pos) const + { + F32 radiance = mBrightnessScaleGuess * mSun.getIntensity(); + return LLColor3(radiance, radiance, radiance); + } + void initSkyTextureDirs(const S32 side, const S32 tile); + void createSkyTexture(const S32 side, const S32 tile); +#endif -public: enum { FACE_SIDE0, @@ -429,17 +440,6 @@ public: /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); - void initSkyTextureDirs(const S32 side, const S32 tile); - void createSkyTexture(const S32 side, const S32 tile); - - LLColor4 calcSkyColorInDir(const LLVector3& dir, bool isShiny = false); - - LLColor3 calcRadianceAtPoint(const LLVector3& pos) const - { - F32 radiance = mBrightnessScaleGuess * mSun.getIntensity(); - return LLColor3(radiance, radiance, radiance); - } - const LLHeavenBody& getSun() const { return mSun; } const LLHeavenBody& getMoon() const { return mMoon; } |