Merge pull request Revolutionary-Games#27 from Revolutionary-Games/25…

…_ogre_engine_update Fix OgreEngine::update() to use RAII StateLock
yowshi · May 17, 2013 · f8cca45 · f8cca45
2 parents b119222 + 653c821
commit f8cca45
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/ogre/ogre_engine.cpp b/src/ogre/ogre_engine.cpp
@@ -260,16 +260,12 @@ OgreEngine::shutdown() {
 
 void
 OgreEngine::update() {
-    // Lock shared state
-    InputState::instance().lockWorkingCopy();
-    RenderState::instance().lockStable();
+    StateLock<InputState, StateBuffer::WorkingCopy> inputLock;
+    StateLock<RenderState, StateBuffer::Stable> renderLock;
     // Handle events
     Ogre::WindowEventUtilities::messagePump();
     // Update systems
     Engine::update();
-    // Release shared state
-    RenderState::instance().releaseStable();
-    InputState::instance().releaseWorkingCopy();
 }