Changeset 1688 for code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

Timestamp:

Aug 31, 2008, 5:50:42 PM (16 years ago)

Author:

rgrieder

Message:

Modified the GameState hierarchy so that you can get the parent with the actual type by calling getParent().

File:

• code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) (4 diffs)

code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

@@ -57 +57 @@
 {
     GSGraphics::GSGraphics()
-        : GameState("graphics")
+        : GameStateTyped<GSRoot>("graphics")
         , ogreRoot_(0)
         , inputManager_(0)
@@ -77 +77 @@
     void GSGraphics::setConfigValues()
     {
-        SetConfigValue(resourceFile_,    "resources.cfg").description("Location of the resources file in the data path.");
+        SetConfigValue(resourceFile_, "resources.cfg").description("Location of the resources file in the data path.");
         SetConfigValue(statisticsRefreshCycle_, 200000).description("Sets the time in microseconds interval at which average fps, etc. get updated.");
     }
@@ -85 +85 @@
         setConfigValues();
 
-        this->ogreRoot_ = Ogre::Root::getSingletonPtr();
+        this->ogreRoot_ = getParent()->getOgreRoot();
 
         this->declareResources();
@@ -94 +94 @@
 
         // HACK: temporary:
-        GraphicsEngine& graphicsEngine = GraphicsEngine::getInstance();
-        graphicsEngine.renderWindow_ = this->renderWindow_;
-        graphicsEngine.root_ = this->ogreRoot_;
-        graphicsEngine.viewport_ = this->viewport_;
+        GraphicsEngine* graphicsEngine = getParent()->getGraphicsEngine();
+        graphicsEngine->renderWindow_  = this->renderWindow_;
+        graphicsEngine->root_          = this->ogreRoot_;
+        graphicsEngine->viewport_      = this->viewport_;