Changeset 2789 for code/branches/miniprojects/src/orxonox/objects/infos/HumanPlayer.cc

Timestamp:

Mar 16, 2009, 2:11:14 AM (15 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

File:

• code/branches/miniprojects/src/orxonox/objects/infos/HumanPlayer.cc (modified) (4 diffs)

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