Changeset 2789 for code/branches

Timestamp:

Mar 16, 2009, 2:11:14 AM (16 years ago)

Author:

landauf

Message:

• Moved default-hud (chat, gamestate info) from Controller to HumanPlayer
• Added support for a Gametype-HUD to Gametype and PlayerInfo

Location:

code/branches/miniprojects/src/orxonox/objects

Files:

• controllers/Controller.cc (modified) (1 diff)
• controllers/Controller.h (modified) (1 diff)
• gametypes/Gametype.h (modified) (1 diff)
• infos/GametypeInfo.cc (modified) (1 diff)
• infos/GametypeInfo.h (modified) (2 diffs)
• infos/HumanPlayer.cc (modified) (4 diffs)
• infos/HumanPlayer.h (modified) (3 diffs)
• infos/PlayerInfo.cc (modified) (7 diffs)
• infos/PlayerInfo.h (modified) (4 diffs)

code/branches/miniprojects/src/orxonox/objects/controllers/Controller.cc

@@ -43 +43 @@
         this->player_ = 0;
         this->controllableEntity_ = 0;
-        this->hud_ = 0;
-        this->bUpdateHUD_ = false;
     }
 
     Controller::~Controller()
     {
-        if (this->isInitialized() && this->hud_)
-            delete this->hud_;
-    }
-
-    void Controller::changedControllableEntity()
-    {
-        if (this->bUpdateHUD_)
-        {
-            this->updateHUD();
-            this->bUpdateHUD_ = false;
-        }
-
-        if (this->hud_)
-            this->hud_->setOwner(this->getControllableEntity());
-    }
-
-    void Controller::updateHUD()
-    {
-        if (this->hud_)
-        {
-            delete this->hud_;
-            this->hud_ = 0;
-        }
-
-        if (this->hudtemplate_ != "")
-        {
-            this->hud_ = new OverlayGroup(this);
-            this->hud_->addTemplate(this->hudtemplate_);
-            this->hud_->setOwner(this->getControllableEntity());
-        }
     }
 }

code/branches/miniprojects/src/orxonox/objects/controllers/Controller.h

@@ -57 +57 @@
             inline ControllableEntity* getControllableEntity() const
                 { return this->controllableEntity_; }
-            virtual void changedControllableEntity();
-
-            inline void setHUDTemplate(const std::string& name)
-            {
-                if (name != this->hudtemplate_)
-                {
-                    this->hudtemplate_ = name;
-                    if (this->controllableEntity_)
-                        this->updateHUD();
-                    else
-                        this->bUpdateHUD_ = true;
-                }
-            }
-            inline const std::string& getHUDTemplate() const
-                { return this->hudtemplate_; }
-
-            inline OverlayGroup* getHUD() const
-                { return this->hud_; }
+            virtual void changedControllableEntity() {}
 
         protected:
-            void updateHUD();
-
             PlayerInfo* player_;
             ControllableEntity* controllableEntity_;
-            std::string hudtemplate_;
-            OverlayGroup* hud_;
-            bool bUpdateHUD_;
     };
 }

code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.h

@@ -112 +112 @@
                 { return this->gtinfo_.startCountdown_; }
 
+            inline void setHUDTemplate(const std::string& name)
+                { this->gtinfo_.hudtemplate_ = name; }
+            inline const std::string& getHUDTemplate() const
+                { return this->gtinfo_.hudtemplate_; }
+
             void addBots(unsigned int amount);
             void killBots(unsigned int amount = 0);

code/branches/miniprojects/src/orxonox/objects/infos/GametypeInfo.cc

@@ -58 +58 @@
         registerVariable(this->startCountdown_,         variableDirection::toclient);
         registerVariable(this->bStartCountdownRunning_, variableDirection::toclient);
+        registerVariable(this->hudtemplate_,            variableDirection::toclient);
     }
 }

code/branches/miniprojects/src/orxonox/objects/infos/GametypeInfo.h

@@ -56 +56 @@
                 { return this->startCountdown_; }
 
+            inline const std::string& getHUDTemplate() const
+                { return this->hudtemplate_; }
+
         private:
             bool bStarted_;
@@ -61 +64 @@
             bool bStartCountdownRunning_;
             float startCountdown_;
+            std::string hudtemplate_;
     };
 }

code/branches/miniprojects/src/orxonox/objects/infos/HumanPlayer.cc

@@ -53 +53 @@
         this->defaultController_ = Class(HumanController);
 
+        this->humanHud_ = 0;
+
         this->setConfigValues();
         this->registerVariables();
@@ -59 +61 @@
     HumanPlayer::~HumanPlayer()
     {
+        if (this->isInitialized() && this->humanHud_)
+            delete this->humanHud_;
     }
 
@@ -89 +93 @@
     void HumanPlayer::configvaluecallback_changedHUDTemplate()
     {
-        this->changedController();
+        this->setHumanHUDTemplate(this->hudtemplate_);
     }
 
@@ -146 +150 @@
     }
 
-    void HumanPlayer::changedController()
+    void HumanPlayer::changedControllableEntity()
     {
-        if (this->getController())
+        PlayerInfo::changedControllableEntity();
+
+        if (this->humanHud_)
+            this->humanHud_->setOwner(this->getControllableEntity());
+    }
+
+    void HumanPlayer::updateHumanHUD()
+    {
+        if (this->humanHud_)
         {
-            this->getController()->setHUDTemplate(this->hudtemplate_);
+            delete this->humanHud_;
+            this->humanHud_ = 0;
+        }
 
-            if (this->getController() && this->getController()->getHUD())
-                this->getController()->getHUD()->setOwner(this->getControllableEntity());
+        if (this->humanHudTemplate_ != "")
+        {
+            this->humanHud_ = new OverlayGroup(this);
+            this->humanHud_->addTemplate(this->humanHudTemplate_);
+            this->humanHud_->setOwner(this->getControllableEntity());
         }
     }

code/branches/miniprojects/src/orxonox/objects/infos/HumanPlayer.h

@@ -51 +51 @@
             void setClientID(unsigned int clientID);
 
-            virtual void changedController();
+            virtual void changedControllableEntity();
+
+            inline void setHumanHUDTemplate(const std::string& name)
+            {
+                if (name != this->humanHudTemplate_)
+                {
+                    this->humanHudTemplate_ = name;
+                    this->updateHumanHUD();
+                }
+            }
+            inline const std::string& getHumanHUDTemplate() const
+                { return this->humanHudTemplate_; }
+
+            inline OverlayGroup* getHumanHUD() const
+                { return this->humanHud_; }
 
         protected:
@@ -61 +75 @@
             void networkcallback_client_initialized();
 
+            void updateHumanHUD();
+
             std::string nick_;
             std::string synchronize_nick_;
@@ -66 +82 @@
             bool server_initialized_;
             bool client_initialized_;
+
+            std::string humanHudTemplate_;
+            OverlayGroup* humanHud_;
     };
 }

code/branches/miniprojects/src/orxonox/objects/infos/PlayerInfo.cc

@@ -35 +35 @@
 #include "network/ClientInformation.h"
 #include "objects/gametypes/Gametype.h"
+#include "overlays/OverlayGroup.h"
 
 namespace orxonox
@@ -50 +51 @@
         this->controllableEntity_ = 0;
         this->controllableEntityID_ = CLIENTID_UNKNOWN;
+        this->gametypeHud_ = 0;
 
         this->registerVariables();
@@ -68 +70 @@
             if (this->getGametype())
                 this->getGametype()->playerLeft(this);
+
+            if (this->BaseObject::isInitialized() && this->gametypeHud_)
+                delete this->gametypeHud_;
         }
     }
@@ -104 +109 @@
                 else
                     this->getGametype()->playerEntered(this);
+
+                if (this->isLocalPlayer() && this->isHumanPlayer())
+                    if (this->getGametype()->getHUDTemplate() != "")
+                        this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
             }
         }
@@ -141 +150 @@
         if (this->controller_)
             this->controller_->setControllableEntity(entity);
+
+        this->changedControllableEntity();
     }
 
@@ -155 +166 @@
             if (callback)
                 entity->removePlayer();
+
+            this->changedControllableEntity();
         }
     }
@@ -172 +185 @@
         }
     }
+
+    void PlayerInfo::changedControllableEntity()
+    {
+        if (this->gametypeHud_)
+            this->gametypeHud_->setOwner(this->getControllableEntity());
+    }
+
+    void PlayerInfo::updateGametypeHUD()
+    {
+        if (this->gametypeHud_)
+        {
+            delete this->gametypeHud_;
+            this->gametypeHud_ = 0;
+        }
+
+        if (this->isLocalPlayer() && this->isHumanPlayer() && this->gametypeHudTemplate_ != "")
+        {
+            this->gametypeHud_ = new OverlayGroup(this);
+            this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
+            this->gametypeHud_->setOwner(this->getControllableEntity());
+        }
+    }
 }

code/branches/miniprojects/src/orxonox/objects/infos/PlayerInfo.h

@@ -49 +49 @@
             virtual void changedGametype();
 
+            virtual void changedController() {}
+            virtual void changedControllableEntity();
+
             inline bool isHumanPlayer() const
                 { return this->bHumanPlayer_; }
@@ -73 +76 @@
             inline Controller* getController() const
                 { return this->controller_; }
-            virtual void changedController() {}
+
+            inline void setGametypeHUDTemplate(const std::string& name)
+            {
+                if (name != this->gametypeHudTemplate_)
+                {
+                    this->gametypeHudTemplate_ = name;
+                    this->updateGametypeHUD();
+                }
+            }
+            inline const std::string& getGametypeHUDTemplate() const
+                { return this->gametypeHudTemplate_; }
+
+            inline OverlayGroup* getGametypeHUD() const
+                { return this->gametypeHud_; }
 
         protected:
@@ -86 +102 @@
         private:
             void networkcallback_changedcontrollableentityID();
+            void updateGametypeHUD();
 
             bool bReadyToSpawn_;
@@ -91 +108 @@
             ControllableEntity* controllableEntity_;
             unsigned int controllableEntityID_;
+            std::string gametypeHudTemplate_;
+            OverlayGroup* gametypeHud_;
     };
 }