Changeset 2817 for code/branches/gui/src/core/GameState.cc

Timestamp:

Mar 21, 2009, 10:17:59 PM (16 years ago)

Author:

rgrieder

Message:

Removed GameState template and renamed GameStateBase to GameState.
Moved statistics stuff (fps and tick time) to Game and removed the remaining hacks in GSGraphics and GSRoot.

File:

• code/branches/gui/src/core/GameState.cc (modified) (23 diffs)

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

@@ -30 +30 @@
 @file
 @brief
-    Implementation of GameStateBase class.
+    Implementation of GameState class.
 */
 
@@ -43 +43 @@
         Constructor only initialises variables and sets the name permanently.
     */
-    GameStateBase::GameStateBase(const std::string& name)
+    GameState::GameState(const std::string& name)
         : name_(name)
-        //, parent_(0)
+        , parent_(0)
         , activeChild_(0)
         //, bPausegetParent()(false)
@@ -57 +57 @@
         Destructor only checks that we don't delete an active state.
     */
-    GameStateBase::~GameStateBase()
+    GameState::~GameState()
     {
         OrxAssert(this->operation_.active == false, "Deleting an active GameState is a very bad idea..");
@@ -69 +69 @@
         The state to be added.
     */
-    void GameStateBase::addChild(GameStateBase* state)
+    void GameState::addChild(GameState* state)
     {
         if (!state)
             return;
         // check if the state/tree to be added has states in it that already exist in this tree.
-        for (std::map<std::string, GameStateBase*>::const_iterator it = state->allChildren_.begin();
+        for (std::map<std::string, GameState*>::const_iterator it = state->allChildren_.begin();
             it != state->allChildren_.end(); ++it)
         {
@@ -96 +96 @@
 
         // merge the child's children into this tree
-        for (std::map<std::string, GameStateBase*>::const_iterator it = state->allChildren_.begin();
+        for (std::map<std::string, GameState*>::const_iterator it = state->allChildren_.begin();
             it != state->allChildren_.end(); ++it)
             this->grandchildAdded(state, it->second);
@@ -113 +113 @@
         GameState by instance pointer
     */
-    void GameStateBase::removeChild(GameStateBase* state)
-    {
-        std::map<GameStateBase*, GameStateBase*>::iterator it = this->grandchildrenToChildren_.find(state);
+    void GameState::removeChild(GameState* state)
+    {
+        std::map<GameState*, GameState*>::iterator it = this->grandchildrenToChildren_.find(state);
         if (it != this->grandchildrenToChildren_.end())
         {
@@ -127 +127 @@
             else
             {
-                for (std::map<GameStateBase*, GameStateBase*>::const_iterator it = state->grandchildrenToChildren_.begin();
+                for (std::map<GameState*, GameState*>::const_iterator it = state->grandchildrenToChildren_.begin();
                     it != state->grandchildrenToChildren_.end(); ++it)
                     this->grandchildRemoved(it->first);
@@ -150 +150 @@
     */
 
-    void GameStateBase::removeChild(const std::string& name)
-    {
-        GameStateBase* state = getState(name);
+    void GameState::removeChild(const std::string& name)
+    {
+        GameState* state = getState(name);
         if (state)
         {
@@ -173 +173 @@
         The child that has been added.
     */
-    inline void GameStateBase::grandchildAdded(GameStateBase* child, GameStateBase* grandchild)
+    inline void GameState::grandchildAdded(GameState* child, GameState* grandchild)
     {
         // fill the two maps correctly.
         this->allChildren_[grandchild->getName()] = grandchild;
         this->grandchildrenToChildren_[grandchild] = child;
-        if (this->getParentAsBase())
-            this->getParentAsBase()->grandchildAdded(this, grandchild);
+        if (this->getParent())
+            this->getParent()->grandchildAdded(this, grandchild);
     }
 
@@ -191 +191 @@
         The child that has been removed.
     */
-    inline void GameStateBase::grandchildRemoved(GameStateBase* grandchild)
+    inline void GameState::grandchildRemoved(GameState* grandchild)
     {
         // adjust the two maps correctly.
         this->allChildren_.erase(grandchild->getName());
         this->grandchildrenToChildren_.erase(grandchild);
-        if (this->getParentAsBase())
-            this->getParentAsBase()->grandchildRemoved(grandchild);
+        if (this->getParent())
+            this->getParent()->grandchildRemoved(grandchild);
     }
 
@@ -206 +206 @@
         Remember that the every node has a map with all its child nodes.
     */
-    GameStateBase* GameStateBase::getState(const std::string& name)
-    {
-        if (this->getParentAsBase())
-            return this->getParentAsBase()->getState(name);
+    GameState* GameState::getState(const std::string& name)
+    {
+        if (this->getParent())
+            return this->getParent()->getState(name);
         else
         {
@@ -216 +216 @@
                 return this;
             // Search in the map. If there is no entry, we can be sure the state doesn't exist.
-            std::map<std::string, GameStateBase*>::const_iterator it = this->allChildren_.find(name);
+            std::map<std::string, GameState*>::const_iterator it = this->allChildren_.find(name);
             return (it!= this->allChildren_.end() ? it->second : 0);
         }
@@ -225 +225 @@
         Returns the root node of the tree.
     */
-    GameStateBase* GameStateBase::getRoot()
-    {
-        if (this->getParentAsBase())
-            return this->getParentAsBase()->getRoot();
+    GameState* GameState::getRoot()
+    {
+        if (this->getParent())
+            return this->getParent()->getRoot();
         else
             return this;
@@ -240 +240 @@
         have active children itself. Many states can be active at once.
     */
-    GameStateBase* GameStateBase::getCurrentState()
+    GameState* GameState::getCurrentState()
     {
         if (this->operation_.active)
@@ -251 +251 @@
         else
         {
-            if (this->getParentAsBase())
-                return this->getParentAsBase()->getCurrentState();
+            if (this->getParent())
+                return this->getParent()->getCurrentState();
             else
                 return 0;
@@ -262 +262 @@
         Determines whether 'state' is in this subtree, including this node.
     */
-    bool GameStateBase::isInSubtree(GameStateBase* state) const
+    bool GameState::isInSubtree(GameState* state) const
     {
         return (grandchildrenToChildren_.find(state) != grandchildrenToChildren_.end()
@@ -275 +275 @@
         The state to be entered, has to exist in the tree.
     */
-    void GameStateBase::requestState(const std::string& name)
+    void GameState::requestState(const std::string& name)
     {
         assert(getRoot());
@@ -286 +286 @@
         the method can assume certain things to be granted (like 'this' is always active).
     */
-    void GameStateBase::makeTransition(GameStateBase* source, GameStateBase* destination)
-    {
-        if (source == this->getParentAsBase())
+    void GameState::makeTransition(GameState* source, GameState* destination)
+    {
+        if (source == this->getParent())
         {
             // call is from the parent
@@ -308 +308 @@
 
         // Check for 'destination' in the children map first
-        std::map<GameStateBase*, GameStateBase*>::const_iterator it
+        std::map<GameState*, GameState*>::const_iterator it
             = this->grandchildrenToChildren_.find(destination);
         if (it != this->grandchildrenToChildren_.end())
@@ -319 +319 @@
         {
             // parent. We can be sure of this.
-            assert(this->getParentAsBase() != 0);
+            assert(this->getParent() != 0);
 
             this->deactivate();
-            this->getParentAsBase()->makeTransition(this, destination);
+            this->getParent()->makeTransition(this, destination);
         }
     }
@@ -330 +330 @@
         Activates the state. Only sets bActive_ to true and notifies the parent.
     */
-    void GameStateBase::activate()
+    void GameState::activate()
     {
         this->operation_.active = true;
@@ -341 +341 @@
         Activates the state. Only sets bActive_ to false and notifies the parent.
     */
-    void GameStateBase::deactivate()
+    void GameState::deactivate()
     {
         this->operation_.leaving = true;
@@ -358 +358 @@
         This method is not virtual! You cannot override it therefore.
     */
-    void GameStateBase::tick(const Clock& time)
+    void GameState::tick(const Clock& time)
     {
         this->operation_.running = true;