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

SL-11856 Backed out SL-11012 

changeset: 0d43d9754b79
master
AndreyL ProductEngine 2019-09-03 00:25:07 +03:00
parent 1aedd96cd1
commit e8194e6aba
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvosky.cpp
View File

@ -630,7 +630,7 @@ void LLVOSky::initAtmospherics(void)
dome_radius = LLWLParamManager::getInstance()->getDomeRadius();
dome_offset_ratio = LLWLParamManager::getInstance()->getDomeOffset();
sunlight_color = LLColor3(LLWLParamManager::getInstance()->mCurParams.getVector("sunlight_color", error));
ambient = LLColor3(LLWLParamManager::getInstance()->mCurParams.getAmbient());
ambient = LLColor3(LLWLParamManager::getInstance()->mCurParams.getVector("ambient", error));
//lightnorm = LLWLParamManager::getInstance()->mCurParams.getVector("lightnorm", error);
gamma = LLWLParamManager::getInstance()->mCurParams.getFloat("gamma", error);
blue_density = LLColor3(LLWLParamManager::getInstance()->mCurParams.getVector("blue_density", error));

18
indra/newview/llwlparamset.cpp
View File

@ -284,11 +284,6 @@ void LLWLParamSet::setEastAngle(float val)
mParamValues["east_angle"] = val;
}
void LLWLParamSet::setAmbient(const LLVector4& val)
{
set("ambient", val);
}
void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
{
// set up the iterators
@ -389,19 +384,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
setSunAngle((1 - weight) * srcSunAngle + weight * destSunAngle);
setEastAngle((1 - weight) * srcEastAngle + weight * destEastAngle);
// ambient
LLVector4 srcAmbient = src.getAmbient();
LLVector4 destAmbient = dest.getAmbient();
LLVector4 rsltAmbient;
for (int i = 0; i < LENGTHOFVECTOR4; ++i)
{
rsltAmbient.mV[i] = srcAmbient.mV[i] + ((destAmbient.mV[i] - srcAmbient.mV[i]) * weight);
}
setAmbient(rsltAmbient);
// now setup the sun properly

8
indra/newview/llwlparamset.h
View File

@ -136,9 +136,6 @@ public:
void setEastAngle(F32 val);
F32 getEastAngle();
void setAmbient(const LLVector4& val);
LLVector4 getAmbient();
@ -210,11 +207,6 @@ inline F32 LLWLParamSet::getEastAngle() {
return (F32) mParamValues["east_angle"].asReal();
}
inline LLVector4 LLWLParamSet::getAmbient() {
bool error;
return mParamValues.has("ambient") ? getVector("ambient", error) : LLVector4(0.5f, 0.75f, 1.0f, 1.19f);
}
inline void LLWLParamSet::setEnableCloudScrollX(bool val) {
mParamValues["enable_cloud_scroll"][0] = val;