Changeset 2907 for code/branches/questsystem5/src/orxonox/objects/infos

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/infos/Bot.cc (modified) (2 diffs)
• src/orxonox/objects/infos/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/infos/GametypeInfo.cc (modified) (1 diff)
• src/orxonox/objects/infos/GametypeInfo.h (modified) (2 diffs)
• src/orxonox/objects/infos/HumanPlayer.cc (modified) (9 diffs)
• src/orxonox/objects/infos/HumanPlayer.h (modified) (3 diffs)
• src/orxonox/objects/infos/PlayerInfo.cc (modified) (3 diffs)
• src/orxonox/objects/infos/PlayerInfo.h (modified) (2 diffs)
• src/orxonox/objects/infos/PongBot.cc (added)
• src/orxonox/objects/infos/PongBot.h (added)

code/branches/questsystem5/src/orxonox/objects/infos/Bot.cc

@@ -30 +30 @@
 #include "Bot.h"
 
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -46 +46 @@
 
         this->bHumanPlayer_ = false;
-        this->bLocalPlayer_ = Core::isMaster();
+        this->bLocalPlayer_ = GameMode::isMaster();
         this->bSetUnreadyAfterSpawn_ = false;
         this->setReadyToSpawn(true);

code/branches/questsystem5/src/orxonox/objects/infos/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Bot.cc
+  PongBot.cc
   Info.cc
   PlayerInfo.cc

code/branches/questsystem5/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/questsystem5/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/questsystem5/src/orxonox/objects/infos/HumanPlayer.cc

@@ -30 +30 @@
 #include "HumanPlayer.h"
 
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -47 +47 @@
         RegisterObject(HumanPlayer);
 
-        this->server_initialized_ = Core::isMaster();
+        this->server_initialized_ = GameMode::isMaster();
         this->client_initialized_ = false;
 
@@ -53 +53 @@
         this->defaultController_ = Class(HumanController);
 
+        this->humanHud_ = 0;
+        this->gametypeHud_ = 0;
+
         this->setConfigValues();
         this->registerVariables();
@@ -59 +62 @@
     HumanPlayer::~HumanPlayer()
     {
+        if (this->BaseObject::isInitialized())
+        {
+            if (this->humanHud_)
+                delete this->humanHud_;
+
+            if (this->gametypeHud_)
+                delete this->gametypeHud_;
+        }
     }
 
@@ -82 +93 @@
             this->synchronize_nick_ = this->nick_;
 
-            if (Core::isMaster())
+            if (GameMode::isMaster())
                 this->setName(this->nick_);
         }
@@ -89 +100 @@
     void HumanPlayer::configvaluecallback_changedHUDTemplate()
     {
-        this->changedController();
+        this->setHumanHUDTemplate(this->hudtemplate_);
     }
 
@@ -105 +116 @@
             this->client_initialized_ = true;
 
-            if (!Core::isMaster())
+            if (!GameMode::isMaster())
                 this->setObjectMode(objectDirection::bidirectional);
             else
@@ -111 +122 @@
 
             this->createController();
+            this->updateHumanHUD();
         }
     }
@@ -146 +158 @@
     }
 
-    void HumanPlayer::changedController()
-    {
-        if (this->getController())
-        {
-            this->getController()->setHUDTemplate(this->hudtemplate_);
-
-            if (this->getController() && this->getController()->getHUD())
-                this->getController()->getHUD()->setOwner(this->getControllableEntity());
+    void HumanPlayer::changedGametype()
+    {
+        PlayerInfo::changedGametype();
+
+        if (this->isInitialized() && this->isLocalPlayer())
+            if (this->getGametype()->getHUDTemplate() != "")
+                this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
+    }
+
+    void HumanPlayer::changedControllableEntity()
+    {
+        PlayerInfo::changedControllableEntity();
+
+        if (this->humanHud_)
+            this->humanHud_->setOwner(this->getControllableEntity());
+    }
+
+    void HumanPlayer::updateHumanHUD()
+    {
+        if (this->humanHud_)
+        {
+            delete this->humanHud_;
+            this->humanHud_ = 0;
+        }
+
+        if (this->isLocalPlayer() && this->humanHudTemplate_ != "")
+        {
+            this->humanHud_ = new OverlayGroup(this);
+            this->humanHud_->addTemplate(this->humanHudTemplate_);
+            this->humanHud_->setOwner(this->getControllableEntity());
+        }
+    }
+
+    void HumanPlayer::updateGametypeHUD()
+    {
+        if (this->gametypeHud_)
+        {
+            delete this->gametypeHud_;
+            this->gametypeHud_ = 0;
+        }
+
+        if (this->isLocalPlayer() && this->gametypeHudTemplate_ != "")
+        {
+            this->gametypeHud_ = new OverlayGroup(this);
+            this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
+            this->gametypeHud_->setOwner(this->getGametype());
         }
     }

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

@@ -51 +51 @@
             void setClientID(unsigned int clientID);
 
-            virtual void changedController();
+            virtual void changedGametype();
+            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_; }
+
+            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:
@@ -61 +88 @@
             void networkcallback_client_initialized();
 
+            void updateHumanHUD();
+            void updateGametypeHUD();
+
             std::string nick_;
             std::string synchronize_nick_;
@@ -66 +96 @@
             bool server_initialized_;
             bool client_initialized_;
+
+            std::string humanHudTemplate_;
+            OverlayGroup* humanHud_;
+            std::string gametypeHudTemplate_;
+            OverlayGroup* gametypeHud_;
     };
 }

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

@@ -110 +110 @@
     void PlayerInfo::createController()
     {
+        if (this->controller_)
+        {
+            delete this->controller_;
+            this->controller_ = 0;
+        }
         this->controller_ = this->defaultController_.fabricate(this);
         assert(this->controller_);
@@ -141 +146 @@
         if (this->controller_)
             this->controller_->setControllableEntity(entity);
+
+        this->changedControllableEntity();
     }
 
@@ -155 +162 @@
             if (callback)
                 entity->removePlayer();
+
+            this->changedControllableEntity();
         }
     }

code/branches/questsystem5/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() {}
 
         protected: