mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-29 15:36:41 +00:00
Cleanup
This commit is contained in:
parent
6958940131
commit
289587b1a9
2 changed files with 0 additions and 50 deletions
|
@ -77,7 +77,6 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
handleSDLMessages();
|
|
||||||
float frametime = std::min(evt.timeSinceLastFrame, 0.2f);
|
float frametime = std::min(evt.timeSinceLastFrame, 0.2f);
|
||||||
|
|
||||||
mEnvironment.setFrameDuration (frametime);
|
mEnvironment.setFrameDuration (frametime);
|
||||||
|
@ -122,9 +121,6 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
|
||||||
MWBase::Environment::get().getWindowManager()->wmUpdateFps(window->getLastFPS(), tri, batch);
|
MWBase::Environment::get().getWindowManager()->wmUpdateFps(window->getLastFPS(), tri, batch);
|
||||||
|
|
||||||
MWBase::Environment::get().getWindowManager()->onFrame(frametime);
|
MWBase::Environment::get().getWindowManager()->onFrame(frametime);
|
||||||
|
|
||||||
//Flush any events that weren't handled this frame
|
|
||||||
SDL_FlushEvents(0x0, 0xFFFFFFFF);
|
|
||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::exception& e)
|
||||||
{
|
{
|
||||||
|
@ -134,50 +130,6 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OMW::Engine::handleSDLMessages()
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
//Pump messages since the last frame
|
|
||||||
const int max_events = 20;
|
|
||||||
SDL_Event events[max_events];
|
|
||||||
|
|
||||||
SDL_PumpEvents();
|
|
||||||
int num_events = SDL_PeepEvents(events, max_events, SDL_PEEKEVENT, SDL_WINDOWEVENT, SDL_WINDOWEVENT);
|
|
||||||
|
|
||||||
bool resize = false;
|
|
||||||
|
|
||||||
unsigned int size_x = 0;
|
|
||||||
unsigned int size_y = 0;
|
|
||||||
|
|
||||||
if(num_events != 0)
|
|
||||||
{
|
|
||||||
for(int i=0; i < num_events; ++i)
|
|
||||||
{
|
|
||||||
switch(events[i].window.event)
|
|
||||||
{
|
|
||||||
case SDL_WINDOWEVENT_RESIZED:
|
|
||||||
resize = true;
|
|
||||||
size_x = events[i].window.data1;
|
|
||||||
size_y = events[i].window.data2;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//handle window movements
|
|
||||||
if(resize)
|
|
||||||
{
|
|
||||||
mOgre->getWindow()->resize(size_x, size_y);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(SDL_PeepEvents(NULL, 1, SDL_PEEKEVENT, SDL_QUIT, SDL_QUIT) != 0)
|
|
||||||
{
|
|
||||||
//user requested a quit, break out.
|
|
||||||
mOgre->getRoot()->queueEndRendering();
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
|
OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
|
||||||
: mOgre (0)
|
: mOgre (0)
|
||||||
, mFpsLevel(0)
|
, mFpsLevel(0)
|
||||||
|
|
|
@ -105,8 +105,6 @@ namespace OMW
|
||||||
|
|
||||||
void executeLocalScripts();
|
void executeLocalScripts();
|
||||||
|
|
||||||
void handleSDLMessages();
|
|
||||||
|
|
||||||
virtual bool frameRenderingQueued (const Ogre::FrameEvent& evt);
|
virtual bool frameRenderingQueued (const Ogre::FrameEvent& evt);
|
||||||
virtual bool frameStarted (const Ogre::FrameEvent& evt);
|
virtual bool frameStarted (const Ogre::FrameEvent& evt);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue