Changeset 5614 for code/branches/resource2/src/core/Core.cc

Timestamp:

Aug 10, 2009, 5:36:45 PM (15 years ago)

Author:

rgrieder

Message:

Creating Ogre::Root in non graphics mode as well. This allows to always make use of the ResourceGroupManager.
Also removed resource related parts from GraphicsManager.

This revision does not run!

File:

• code/branches/resource2/src/core/Core.cc (modified) (4 diffs)

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

@@ -313 +313 @@
         // creates the class hierarchy for all classes with factories
         Factory::createClassHierarchy();
+
+        // Load OGRE excluding the renderer and the render window
+        this->graphicsManager_.reset(new GraphicsManager(false));
     }
 
@@ -328 +331 @@
             return;
 
-        // Load OGRE including the render window
-        scoped_ptr<GraphicsManager> graphicsManager(new GraphicsManager());
+        // Upgrade OGRE to receive a render window
+        graphicsManager_->upgradeToGraphics();
 
         // The render window width and height are used to set up the mouse movement.
         size_t windowHnd = 0;
-        graphicsManager->getRenderWindow()->getCustomAttribute("WINDOW", &windowHnd);
+        graphicsManager_->getRenderWindow()->getCustomAttribute("WINDOW", &windowHnd);
 
         // Calls the InputManager which sets up the input devices.
@@ -339 +342 @@
 
         // load the CEGUI interface
-        guiManager_.reset(new GUIManager(graphicsManager->getRenderWindow()));
-
-        // Dismiss scoped pointers
-        graphicsManager_.swap(graphicsManager);
+        guiManager_.reset(new GUIManager(graphicsManager_->getRenderWindow()));
+
+        // Dismiss scoped pointer
         inputManager_.swap(inputManager);
 
@@ -356 +358 @@
         this->inputManager_.reset();;
         this->graphicsManager_.reset();
+
+        // Load Ogre::Root again, but without the render system
+        this->graphicsManager_.reset(new GraphicsManager(false));
 
         bGraphicsLoaded_ = false;