mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 15:36:41 +00:00
Code Issues Releases Wiki Activity

Pause simulationTime when the GUI is up

Browse source
This commit is contained in:
scrawl 2015-05-14 02:24:15 +02:00
parent 4dd96f3318
commit e3b1707bbd
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/engine.cpp
View file

@ -73,7 +73,7 @@ void OMW::Engine::executeLocalScripts()
localScripts.setIgnore (MWWorld::Ptr()); localScripts.setIgnore (MWWorld::Ptr());
} }
void OMW::Engine::frame(float frametime) double OMW::Engine::frame(float frametime)
{ {
try try
{ {
@ -94,6 +94,8 @@ void OMW::Engine::frame(float frametime)
// GUI active? Most game processing will be paused, but scripts still run. // GUI active? Most game processing will be paused, but scripts still run.
bool guiActive = MWBase::Environment::get().getWindowManager()->isGuiMode(); bool guiActive = MWBase::Environment::get().getWindowManager()->isGuiMode();
if (!guiActive)
mSimulationTime += frametime;
// Main menu opened? Then scripts are also paused. // Main menu opened? Then scripts are also paused.
bool paused = MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu); bool paused = MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu);
@ -182,6 +184,7 @@ void OMW::Engine::frame(float frametime)
{ {
std::cerr << "Error in framelistener: " << e.what() << std::endl; std::cerr << "Error in framelistener: " << e.what() << std::endl;
} }
return mSimulationTime;
} }
OMW::Engine::Engine(Files::ConfigurationManager& configurationManager) OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
@ -203,6 +206,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
, mScriptBlacklistUse (true) , mScriptBlacklistUse (true)
, mNewGame (false) , mNewGame (false)
, mCfgMgr(configurationManager) , mCfgMgr(configurationManager)
, mSimulationTime(0.0)
{ {
Misc::Rng::init(); Misc::Rng::init();
MWClass::registerClasses(); MWClass::registerClasses();
@ -587,8 +591,8 @@ void OMW::Engine::go()
frameTimer.setStartTick(); frameTimer.setStartTick();
//dt = std::min(dt, 0.2); //dt = std::min(dt, 0.2);
frame(dt); double simulationTime = frame(dt);
mViewer->frame(/*simulationTime*/); mViewer->frame(simulationTime);
} }
// Save user settings // Save user settings

4
apps/openmw/engine.hpp
View file

@ -100,6 +100,7 @@ namespace OMW
bool mNewGame; bool mNewGame;
osg::Timer_t mStartTick; osg::Timer_t mStartTick;
double mSimulationTime;
// not implemented // not implemented
Engine (const Engine&); Engine (const Engine&);
@ -107,7 +108,8 @@ namespace OMW
void executeLocalScripts(); void executeLocalScripts();
void frame (float dt); /// @return The new simulationTime
double frame (float dt);
/// Load settings from various files, returns the path to the user settings file /// Load settings from various files, returns the path to the user settings file
std::string loadSettings (Settings::Manager & settings); std::string loadSettings (Settings::Manager & settings);