fixed minor crash on shutdown example-voxel*

qwertzui11 · Jul 11, 2014 · 7dc03f9 · 7dc03f9
1 parent 0ff9042
commit 7dc03f9
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/examples/voxelterrain/source/Handler.hpp b/examples/voxelterrain/source/Handler.hpp
@@ -25,10 +25,10 @@ class Handler : public Ogre::FrameListener, public OIS::MouseListener, public OI
      * @brief Handler constructor
      */
     Handler()
-        : graphicDispatcher(0, true)
-        , camera(nullptr)
+        : camera(nullptr)
         , keyboard(nullptr)
         , mouse(nullptr)
+        , graphicDispatcher(0, true)
         , m_lookVert(blub::math::pi)
         , m_lookHor(0.)
         , m_forward(false)
@@ -48,8 +48,6 @@ class Handler : public Ogre::FrameListener, public OIS::MouseListener, public OI
         inputManager->destroyInputObject(keyboard);
         inputManager->destroyInputObject(mouse);
         OIS::InputManager::destroyInputSystem(inputManager);
-
-        renderScene->destroyAllMovableObjects();
     }
 
     /**
@@ -71,7 +69,7 @@ class Handler : public Ogre::FrameListener, public OIS::MouseListener, public OI
         renderSystem->initialise(true);
 
         renderScene = renderSystem->createSceneManager(Ogre::ST_GENERIC);
-        // renderScene = renderSystem->createSceneManager("OctreeSceneManager");
+//        renderScene = renderSystem->createSceneManager("OctreeSceneManager");
 
 //        Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../data", "FileSystem");
 //        Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
@@ -187,7 +185,7 @@ class Handler : public Ogre::FrameListener, public OIS::MouseListener, public OI
         m_lookHor += static_cast<blub::real>(arg.state.Y.rel) / -500.;
         m_lookVert += static_cast<blub::real>(arg.state.X.rel) / -500.;
 
-		m_lookHor = blub::math::clamp<blub::real>(m_lookHor, -blub::math::piHalf, blub::math::piHalf);
+        m_lookHor = blub::math::clamp<blub::real>(m_lookHor, -blub::math::piHalf, blub::math::piHalf);
 
         const blub::quaternion rotVert(0, blub::math::sin(m_lookVert / 2.0), 0, blub::math::cos(m_lookVert / 2.0));
         const blub::quaternion rotHor(blub::math::sin(m_lookHor / 2.0), 0, 0, blub::math::cos(m_lookHor / 2.0));
@@ -287,8 +285,6 @@ class Handler : public Ogre::FrameListener, public OIS::MouseListener, public OI
     t_sigMouseGotPressed* signalMouseGotPressed() {return &m_sigMouseGotPressed;}
 
 public:
-    blub::async::dispatcher graphicDispatcher;
-
     blub::scopedPointer<Ogre::Root> renderSystem;
     Ogre::SceneManager* renderScene;
     Ogre::Camera* camera;
@@ -297,6 +293,8 @@ class Handler : public Ogre::FrameListener, public OIS::MouseListener, public OI
     OIS::Keyboard *keyboard;
     OIS::Mouse *mouse;
 
+    blub::async::dispatcher graphicDispatcher;
+
 protected:
     blub::real m_lookVert;
     blub::real m_lookHor;