Changeset 2973 for code/trunk/src

Timestamp:

May 12, 2009, 9:24:58 PM (16 years ago)

Author:

landauf

Message:

changed type of gametype-HUD and default-HUD to PlayerInfo (instead of Gametype and ControllableEntity respectively). The owner of the Pawn-HUD remains Pawn.

Location:

code/trunk/src/orxonox

Files:

• objects/infos/HumanPlayer.cc (modified) (3 diffs)
• objects/infos/HumanPlayer.h (modified) (1 diff)
• objects/infos/PlayerInfo.cc (modified) (5 diffs)
• objects/infos/PlayerInfo.h (modified) (3 diffs)
• objects/worldentities/ControllableEntity.cc (modified) (5 diffs)
• objects/worldentities/ControllableEntity.h (modified) (4 diffs)
• overlays/hud/GametypeStatus.cc (modified) (3 diffs)
• overlays/hud/GametypeStatus.h (modified) (1 diff)
• overlays/hud/PongScore.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/infos/HumanPlayer.cc

@@ -167 +167 @@
     }
 
-    void HumanPlayer::changedControllableEntity()
-    {
-        PlayerInfo::changedControllableEntity();
-
-        if (this->humanHud_)
-            this->humanHud_->setOwner(this->getControllableEntity());
-    }
-
     void HumanPlayer::updateHumanHUD()
     {
@@ -187 +179 @@
             this->humanHud_ = new OverlayGroup(this);
             this->humanHud_->addTemplate(this->humanHudTemplate_);
-            this->humanHud_->setOwner(this->getControllableEntity());
+            this->humanHud_->setOwner(this);
         }
     }
@@ -203 +195 @@
             this->gametypeHud_ = new OverlayGroup(this);
             this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
-            this->gametypeHud_->setOwner(this->getGametype());
+            this->gametypeHud_->setOwner(this);
         }
     }

code/trunk/src/orxonox/objects/infos/HumanPlayer.h

@@ -52 +52 @@
 
             virtual void changedGametype();
-            virtual void changedControllableEntity();
 
             inline void setHumanHUDTemplate(const std::string& name)

code/trunk/src/orxonox/objects/infos/PlayerInfo.cc

@@ -51 +51 @@
         this->controllableEntityID_ = CLIENTID_UNKNOWN;
 
+        this->gtinfo_ = 0;
+        this->gtinfoID_ = OBJECTID_UNKNOWN;
+        this->updateGametypeInfo();
+
         this->registerVariables();
     }
@@ -76 +80 @@
         registerVariable(this->controllableEntityID_, variableDirection::toclient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedcontrollableentityID));
         registerVariable(this->bReadyToSpawn_,        variableDirection::toserver);
+        registerVariable(this->gtinfoID_,             variableDirection::toclient, new NetworkCallback<PlayerInfo>(this, &PlayerInfo::networkcallback_changedgtinfoID));
     }
 
@@ -88 +93 @@
     void PlayerInfo::changedGametype()
     {
+        this->updateGametypeInfo();
+
         if (this->isInitialized())
         {
@@ -108 +115 @@
     }
 
+    void PlayerInfo::updateGametypeInfo()
+    {
+        this->gtinfo_ = 0;
+        this->gtinfoID_ = OBJECTID_UNKNOWN;
+
+        if (this->getGametype() && this->getGametype()->getGametypeInfo())
+        {
+            this->gtinfo_ = this->getGametype()->getGametypeInfo();
+            this->gtinfoID_ = this->gtinfo_->getObjectID();
+        }
+    }
+
     void PlayerInfo::createController()
     {
@@ -181 +200 @@
         }
     }
+
+    void PlayerInfo::networkcallback_changedgtinfoID()
+    {
+        if (this->gtinfoID_ != OBJECTID_UNKNOWN)
+        {
+            this->gtinfo_ = dynamic_cast<GametypeInfo*>(Synchronisable::getSynchronisable(this->gtinfoID_));
+
+            if (!this->gtinfo_)
+                this->gtinfoID_ = OBJECTID_UNKNOWN;
+        }
+    }
 }

code/trunk/src/orxonox/objects/infos/PlayerInfo.h

@@ -77 +77 @@
                 { return this->controller_; }
 
+            inline const GametypeInfo* getGametypeInfo() const
+                { return this->gtinfo_; }
+
         protected:
             void createController();
@@ -88 +91 @@
         private:
             void networkcallback_changedcontrollableentityID();
+            void networkcallback_changedgtinfoID();
+            void updateGametypeInfo();
 
             bool bReadyToSpawn_;
@@ -93 +98 @@
             ControllableEntity* controllableEntity_;
             unsigned int controllableEntityID_;
