Changeset 8942 for code/branches/gamecontent/src/orxonox

Timestamp:

Nov 18, 2011, 6:52:21 PM (13 years ago)

Author:

jo

Message:

Pawn&SpaceShip Colouring via XML works. Quick&Dirty implementation though. A clean version is going to follow.

Location:

code/branches/gamecontent/src/orxonox

Files:

• controllers/ArtificialController.cc (modified) (2 diffs)
• controllers/HumanController.cc (modified) (2 diffs)
• gametypes/Mission.cc (modified) (1 diff)
• gametypes/TeamGametype.cc (modified) (4 diffs)
• gametypes/TeamGametype.h (modified) (1 diff)
• interfaces/CMakeLists.txt (modified) (1 diff)
• interfaces/PartyMember.cc (added)
• interfaces/PartyMember.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (3 diffs)
• worldentities/pawns/Pawn.h (modified) (4 diffs)

code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc

@@ -42 +42 @@
 #include "gametypes/TeamDeathmatch.h"
 #include "gametypes/Dynamicmatch.h"
+#include "gametypes/Mission.h"
 #include "controllers/WaypointPatrolController.h"
 #include "controllers/NewHumanController.h"
@@ -996 +997 @@
             if (entity2->getPlayer())
                 team2 = tdm->getTeam(entity2->getPlayer());
+        }
+
+        Mission* miss = orxonox_cast<Mission*>(gametype);
+        if (miss)
+        {
+            if (entity1->getPlayer())
+                team1 = miss->getTeam(entity1->getPlayer());
+
+            if (entity2->getPlayer())
+                team2 = miss->getTeam(entity2->getPlayer());
         }
 

code/branches/gamecontent/src/orxonox/controllers/HumanController.cc

@@ -195 +195 @@
             this->boosting_ = true;
             this->boostingTimeout_.startTimer();
-            
-            this->controllableEntity_->boost(this->boosting_);
+            if(this->controllableEntity_)
+                this->controllableEntity_->boost(this->boosting_);
 //            orxout() << "Start boosting" << endl;
         }
@@ -209 +209 @@
         this->boosting_ = false;
         this->boostingTimeout_.stopTimer();
-
-        this->controllableEntity_->boost(this->boosting_);
+        if(this->controllableEntity_)
+            this->controllableEntity_->boost(this->boosting_);
 //        orxout() << "Stop boosting" << endl;
     }

code/branches/gamecontent/src/orxonox/gametypes/Mission.cc

@@ -90 +90 @@
 
     void Mission::setTeams()
-    {
+    {//Set pawn-colours
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
-            this->setObjectColour(*it);
+        {
+            Pawn* pawn = static_cast<Pawn*>(*it);
+            if(!pawn) continue;
+                this->setDefaultObjectColour(pawn);
+        }
     }
 

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc

@@ -35 +35 @@
 #include "worldentities/TeamSpawnPoint.h"
 #include "worldentities/pawns/Pawn.h"
+#include "worldentities/ControllableEntity.h"
 #include "controllers/ArtificialController.h"
 
@@ -117 +118 @@
         {
             if(true)//check if dead player is allowed to enter -> if maximum nr of players is exceeded & player was not in game before: disallow
-                continue;
+                //continue;
             if (it->second.state_ == PlayerState::Dead)
             {
@@ -249 +250 @@
         if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < static_cast<int>(this->teamcolours_.size()))
         {
-            if (pawn)
-            {
-                pawn->setRadarObjectColour(this->teamcolours_[it_player->second]);
-
-                std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
-                for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)
-                {
-                    if ((*it)->isA(Class(TeamColourable)))
-                    {
-                        TeamColourable* tc = orxonox_cast<TeamColourable*>(*it);
-                        tc->setTeamColour(this->teamcolours_[it_player->second]);
-                    }
-                }
-            }
-        }
-    }
-
-    void TeamGametype::setObjectColour(Pawn* pawn)
+            this->colourPawn(pawn, it_player->second);
+        }
+    }
+
+    void TeamGametype::setDefaultObjectColour(Pawn* pawn)
     {
         if(pawn == NULL)
             return;
+        
+        int teamnumber = pawn->getTeam();
+
+        if(teamnumber >= 0)
+        {
+            this->colourPawn(pawn, teamnumber); return;
+        }
         //get Pawn's controller
-        ArtificialController* controller = orxonox_cast<ArtificialController*>(pawn);
-        if(controller == NULL)
+        ControllableEntity* entity = orxonox_cast<ControllableEntity*>(pawn);
+
+        Controller* controller = 0;
+        if (entity->getController())
+            controller = entity->getController();
+        else if (entity->getXMLController())
+            controller = entity->getXMLController();
+        else
             return;
+
+        ArtificialController* artificial =  orxonox_cast<ArtificialController*>(controller);
         //get Teamnumber - get the data
-        int teamnumber= controller->getTeam();
-        if(teamnumber < 0)
+        if(artificial == NULL)
             return;
+        teamnumber= artificial->getTeam();
+
         //set ObjectColour
-        pawn->setRadarObjectColour(this->teamcolours_[teamnumber]);
+        this->colourPawn(pawn, teamnumber);
+    }
+
+    void TeamGametype::colourPawn(Pawn* pawn, int teamNr)
+    {// catch no-colouring-case and wrong input
+        if(teamNr < 0 || pawn == NULL) return; 
+        pawn->setRadarObjectColour(this->teamcolours_[teamNr]);
 
         std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
@@ -287 +297 @@
             {
                 TeamColourable* tc = orxonox_cast<TeamColourable*>(*it);
-                tc->setTeamColour(this->teamcolours_[teamnumber]);
+                tc->setTeamColour(this->teamcolours_[teamNr]);
             }
          }
     }
 
-
 }

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h

@@ -75 +75 @@
             std::map<PlayerInfo*, bool> allowedInGame_; //!< Only those players are allowed to spawn which are listed here as 'true'.
             void setTeamColour(PlayerInfo* player, Pawn* pawn);
-            void setObjectColour(Pawn* pawn);
+            void setDefaultObjectColour(Pawn* pawn);
+            void colourPawn(Pawn* pawn, int teamNr);
     };
 }

code/branches/gamecontent/src/orxonox/interfaces/CMakeLists.txt

@@ -6 +6 @@
   PickupListener.cc
   RadarViewable.cc
+  PartyMember.cc
 )

code/branches/gamecontent/src/orxonox/interfaces/PartyMember.h

@@ -52 +52 @@
         public:
             PartyMember();
-            virtual ~PartyMember() {}
+            virtual ~PartyMember();
 
             /**

code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.cc

@@ -60 +60 @@
         this->bReload_ = false;
 
+        this->team_ = -1;
         this->health_ = 0;
         this->maxHealth_ = 0;
@@ -110 +111 @@
         SUPER(Pawn, XMLPort, xmlelement, mode);
 
+        XMLPortParam(Pawn, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
+
         XMLPortParam(Pawn, "health", setHealth, getHealth, xmlelement, mode).defaultValues(100);
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
@@ -129 +132 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+
+
     }
 

code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.h

@@ -35 +35 @@
 #include "interfaces/PickupCarrier.h"
 #include "interfaces/RadarViewable.h"
+#include "interfaces/PartyMember.h"
 #include "worldentities/ControllableEntity.h"
 
@@ -40 +41 @@
 { // tolua_export
     class _OrxonoxExport Pawn // tolua_export
-        : public ControllableEntity, public RadarViewable, public PickupCarrier
+        : public ControllableEntity, public RadarViewable, public PickupCarrier//, public PartyMember
     { // tolua_export
         friend class WeaponSystem;
@@ -53 +54 @@
             inline bool isAlive() const
                 { return this->bAlive_; }
+
+            inline void setTeam(int team)
+                { this->team_ = team; }
+            inline float getTeam() const
+                { return this->team_; }
 
             virtual void setHealth(float health);
@@ -194 +200 @@
                 { return NULL; }
 
+            int team_;
+
             float health_;
             float maxHealth_;