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

Merged in euclid-13743 (pull request #263) 

SL-13743 Revert part of SL-12978 change that broke low-angle sunlight

Approved-by: Michael Pohoreski
master
Dave Houlton 2020-08-24 19:30:12 +00:00
parent 64a78b8c7f 9de1f91dae
commit 0589c60768
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
View File

@ -81,8 +81,13 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
haze_weight = vec4(haze_density) / temp1; haze_weight = vec4(haze_density) / temp1;
//(TERRAIN) compute sunlight from lightnorm only (for short rays like terrain) //(TERRAIN) compute sunlight from lightnorm only (for short rays like terrain)
// SL-12978: temp2.y = 1; optimized away temp2.y = max(0.0, tmpLightnorm.y);
sunlight *= exp(-light_atten); if (abs(temp2.y) > 0.000001f)
{
temp2.y = 1. / abs(temp2.y);
}
temp2.y = max(0.0000001f, temp2.y);
sunlight *= exp(-light_atten * temp2.y);
// main atmospheric scattering line integral // main atmospheric scattering line integral
temp2.z = Plen * dens_mul; temp2.z = Plen * dens_mul;