+
+            const GametypeInfo* gtinfo_;
+            unsigned int gtinfoID_;
     };
 }

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -42 +42 @@
 #include "objects/worldentities/Camera.h"
 #include "objects/worldentities/CameraPosition.h"
-#include "objects/gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
 
@@ -67 +66 @@
         this->mouseLookSpeed_ = 200;
 
-        this->gtinfo_ = 0;
-        this->gtinfoID_ = OBJECTID_UNKNOWN;
-        this->changedGametype();
-
         this->server_position_         = Vector3::ZERO;
         this->client_position_         = Vector3::ZERO;
@@ -125 +120 @@
     {
         SetConfigValue(mouseLookSpeed_, 3.0f);
-    }
-
-    void ControllableEntity::changedGametype()
-    {
-        //SUPER(ControllableEntity, changedGametype);
-        WorldEntity::changedGametype();
-
-        this->gtinfo_ = 0;
-        this->gtinfoID_ = OBJECTID_UNKNOWN;
-
-        if (this->getGametype() && this->getGametype()->getGametypeInfo())
-        {
-            this->gtinfo_ = this->getGametype()->getGametypeInfo();
-            this->gtinfoID_ = this->gtinfo_->getObjectID();
-        }
     }
 
@@ -283 +263 @@
     }
 
-    void ControllableEntity::networkcallback_changedgtinfoID()
-    {
-        if (this->gtinfoID_ != OBJECTID_UNKNOWN)
-        {
-            this->gtinfo_ = dynamic_cast<GametypeInfo*>(Synchronisable::getSynchronisable(this->gtinfoID_));
-
-            if (!this->gtinfo_)
-                this->gtinfoID_ = OBJECTID_UNKNOWN;
-        }
-    }
-
     void ControllableEntity::startLocalHumanControl()
     {
@@ -394 +363 @@
 
         registerVariable(this->playerID_,                variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID));
-        registerVariable(this->gtinfoID_,                variableDirection::toclient, new NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedgtinfoID));
     }
 

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -48 +48 @@
             void setConfigValues();
 
-            virtual void changedGametype();
             virtual void changedPlayer() {}
 
@@ -126 +125 @@
                 { return this->bHasHumanController_; }
 
-            inline const GametypeInfo* getGametypeInfo() const
-                { return this->gtinfo_; }
-
             inline bool isInMouseLook() const
                 { return this->bMouseLook_; }
@@ -157 +153 @@
 
             void networkcallback_changedplayerID();
-            void networkcallback_changedgtinfoID();
 
             // Bullet btMotionState related
@@ -190 +185 @@
             std::list<CameraPosition*> cameraPositions_;
             std::string cameraPositionTemplate_;
-
-            const GametypeInfo* gtinfo_;
-            unsigned int gtinfoID_;
     };
 }

code/trunk/src/orxonox/overlays/hud/GametypeStatus.cc

@@ -58 +58 @@
         SUPER(GametypeStatus, tick, dt);
 
-        if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getPlayer())
+        if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getControllableEntity())
         {
             const GametypeInfo* gtinfo = this->owner_->getGametypeInfo();
-            PlayerInfo* pinfo = this->owner_->getPlayer();
+            ControllableEntity* ce = this->owner_->getControllableEntity();
 
             if (!gtinfo->hasStarted() && !gtinfo->isStartCountdownRunning())
             {
-                if (!pinfo->isReadyToSpawn())
+                if (!this->owner_->isReadyToSpawn())
                     this->setCaption("Press [Fire] to start the match");
                 else
@@ -74 +74 @@
                 if (gtinfo->isStartCountdownRunning())
                     this->setCaption(convertToString((int)ceil(gtinfo->getStartCountdown())));
-                else if (this->owner_->isA(Class(Spectator)))
+                else if (ce->isA(Class(Spectator)))
                     this->setCaption("Press [Fire] to respawn");
                 else
@@ -89 +89 @@
         SUPER(GametypeStatus, changedOwner);
 
-        this->owner_ = dynamic_cast<ControllableEntity*>(this->getOwner());
+        this->owner_ = dynamic_cast<PlayerInfo*>(this->getOwner());
     }
 }

code/trunk/src/orxonox/overlays/hud/GametypeStatus.h

@@ -47 +47 @@
 
         private:
-            ControllableEntity* owner_;
+            PlayerInfo* owner_;
     };
 }

code/trunk/src/orxonox/overlays/hud/PongScore.cc

@@ -135 +135 @@
         SUPER(PongScore, changedOwner);
 
-        this->owner_ = dynamic_cast<Pong*>(this->getOwner());
+        if (this->getOwner() && this->getOwner()->getGametype())
+            this->owner_ = dynamic_cast<Pong*>(this->getOwner()->getGametype());
+        else
+            this->owner_ = 0;
     }
 }