Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windlight/water parameter managers now derived from standard LLSingleton instead of using some silly redundant clone.

Browse Source
This commit is contained in:
Shyotl
2011-09-02 06:35:53 -05:00
parent 91cb401324
commit 443d4e9f56
31 changed files with 418 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
indra/newview/llwlparamset.cpp
View File

@@ -266,7 +266,6 @@ void LLWLParamSet::setEastAngle(float val)
void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
{
// set up the iterators
LLSD::map_iterator cIt = mParamValues.beginMap();
// keep cloud positions and coverage the same
/// TODO masking will do this later
@@ -279,55 +278,39 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
LLSD srcVal;
LLSD destVal;
// do the interpolation for all the ones saved as vectors
// skip the weird ones
for(; cIt != mParamValues.endMap(); cIt++) {
// Iterate through values
for(LLSD::map_iterator iter = mParamValues.beginMap(); iter != mParamValues.endMap(); ++iter)
{
// check params to make sure they're actually there
if(src.mParamValues.has(cIt->first))
// If param exists in both src and dest, set the holder variables, otherwise skip
if(src.mParamValues.has(iter->first) && dest.mParamValues.has(iter->first))
{
srcVal = src.mParamValues[cIt->first];
srcVal = src.mParamValues[iter->first];
destVal = dest.mParamValues[iter->first];
}
else
{
continue;
}
if(dest.mParamValues.has(cIt->first))
if(iter->second.isReal()) // If it's a real, interpolate directly
{
destVal = dest.mParamValues[cIt->first];
iter->second = srcVal.asReal() + ((destVal.asReal() - srcVal.asReal()) * weight);
}
else
else if(iter->second.isArray() && iter->second[0].isReal() // If it's an array of reals, loop through the reals and interpolate on those
&& iter->second.size() == srcVal.size() && iter->second.size() == destVal.size())
{
// Actually do interpolation: old value + (difference in values * factor)
for(int i=0; i < iter->second.size(); ++i)
{
// iter->second[i] = (1.f-weight)*(F32)srcVal[i].asReal() + weight*(F32)destVal[i].asReal(); // old way of doing it -- equivalent but one more operation
iter->second[i] = srcVal[i].asReal() + ((destVal[i].asReal() - srcVal[i].asReal()) * weight);
}
}
else // Else, skip
{
continue;
}
// skip if not a vector
if(!cIt->second.isArray())
{
continue;
}
// only Real vectors allowed
if(!cIt->second[0].isReal())
{
continue;
}
// make sure all the same size
if( cIt->second.size() != srcVal.size() ||
cIt->second.size() != destVal.size())
{
continue;
}
// more error checking might be necessary;
for(int i=0; i < cIt->second.size(); ++i)
{
cIt->second[i] = (1.0f - weight) * (F32) srcVal[i].asReal() +
weight * (F32) destVal[i].asReal();
}
}
// now mix the extra parameters