livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19538 Back off on sun brightening a bit, remove errant brightening of clouds, and update midday to not be red shifted.

master
Dave Parks 2023-04-06 22:55:51 -05:00
parent a6d03d1e98
commit 72a0408401
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
View File

@ -114,7 +114,7 @@ void main()
float rel_pos_len = length(rel_pos);
// Initialize temp variables
vec3 sunlight = sunlight_color*2.0;
vec3 sunlight = sunlight_color;
vec3 light_atten;
// Sunlight attenuation effect (hue and brightness) due to atmosphere
@ -166,7 +166,7 @@ void main()
(blue_horizon * blue_weight * (sunlight + tmpAmbient) + (haze_horizon * haze_weight) * (sunlight * haze_glow + tmpAmbient));
// CLOUDS
sunlight = sunlight_color; // SL-14707 reset color -- Clouds are unusually dim in EEP
sunlight = sunlight_color;
off_axis = 1.0 / max(1e-6, lightnorm.y * 2.);
sunlight *= exp(-light_atten * off_axis);

2
indra/newview/app_settings/shaders/class2/windlight/atmosphericsFuncs.glsl
View File

@ -141,7 +141,7 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
// fudge sunlit and amblit to get consistent lighting compared to legacy
// midday before PBR was a thing
sunlit = sunlight.rgb * (1.0+sun_up_factor*0.3);
sunlit = sunlight.rgb * (1.0+sun_up_factor*0.2);
amblit = tmpAmbient.rgb * 0.25;
additive *= vec3(1.0 - combined_haze);

2
indra/newview/llenvironment.cpp
View File

@ -812,7 +812,7 @@ const F64Seconds LLEnvironment::TRANSITION_SLOW(10.0f);
const F64Seconds LLEnvironment::TRANSITION_ALTITUDE(5.0f);
const LLUUID LLEnvironment::KNOWN_SKY_SUNRISE("01e41537-ff51-2f1f-8ef7-17e4df760bfb");
const LLUUID LLEnvironment::KNOWN_SKY_MIDDAY("d9950f9a-f693-be73-0384-13ee97b8ca10");
const LLUUID LLEnvironment::KNOWN_SKY_MIDDAY("7819e136-b6af-2e32-9c85-0b94121bb359");
const LLUUID LLEnvironment::KNOWN_SKY_SUNSET("084e26cd-a900-28e8-08d0-64a9de5c15e2");
const LLUUID LLEnvironment::KNOWN_SKY_MIDNIGHT("8a01b97a-cb20-c1ea-ac63-f7ea84ad0090");