Changeset 1688 for code/branches/gui/src/orxonox

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().

Location:

code/branches/gui/src/orxonox

Files:

• Main.cc (modified) (2 diffs)
• OrxonoxPrereqs.h (modified) (1 diff)
• gamestates/GSGUI.cc (modified) (3 diffs)
• gamestates/GSGUI.h (modified) (2 diffs)
• gamestates/GSGraphics.cc (modified) (4 diffs)
• gamestates/GSGraphics.h (modified) (2 diffs)
• gamestates/GSIO.cc (deleted)
• gamestates/GSIO.h (deleted)
• gamestates/GSIOConsole.cc (modified) (1 diff)
• gamestates/GSIOConsole.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (3 diffs)
• gamestates/GSLevel.h (modified) (1 diff)
• gamestates/GSRoot.h (modified) (1 diff)

code/branches/gui/src/orxonox/Main.cc

@@ -130 +130 @@
     GSClient client;
     GSGUI gui;
-    GSIO io;
     GSIOConsole ioConsole;
 
@@ -139 +138 @@
     graphics.addChild(&gui);
 
-    root.addChild(&io);
-    io.addChild(&ioConsole);
+    root.addChild(&ioConsole);
 
     root.feedCommandLine(argc, argv);

code/branches/gui/src/orxonox/OrxonoxPrereqs.h

@@ -120 +120 @@
     //gui
     class GUIManager;
+
+    // game states
+    class GSRoot;
+    class GSGraphics;
+    class GSIO;
+    class GSIOConsole;
+    class GSLevel;
+    class GSStandalone;
+    class GSServer;
+    class GSClient;
+    class GSGUI;
 }
 

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);

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
+#include "GSGraphics.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSGUI : public GameState
+    class _OrxonoxExport GSGUI : public GameStateTyped<GSGraphics>
     {
     public:
@@ -45 +46 @@
         void leave();
         void ticked(const Clock& time);
+
+        GUIManager* guiManager_;
     };
 }

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_;
 
 

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

@@ -35 +35 @@
 #include "core/GameState.h"
 #include "core/OrxonoxClass.h"
+#include "GSRoot.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSGraphics : public GameState, public OrxonoxClass, public Ogre::WindowEventListener
+    class _OrxonoxExport GSGraphics : public GameStateTyped<GSRoot>, public OrxonoxClass, public Ogre::WindowEventListener
     {
         friend class ClassIdentifier<GSGraphics>;
@@ -44 +45 @@
         GSGraphics();
         ~GSGraphics();
+
+        Ogre::Viewport* getViewport() { return this->viewport_; }
+        GUIManager* getGUIManager() { return this->guiManager_; }
 
     private:

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

@@ -42 +42 @@
 {
     GSIOConsole::GSIOConsole()
-        : GameState("ioConsole")
+        : GameStateTyped<GSRoot>("ioConsole")
     {
     }

code/branches/gui/src/orxonox/gamestates/GSIOConsole.h

@@ -33 +33 @@
 #include <OgrePrerequisites.h>
 #include "core/GameState.h"
+#include "GSRoot.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSIOConsole : public GameState
+    class _OrxonoxExport GSIOConsole : public GameStateTyped<GSRoot>
     {
     public:

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

@@ -45 +45 @@
 {
     GSLevel::GSLevel(const std::string& name)
-        : GameState(name)
+        : GameStateTyped<GSGraphics>(name)
         , timeFactor_(1.0f)
         , sceneManager_(0)
@@ -68 +68 @@
 
         // create Ogre SceneManager for the level
-        this->sceneManager_ = GraphicsEngine::getInstance().getOgreRoot()->
-            createSceneManager(Ogre::ST_GENERIC, "LevelSceneManager");
+        this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC, "LevelSceneManager");
         COUT(4) << "Created SceneManager: " << sceneManager_->getName() << std::endl;
+
+        // temporary hack
         GraphicsEngine::getInstance().setLevelSceneManager(this->sceneManager_);
 
@@ -98 +99 @@
         delete this->radar_;
 
-        GraphicsEngine::getInstance().getOgreRoot()->destroySceneManager(this->sceneManager_);
+        Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
 
         inputState_->setHandler(0);

code/branches/gui/src/orxonox/gamestates/GSLevel.h

@@ -33 +33 @@
 #include <OgrePrerequisites.h>
 #include "core/GameState.h"
+#include "GSGraphics.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSLevel : public GameState
+    class _OrxonoxExport GSLevel : public GameStateTyped<GSGraphics>
     {
     public:

code/branches/gui/src/orxonox/gamestates/GSRoot.h

@@ -49 +49 @@
         { requestState("root"); }
 
+        Ogre::Root* getOgreRoot() { return this->ogreRoot_; }
+        GraphicsEngine* getGraphicsEngine() { return this->graphicsEngine_; }
+
     private:
         void enter();