Changeset 1688 for code/branches/gui

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

Files:

• src/core/CorePrereqs.h (modified) (1 diff)
• src/core/GameState.cc (modified) (6 diffs)
• src/core/GameState.h (modified) (7 diffs)
• src/core/RootGameState.cc (modified) (1 diff)
• src/core/RootGameState.h (modified) (1 diff)
• src/orxonox/Main.cc (modified) (2 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/gamestates/GSGUI.cc (modified) (3 diffs)
• src/orxonox/gamestates/GSGUI.h (modified) (2 diffs)
• src/orxonox/gamestates/GSGraphics.cc (modified) (4 diffs)
• src/orxonox/gamestates/GSGraphics.h (modified) (2 diffs)
• src/orxonox/gamestates/GSIO.cc (deleted)
• src/orxonox/gamestates/GSIO.h (deleted)
• src/orxonox/gamestates/GSIOConsole.cc (modified) (1 diff)
• src/orxonox/gamestates/GSIOConsole.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)
• src/orxonox/gamestates/GSRoot.h (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/gui/src/core/CorePrereqs.h

@@ -163 +163 @@
   // game states
   class GameState;
+  template <class ParentType>
+  class GameStateTyped;
   class RootGameState;
 

code/branches/gui/src/core/GameState.cc

@@ -45 +45 @@
     GameState::GameState(const std::string& name)
         : name_(name)
-        , parent_(0)
+        //, parent_(0)
         , activeChild_(0)
-        //, bPauseParent_(false)
+        //, bPausegetParent()(false)
     {
         Operations temp = {false, false, false, false, false};
@@ -103 +103 @@
 
         // mark us as parent
-        state->parent_ = this;
+        state->setParent(this);
     }
 
@@ -178 +178 @@
         this->allChildren_[grandchild->getName()] = grandchild;
         this->grandchildrenToChildren_[grandchild] = child;
-        if (this->parent_)
-            this->parent_->grandchildAdded(this, grandchild);
+        if (this->getParent())
+            this->getParent()->grandchildAdded(this, grandchild);
     }
 
@@ -196 +196 @@
         this->allChildren_.erase(grandchild->getName());
         this->grandchildrenToChildren_.erase(grandchild);
-        if (this->parent_)
-            this->parent_->grandchildRemoved(grandchild);
+        if (this->getParent())
+            this->getParent()->grandchildRemoved(grandchild);
     }
 
@@ -208 +208 @@
     GameState* GameState::getState(const std::string& name)
     {
-        if (this->parent_)
-            return this->parent_->getState(name);
+        if (this->getParent())
+            return this->getParent()->getState(name);
         else
         {
@@ -227 +227 @@
     GameState* GameState::getRoot()
     {
-        if (this->parent_)
-            return this->parent_->getRoot();
+        if (this->getParent())
+            return this->getParent()->getRoot();
         else
             return this;

code/branches/gui/src/core/GameState.h

@@ -41 +41 @@
 #include <vector>
 #include <map>
+#include <cassert>
 #include "util/Integers.h"
 #include "Clock.h"
@@ -63 +64 @@
     {
         friend class RootGameState;
+        template <class ParentType>
+        friend class GameStateTyped;
 
     public:
@@ -79 +82 @@
 
     public:
-        GameState(const std::string& name);
         virtual ~GameState();
 
@@ -88 +90 @@
         GameState* getState(const std::string& name);
         GameState* getRoot();
-        GameState* getParent() const { return this->parent_; }
         //! Returns the currently active game state
         virtual GameState* getCurrentState();
@@ -107 +108 @@
         void tickChild(const Clock& time) { if (this->getActiveChild()) this->getActiveChild()->tick(time); }
 
+        virtual GameState* getParent() const = 0;
+        virtual void setParent(GameState* state) = 0;
+
     private:
+        // Making the constructor private ensures that game states
+        // are always derivates of GameStateTyped<T>. Note the friend declaration above.
+        GameState(const std::string& name);
+
         //! Performs a transition to 'destination'
         virtual void makeTransition(GameState* source, GameState* destination);
@@ -120 +128 @@
         const std::string                   name_;
         Operations                          operation_;
-        GameState*                          parent_;
         GameState*                          activeChild_;
         //bool                                bPauseParent_;
@@ -126 +133 @@
         std::map<GameState*, GameState*>    grandchildrenToChildren_;
     };
+
+    template <class ParentType>
+    class GameStateTyped : public GameState
+    {
+    public:
+        GameStateTyped(const std::string& name) : GameState(name) { }
+        virtual ~GameStateTyped() { }
+
+        ParentType* getParent() const
+            { return parent_; }
+
+    protected:
+        void setParent(GameState* state)
+        {
+            assert(dynamic_cast<ParentType*>(state) != 0);
+            this->parent_ = dynamic_cast<ParentType*>(state);
+        }
+
+    private:
+        ParentType* parent_;
+    };
 }
 

code/branches/gui/src/core/RootGameState.cc

@@ -39 +39 @@
 
     RootGameState::RootGameState(const std::string& name)
-        : GameState(name)
+        : GameStateTyped<GameState>(name)
         , stateRequest_("")
     {

code/branches/gui/src/core/RootGameState.h

@@ -35 +35 @@
 namespace orxonox
 {
-    class _CoreExport RootGameState : public GameState
+    class _CoreExport RootGameState : public GameStateTyped<GameState>
     {
     public:

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

code/branches/gui/visual_studio/vc8/orxonox.vcproj

@@ -504 +504 @@
                                 </File>
                                 <File
-                                        RelativePath="..\..\src\orxonox\gamestates\GSIO.cc"
-                                        >
-                                </File>
-                                <File
                                         RelativePath="..\..\src\orxonox\gamestates\GSIOConsole.cc"
                                         >
@@ -759 +755 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\gamestates\GSGUI.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\orxonox\gamestates\GSIO.h"
                                         >
                                 </File>