Commit e8194e6a authored by AndreyL ProductEngine's avatar AndreyL ProductEngine

SL-11856 Backed out SL-11012

changeset: 0d43d9754b79
parent 1aedd96c
......@@ -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));
......
......@@ -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
......@@ -390,19 +385,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
// reset those cloud positions
......
......@@ -137,9 +137,6 @@ class LLWLParamSet {
void setEastAngle(F32 val);
F32 getEastAngle();
void setAmbient(const LLVector4& val);
LLVector4 getAmbient();
/// set the cloud scroll x enable value
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment