mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-22 04:53:51 +00:00
Code Issues Releases Wiki Activity

Water and clouds no longer depend on timescale.

Browse source
This commit is contained in:
scrawl 2013-02-17 16:23:55 +01:00
parent 7604fb51b6
commit 7ffcfa3622
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -353,8 +353,6 @@ void RenderingManager::update (float duration, bool paused)
Ogre::ControllerManager::getSingleton().setTimeFactor(0.f); Ogre::ControllerManager::getSingleton().setTimeFactor(0.f);
return; return;
} }
Ogre::ControllerManager::getSingleton().setTimeFactor(
MWBase::Environment::get().getWorld()->getTimeScaleFactor()/30.f);
mPlayer->update(duration); mPlayer->update(duration);

2
apps/openmw/mwrender/sky.cpp
View file

@ -361,7 +361,7 @@ void SkyManager::update(float duration)
mRootNode->setPosition(mCamera->getDerivedPosition()); mRootNode->setPosition(mCamera->getDerivedPosition());
// UV Scroll the clouds // UV Scroll the clouds
mCloudAnimationTimer += duration * mCloudSpeed * (MWBase::Environment::get().getWorld()->getTimeScaleFactor()/30.f); mCloudAnimationTimer += duration * mCloudSpeed;
sh::Factory::getInstance().setSharedParameter ("cloudAnimationTimer", sh::Factory::getInstance().setSharedParameter ("cloudAnimationTimer",
sh::makeProperty<sh::FloatValue>(new sh::FloatValue(mCloudAnimationTimer))); sh::makeProperty<sh::FloatValue>(new sh::FloatValue(mCloudAnimationTimer)));

2
apps/openmw/mwrender/water.cpp
View file

@ -399,7 +399,7 @@ void Water::update(float dt, Ogre::Vector3 player)
mUnderwaterDome->setPosition (pos); mUnderwaterDome->setPosition (pos);
*/ */
mWaterTimer += dt / 30.0 * MWBase::Environment::get().getWorld()->getTimeScaleFactor(); mWaterTimer += dt;
sh::Factory::getInstance ().setSharedParameter ("waterTimer", sh::makeProperty<sh::FloatValue>(new sh::FloatValue(mWaterTimer))); sh::Factory::getInstance ().setSharedParameter ("waterTimer", sh::makeProperty<sh::FloatValue>(new sh::FloatValue(mWaterTimer)));
mRendering->getSkyManager ()->setGlareEnabled (!mIsUnderwater); mRendering->getSkyManager ()->setGlareEnabled (!mIsUnderwater);