Changeset 5680 for code/branches/resource3/src

Timestamp:

Aug 25, 2009, 1:57:34 PM (15 years ago)

Author:

rgrieder

Message:

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

File:

• code/branches/resource3/src/core/Core.cc (modified) (3 diffs)

code/branches/resource3/src/core/Core.cc

@@ -286 +286 @@
 
         // Load OGRE excluding the renderer and the render window
-        this->graphicsManager_.reset(new GraphicsManager(false));
+        //this->graphicsManager_.reset(new GraphicsManager(false));
 
         // initialise Tcl
@@ -310 +310 @@
 
         // 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.
@@ -334 +335 @@
 
         // 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;