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

Timestamp:

Aug 31, 2008, 5:50:42 PM (17 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/GSGUI.cc (modified) (3 diffs)

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

@@ -39 +39 @@
 {
     GSGUI::GSGUI()
-        : GameState("gui")
+        : GameStateTyped<GSGraphics>("gui")
     {
     }
@@ -49 +49 @@
     void GSGUI::enter()
     {
+        guiManager_ = getParent()->getGUIManager();
+
         // show main menu
-        GUIManager::getInstance().showGUI("MainMenu", 0);
-        GraphicsEngine::getInstance().getViewport()->setCamera(GUIManager::getInstance().getCamera());
+        guiManager_->showGUI("MainMenu", 0);
+        getParent()->getViewport()->setCamera(guiManager_->getCamera());
     }
 
     void GSGUI::leave()
     {
-        GUIManager::getInstance().hideGUI();
+        guiManager_->hideGUI();
     }
 
@@ -62 +64 @@
     {
         // tick CEGUI
-        GUIManager::getInstance().tick(time.getDeltaTime());
+        guiManager_->tick(time.getDeltaTime());
 
         this->tickChild(time);