[Orxonox-commit 957] r5680 - code/branches/resource3/src/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-25 13:57:34 +0200 (Tue, 25 Aug 2009)
New Revision: 5680

Modified:
   code/branches/resource3/src/core/Core.cc
Log:
Test commit: Not loading GraphicsManager in Core c'tor now (as it is in the trunk).
If this revision suddenly runs, then I still have little clue, but more than before ^^

Modified: code/branches/resource3/src/core/Core.cc
===================================================================
--- code/branches/resource3/src/core/Core.cc	2009-08-24 18:17:56 UTC (rev 5679)
+++ code/branches/resource3/src/core/Core.cc	2009-08-25 11:57:34 UTC (rev 5680)
@@ -285,7 +285,7 @@
         this->luaBind_.reset(new LuaBind());
 
         // Load OGRE excluding the renderer and the render window
-        this->graphicsManager_.reset(new GraphicsManager(false));
+        //this->graphicsManager_.reset(new GraphicsManager(false));
 
         // initialise Tcl
         this->tclBind_.reset(new TclBind(Core::getExternalMediaPathString()));
@@ -309,7 +309,8 @@
         Loki::ScopeGuard unloader = Loki::MakeObjGuard(*this, &Core::unloadGraphics);
 
         // Upgrade OGRE to receive a render window
-        graphicsManager_->upgradeToGraphics();
+        //graphicsManager_->upgradeToGraphics();
+        graphicsManager_.reset(new GraphicsManager(true));
 
         // The render window width and height are used to set up the mouse movement.
         size_t windowHnd = 0;
@@ -333,15 +334,16 @@
         this->graphicsManager_.reset();
 
         // Load Ogre::Root again, but without the render system
-        try
-            { this->graphicsManager_.reset(new GraphicsManager(false)); }
-        catch (...)
-        {
-            COUT(0) << "An exception occurred during 'new GraphicsManager' while "
-                    << "another exception was being handled. This will lead to undefined behaviour!" << std::endl
-                    << "Terminating the program." << std::endl;
-            abort();
-        }
+        //try
+        //    { this->graphicsManager_.reset(new GraphicsManager(false)); }
+        //catch (...)
+        //{
+        //    COUT(0) << "An exception occurred during 'new GraphicsManager' while "
+        //            << "another exception was being handled. This will lead to undefined behaviour!" << std::endl
+        //            << "Terminating the program." << std::endl;
+        //    abort();
+        //}
+        this->graphicsManager_.reset();
 
         bGraphicsLoaded_ = false;
     }