From 289587b1a9114a36b51897d969f326cdfd3d579e Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 15 Jun 2013 16:29:25 +0200 Subject: [PATCH] Cleanup --- apps/openmw/engine.cpp | 48 ------------------------------------------ apps/openmw/engine.hpp | 2 -- 2 files changed, 50 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index e78162c293..acc3753e4e 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -77,7 +77,6 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt) { try { - handleSDLMessages(); float frametime = std::min(evt.timeSinceLastFrame, 0.2f); 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()->onFrame(frametime); - - //Flush any events that weren't handled this frame - SDL_FlushEvents(0x0, 0xFFFFFFFF); } catch (const std::exception& e) { @@ -134,50 +130,6 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt) 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) : mOgre (0) , mFpsLevel(0) diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp index a206166a5a..f80b67a358 100644 --- a/apps/openmw/engine.hpp +++ b/apps/openmw/engine.hpp @@ -105,8 +105,6 @@ namespace OMW void executeLocalScripts(); - void handleSDLMessages(); - virtual bool frameRenderingQueued (const Ogre::FrameEvent& evt); virtual bool frameStarted (const Ogre::FrameEvent& evt);