summaryrefslogtreecommitdiff
path: root/indra/newview/llvosky.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-11-13 16:43:47 -0800
committerRider Linden <rider@lindenlab.com>2017-11-13 16:43:47 -0800
commit35873f5963791af08a9951624dc96481a71fa1d7 (patch)
tree7be29babda869025d2b4b2b9535383e58d3d99bf /indra/newview/llvosky.cpp
parentb227c86b450134f17ec0624655e1e4c5cb5ba89d (diff)
Clean up on sun and moon
Diffstat (limited to 'indra/newview/llvosky.cpp')
-rw-r--r--indra/newview/llvosky.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 22cd14a830..0c211b259c 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -833,7 +833,7 @@ void LLVOSky::calcAtmospherics(void)
LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
mSun.setColor(psky->getSunlightColor());
- mMoon.setColor(LLColor3(1.0f, 1.0f, 1.0f));
+ mMoon.setColor(LLColor3(2.0f, 2.0f, 2.0f));
mSun.renewDirection();
mSun.renewColor();
@@ -2063,7 +2063,7 @@ void LLVOSky::initSunDirection(const LLVector3 &sun_dir, const LLVector3 &sun_an
}
}
-void LLVOSky::setSunDirection(const LLVector3 &sun_dir, const LLVector3 &sun_ang_velocity)
+void LLVOSky::setSunDirection(const LLVector3 &sun_dir, const LLVector3 &moon_dir)
{
LLVector3 sun_direction = (sun_dir.length() == 0) ? LLVector3::x_axis : sun_dir;
sun_direction.normalize();
@@ -2086,8 +2086,8 @@ void LLVOSky::setSunDirection(const LLVector3 &sun_dir, const LLVector3 &sun_ang
F32 dp = mLastLightingDirection * sun_direction;
mSun.setDirection(sun_direction);
- mSun.setAngularVelocity(sun_ang_velocity);
- mMoon.setDirection(-sun_direction);
+
+ mMoon.setDirection(moon_dir);
calcAtmospherics();
if (dp < 0.995f) { //the sun jumped a great deal, update immediately
mForceUpdate = TRUE;