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

Merged in andreykproductengine/maint-eep (pull request #170) 

SL-1476 EEP Better shader transitions

Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
meow-7.2.2
Rider Linden 2018-10-30 17:55:42 +00:00
parent 9a8e124fde 86419eb11b
commit 7b6cd0859c
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llinventory/llsettingsbase.cpp
View File

@ -230,6 +230,11 @@ LLSD LLSettingsBase::interpolateSDMap(const LLSD &settings, const LLSD &other, c
// Blend against default value
newSettings[key_name] = interpolateSDValue(key_name, def_iter->second.getDefaultValue(), (*it).second, defaults, mix, slerps);
}
else if ((*it).second.type() == LLSD::TypeMap)
{
// interpolate in case there are defaults inside (part of legacy)
newSettings[key_name] = interpolateSDValue(key_name, LLSDMap(), (*it).second, defaults, mix, slerps);
}
// else do nothing when no known defaults
// TODO: Should I blend this out instead?
}

22
indra/llinventory/llsettingssky.cpp
View File

@ -438,11 +438,25 @@ void LLSettingsSky::blend(const LLSettingsBase::ptr_t &end, F64 blendf)
LLSettingsSky::ptr_t other = PTR_NAMESPACE::dynamic_pointer_cast<LLSettingsSky>(end);
if (other)
{
if (!mSettings.has(SETTING_LEGACY_HAZE) && !mSettings[SETTING_LEGACY_HAZE].has(SETTING_AMBIENT))
if (other->mSettings.has(SETTING_LEGACY_HAZE))
{
// Special case since SETTING_AMBIENT is both in outer and legacy maps, we prioritize legacy one
// see getAmbientColor()
setAmbientColor(getAmbientColor());
if (!mSettings.has(SETTING_LEGACY_HAZE) || !mSettings[SETTING_LEGACY_HAZE].has(SETTING_AMBIENT))
{
// Special case since SETTING_AMBIENT is both in outer and legacy maps, we prioritize legacy one
// see getAmbientColor(), we are about to replaceSettings(), so we are free to set it
setAmbientColor(getAmbientColor());
}
}
else
{
if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_AMBIENT))
{
// Special case due to ambient's duality
// We need to match 'other's' structure for interpolation.
// We are free to change mSettings, since we are about to reset it
mSettings[SETTING_AMBIENT] = getAmbientColor().getValue();
mSettings[SETTING_LEGACY_HAZE].erase(SETTING_AMBIENT);
}
}
LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, other->getParameterMap(), blendf);