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

SL-11606 fix to match EEP light falloff vs release

master
Dave Houlton 2019-12-19 18:04:32 -07:00
parent f61a5c4642
commit b3e11083cc
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llinventory/llsettingssky.cpp
View File

@ -1000,7 +1000,7 @@ LLVector3 LLSettingsSky::getLightDirection() const
return mMoonDirection;
}
return -LLVector3::z_axis;
return LLVector3::z_axis_neg;
}
LLColor3 LLSettingsSky::getLightDiffuse() const

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

@ -100,7 +100,9 @@ void main()
float fa = light_col[i].a+1.0;
float dist_atten = clamp(1.0-(dist-1.0*(1.0-fa))/fa, 0.0, 1.0);
dist_atten *= dist_atten;
dist_atten *= 2.0;
// Tweak falloff slightly to match pre-EEP attenuation
dist_atten *= 2.2;
dist_atten *= noise;

14
indra/newview/llsettingsvo.cpp
View File

@ -641,17 +641,17 @@ void LLSettingsVOSky::updateSettings()
LLVector3 sun_direction = getSunDirection();
LLVector3 moon_direction = getMoonDirection();
F32 dp = getLightDirection() * LLVector3(0.0f, 0.0f, 1.0f);
if (dp < 0)
{
dp = 0;
}
dp = llmax(dp, 0.1f);
// Want the dot prod of sun w/ high noon vector (0,0,1), which is just the z component
F32 dp = llmax(sun_direction[2], 0.0f); // clamped to 0 when sun is down
// Since WL scales everything by 2, there should always be at least a 2:1 brightness ratio
// between sunlight and point lights in windlight to normalize point lights.
//
// After some A/B comparison of relesae vs EEP, tweak to allow strength to fall below 2
// at night, for better match. (mSceneLightStrength is a divisor, so lower value means brighter
// local lights)
F32 sun_dynamic_range = llmax(gSavedSettings.getF32("RenderSunDynamicRange"), 0.0001f);
mSceneLightStrength = 2.0f * (1.0f + sun_dynamic_range * dp);
mSceneLightStrength = 2.0f * (0.65f + sun_dynamic_range * dp);
gSky.setSunAndMoonDirectionsCFR(sun_direction, moon_direction);
gSky.setSunTextures(getSunTextureId(), getNextSunTextureId());