Changeset 1824

Timestamp:

Sep 22, 2008, 9:45:37 PM (16 years ago)

Author:

rgrieder

Message:

Added some more Ogre shutdown code. Does not yet work properly if you wish to reload GSGraphics.

Location:

code/trunk/src

Files:

• core/RootGameState.cc (modified) (3 diffs)
• orxonox/gamestates/GSGraphics.cc (modified) (5 diffs)
• orxonox/objects/Projectile.cc (modified) (1 diff)

code/trunk/src/core/RootGameState.cc

@@ -132 +132 @@
     void RootGameState::start(int argc, char** argv)
     {
+#ifdef NDEBUG
         try
         {
+#endif
             // start global orxonox time
             Clock clock;
@@ -160 +162 @@
 
             this->deactivate();
+#ifdef NDEBUG
         }
         // Note: These are all unhandled exceptions that should not have made its way here!
@@ -175 +178 @@
             abort();
         }
+#endif
     }
 

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -137 +137 @@
     void GSGraphics::leave()
     {
+        using namespace Ogre;
+
         delete this->guiManager_;
 
@@ -145 +147 @@
         delete this->inputManager_;
 
-        this->ogreRoot_->detachRenderTarget(this->renderWindow_);
-        delete this->renderWindow_;
-        //this->ogreRoot_->shutdown
-        // TODO: destroy render window
+        // destroy render window
+        this->renderWindow_->removeAllViewports();
+        this->renderWindow_->removeAllListeners();
+        RenderSystem* renderer = this->ogreRoot_->getRenderSystem();
+        renderer->destroyRenderWindow("Orxonox");
+
+        // Does the opposite of initialise()
+        ogreRoot_->shutdown();
+
+        // Remove all resources and resource groups
+        StringVector groups = ResourceGroupManager::getSingleton().getResourceGroups();
+        for (StringVector::iterator it = groups.begin(); it != groups.end(); ++it)
+        {
+            ResourceGroupManager::getSingleton().destroyResourceGroup(*it);
+        }
+
+        ParticleSystemManager::getSingleton().removeAllTemplates();
+
+        // Shutdown the render system
+        this->ogreRoot_->setRenderSystem(0);
 
         Settings::_getInstance().bShowsGraphics_ = false;
@@ -277 +295 @@
         CCOUT(4) << "Creating render window" << std::endl;
 
-        this->renderWindow_ = ogreRoot_->initialise(true, "OrxonoxV2");
+        this->renderWindow_ = ogreRoot_->initialise(true, "Orxonox");
 
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, this);
@@ -291 +309 @@
         CCOUT(4) << "Initialising resources" << std::endl;
         //TODO: Do NOT load all the groups, why are we doing that? And do we really do that? initialise != load...
-        try
-        {
+        //try
+        //{
             Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
             /*Ogre::StringVector str = Ogre::ResourceGroupManager::getSingleton().getResourceGroups();
@@ -299 +317 @@
             Ogre::ResourceGroupManager::getSingleton().loadResourceGroup(str[i]);
             }*/
-        }
-        catch (...)
-        {
-            CCOUT(2) << "Error: There was a serious error when initialising the resources." << std::endl;
-            throw;
-        }
+        //}
+        //catch (...)
+        //{
+        //    CCOUT(2) << "Error: There was a serious error when initialising the resources." << std::endl;
+        //    throw;
+        //}
     }
 

code/trunk/src/orxonox/objects/Projectile.cc

@@ -54 +54 @@
         this->smokeTemplateName_ = "Orxonox/smoke4";
 
-        this->setStatic(false);
-        this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
+        this->setStatic(false);
+        this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
 
         if (this->owner_)