Changeset 3038 for code/trunk

Timestamp:

May 24, 2009, 5:42:50 PM (16 years ago)

Author:

landauf

Message:

Cleaned up setPlayer/removePlayer interface between PlayerInfo and ControllableEntity. The whole control is now up to the PlayerInfo, the respective functions in ControllableEntity are now protected.

Location:

code/trunk/src/orxonox/objects

Files:

• controllers/HumanController.cc (modified) (1 diff)
• gametypes/Gametype.cc (modified) (5 diffs)
• infos/PlayerInfo.cc (modified) (4 diffs)
• infos/PlayerInfo.h (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (1 diff)
• worldentities/ControllableEntity.h (modified) (3 diffs)
• worldentities/pawns/Pawn.cc (modified) (1 diff)
• worldentities/pawns/Pawn.h (modified) (2 diffs)
• worldentities/pawns/Spectator.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/controllers/HumanController.cc

@@ -159 +159 @@
                 pawn->kill();
             else if (HumanController::localController_s->player_)
-                HumanController::localController_s->player_->stopControl(HumanController::localController_s->controllableEntity_);
+                HumanController::localController_s->player_->stopControl();
         }
     }

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -130 +130 @@
             {
                 ControllableEntity* oldentity = it->first->getControllableEntity();
-        
+
                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity->getCreator());
                 if (oldentity->getCamera())
@@ -143 +143 @@
                 }
 
-                it->first->stopControl(oldentity, true);
                 it->first->startControl(entity);
             }
@@ -421 +420 @@
 
     void Gametype::addTime(float t)
-    { 
+    {
         if (this->timeLimit_ == 0)
           this->time_ -= t;
@@ -429 +428 @@
 
     void Gametype::removeTime(float t)
-    { 
+    {
         if (this->timeLimit_ == 0)
           this->time_ += t;
@@ -437 +436 @@
 
     void Gametype::resetTimer()
-    { 
+    {
         this->resetTimer(timeLimit_);
     }
 
     void Gametype::resetTimer(float t)
-    { 
+    {
         this->timeLimit_ = t;
         this->time_ = t;

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

@@ -62 +62 @@
         if (this->BaseObject::isInitialized())
         {
-            this->stopControl(this->controllableEntity_);
+            this->stopControl();
 
             if (this->controller_)
@@ -142 +142 @@
     }
 
-    void PlayerInfo::startControl(ControllableEntity* entity, bool callback)
-    {
-        if (entity == this->controllableEntity_)
+    void PlayerInfo::startControl(ControllableEntity* entity)
+    {
+        if (!entity || entity == this->controllableEntity_)
             return;
 
         if (this->controllableEntity_)
-            this->stopControl(this->controllableEntity_, callback);
+            this->stopControl();
 
         this->controllableEntity_ = entity;
-
-        if (entity)
-        {
-            this->controllableEntityID_ = entity->getObjectID();
-            entity->setPlayer(this);
-            this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
-        }
-        else
-        {
-            this->controllableEntityID_ = OBJECTID_UNKNOWN;
-        }
+        this->controllableEntityID_ = entity->getObjectID();
+
+        entity->setPlayer(this);
+
+        this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
 
         if (this->controller_)
@@ -169 +163 @@
     }
 
-    void PlayerInfo::stopControl(ControllableEntity* entity, bool callback)
-    {
-        if (entity && this->controllableEntity_ == entity)
-        {
-            this->controllableEntity_ = 0;
-            this->controllableEntityID_ = OBJECTID_UNKNOWN;
-
-            if (this->controller_)
-                this->controller_->setControllableEntity(0);
-
-            if (callback)
-                entity->removePlayer();
-
-            this->changedControllableEntity();
-        }
+    void PlayerInfo::stopControl()
+    {
+        ControllableEntity* entity = this->controllableEntity_;
+
+        if (!entity)
+            return;
+
+        this->controllableEntity_ = 0;
+        this->controllableEntityID_ = OBJECTID_UNKNOWN;
+
+        if (this->controller_)
+            this->controller_->setControllableEntity(0);
+
+        entity->removePlayer();
+
+        this->changedControllableEntity();
     }
 
@@ -192 +187 @@
             Synchronisable* temp = Synchronisable::getSynchronisable(this->controllableEntityID_);
             ControllableEntity* entity = dynamic_cast<ControllableEntity*>(temp);
-
             this->startControl(entity);
         }
         else
         {
-            this->stopControl(this->controllableEntity_);
+            this->stopControl();
         }
     }

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

@@ -68 +68 @@
                 { return this->bReadyToSpawn_; }
 
-            void startControl(ControllableEntity* entity, bool callback = true);
-            void stopControl(ControllableEntity* entity, bool callback = true);
+            void startControl(ControllableEntity* entity);
+            void stopControl();
 
             inline ControllableEntity* getControllableEntity() const

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

@@ -91 +91 @@
 
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
-                this->getPlayer()->stopControl(this, false);
+                this->getPlayer()->stopControl();
 
             if (this->hud_)

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

@@ -39 +39 @@
     class _OrxonoxExport ControllableEntity : public MobileEntity
     {
+        friend class PlayerInfo; // PlayerInfo uses setPlayer and removePlayer
+
         public:
             ControllableEntity(BaseObject* creator);
@@ -50 +52 @@
             virtual void changedPlayer() {}
 
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void removePlayer();
             inline PlayerInfo* getPlayer() const
                 { return this->player_; }
@@ -131 +131 @@
 
         protected:
+            virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
+            virtual void removePlayer();                // don't call this directly, use friend class PlayerInfo instead
+
             virtual void startLocalHumanControl();
             virtual void stopLocalHumanControl();

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -209 +209 @@
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
 
-            if (this->getPlayer())
-                this->getPlayer()->stopControl(this);
+            if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
+                this->getPlayer()->stopControl();
 
             if (GameMode::isMaster())

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -47 +47 @@
             virtual void tick(float dt);
             void registerVariables();
-
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void removePlayer();
 
             inline bool isAlive() const
@@ -113 +110 @@
 
         protected:
+            virtual void setPlayer(PlayerInfo* player);
+            virtual void removePlayer();
+
             virtual void death();
             virtual void deatheffect();

code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -46 +46 @@
             virtual void tick(float dt);
 
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void startLocalHumanControl();
-
             virtual void moveFrontBack(const Vector2& value);
             virtual void moveRightLeft(const Vector2& value);
@@ -59 +56 @@
             virtual void fire(WeaponMode::Enum fireMode);
             virtual void greet();
+
+        protected:
+            virtual void setPlayer(PlayerInfo* player);
+            virtual void startLocalHumanControl();
 
         private: