mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 10:23:56 +00:00
Code Issues Releases Wiki Activity

Fix for various Viewer::frame calls resetting the simulationTime

Browse source
This commit is contained in:
scrawl 2015-06-14 18:19:53 +02:00
parent 9fc2c2e8ee
commit b90fc8ad92
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/loadingscreen.cpp
View file

@ -259,7 +259,7 @@ namespace MWGui
MWBase::Environment::get().getInputManager()->update(0, true, true);
//osg::Timer timer;
mViewer->frame();
mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
//std::cout << "frame took " << timer.time_m() << std::endl;
//if (mViewer->getIncrementalCompileOperation())

4
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -851,7 +851,7 @@ namespace MWGui
mMessageBoxManager->onFrame(0.f);
MWBase::Environment::get().getInputManager()->update(0, true, false);
mViewer->frame();
mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
}
}
}
@ -1744,7 +1744,7 @@ namespace MWGui
{
MWBase::Environment::get().getInputManager()->update(0, true, false);
mViewer->frame();
mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
}
mVideoWidget->stop();

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

@ -432,7 +432,7 @@ namespace MWRender
mRootNode->addChild(rttCamera);
mViewer->frame();
mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
// The draw needs to complete before we can copy back our image.
osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback);