teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Issue #19: Some more framelistener cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2011-10-08 10:15:03 +02:00
parent 8bebae17aa
commit fbcb5fe681
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/openmw/engine.cpp
View file

@ -77,6 +77,8 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
{ {
try try
{ {
mEnvironment.mFrameDuration = evt.timeSinceLastFrame;
if(mShowFPS) if(mShowFPS)
{ {
mEnvironment.mWindowManager->wmSetFPS(mOgre.getFPS()); mEnvironment.mWindowManager->wmSetFPS(mOgre.getFPS());
@ -138,19 +140,15 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
pos += chance; pos += chance;
} }
} }
//mEnvironment.mSoundManager->playSound(effect, 1.0, 1.0);
//printf("REGION: %s\n", test.name);
} }
else if(current->cell->data.flags & current->cell->Interior) else if(current->cell->data.flags & current->cell->Interior)
{ {
test.name = ""; test.name = "";
} }
mEnvironment.mFrameDuration = evt.timeSinceLastFrame;
//
// update GUI
mEnvironment.mWindowManager->onFrame(mEnvironment.mFrameDuration); mEnvironment.mWindowManager->onFrame(mEnvironment.mFrameDuration);
// global scripts // global scripts
@ -175,28 +173,27 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
std::vector<std::pair<std::string, Ogre::Vector3> > movement; std::vector<std::pair<std::string, Ogre::Vector3> > movement;
mEnvironment.mMechanicsManager->update (movement); mEnvironment.mMechanicsManager->update (movement);
if (mEnvironment.mWindowManager->getMode()==MWGui::GM_Game)
mEnvironment.mWorld->doPhysics (movement, mEnvironment.mFrameDuration);
if (focusFrameCounter++ == focusUpdateFrame) if (focusFrameCounter++ == focusUpdateFrame)
{ {
std::string handle = mEnvironment.mWorld->getFacedHandle(); std::string handle = mEnvironment.mWorld->getFacedHandle();
std::string name;
if (!handle.empty()) if (!handle.empty())
{ {
MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle); MWWorld::Ptr ptr = mEnvironment.mWorld->getPtrViaHandle (handle);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
name = MWWorld::Class::get (ptr).getName (ptr); {
std::string name = MWWorld::Class::get (ptr).getName (ptr);
if (!name.empty())
std::cout << "Object: " << name << std::endl;
}
} }
if (!name.empty())
std::cout << "Object: " << name << std::endl;
focusFrameCounter = 0; focusFrameCounter = 0;
} }
if (mEnvironment.mWindowManager->getMode()==MWGui::GM_Game)
mEnvironment.mWorld->doPhysics (movement, mEnvironment.mFrameDuration);
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {