Changeset 8951 for code/branches/gamecontent/src

Timestamp:

Nov 26, 2011, 10:06:08 AM (13 years ago)

Author:

jo

Message:

Removing interface - no actual need for it, since only two classes are necessary to have a teamnumber. Prepared tutorial level for new HUD feature.

Location:

code/branches/gamecontent/src/orxonox

Files:

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

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

@@ -51 +51 @@
             void abandonTarget(Pawn* target);
 
-            inline void setTeam(int team)
+            inline void setTeam(int team) //TODO: write through to controllable entity.
                 { this->team_ = team; }
             inline int getTeam() const

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

@@ -59 +59 @@
         static ColourValue colours[] =
         {
-            ColourValue(1.0f, 0.3f, 0.3f),
-            ColourValue(0.3f, 0.3f, 1.0f),
+            ColourValue(0.2f, 0.2f, 1.0f),
+            ColourValue(1.0f, 0.1f, 0.1f),
             ColourValue(0.3f, 1.0f, 0.3f),
-            ColourValue(1.0f, 1.0f, 0.0f)
+            ColourValue(1.0f, 1.0f, 0.0f),
+            ColourValue(0.0f, 1.0f, 1.0f),
+            ColourValue(1.0f, 0.0f, 1.0f),
+            ColourValue(7.0f, 7.0f, 7.0f),
+            ColourValue(2.0f, 2.0f, 2.0f)
         };
         static std::vector<ColourValue> defaultcolours(colours, colours + sizeof(colours) / sizeof(ColourValue));

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

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

code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.cc

@@ -87 +87 @@
         this->setPriority( Priority::VeryHigh );
         this->registerVariables();
+        this->team_ = -1;
     }
 
@@ -119 +120 @@
         SUPER(ControllableEntity, XMLPort, xmlelement, mode);
 
+        XMLPortParam(ControllableEntity, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
         XMLPortParam(ControllableEntity, "hudtemplate", setHudTemplate, getHudTemplate, xmlelement, mode);
         XMLPortParam(ControllableEntity, "camerapositiontemplate", setCameraPositionTemplate, getCameraPositionTemplate, xmlelement, mode);

code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.h

@@ -163 +163 @@
                 { return this->target_.get(); }
             void setTargetInternal( uint32_t targetID );
+
+            inline void setTeam(int team)
+                { this->team_ = team; }
+            inline float getTeam() const
+                { return this->team_; }
 
         protected:
@@ -237 +242 @@
             CameraPosition* reverseCamera_;
             WeakPtr<WorldEntity> target_;
+
+            int team_ ; //<! teamnumber
     };
 }

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

@@ -60 +60 @@
         this->bReload_ = false;
 
-        this->team_ = -1;
         this->health_ = 0;
         this->maxHealth_ = 0;
@@ -110 +109 @@
     {
         SUPER(Pawn, XMLPort, xmlelement, mode);
-
-        XMLPortParam(Pawn, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
 
         XMLPortParam(Pawn, "health", setHealth, getHealth, xmlelement, mode).defaultValues(100);

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"
 
@@ -41 +40 @@
 { // tolua_export
     class _OrxonoxExport Pawn // tolua_export
-        : public ControllableEntity, public RadarViewable, public PickupCarrier//, public PartyMember
+        : public ControllableEntity, public RadarViewable, public PickupCarrier
     { // tolua_export
         friend class WeaponSystem;
@@ -55 +54 @@
                 { return this->bAlive_; }
 
-            inline void setTeam(int team)
-                { this->team_ = team; }
-            inline float getTeam() const
-                { return this->team_; }
 
             virtual void setHealth(float health);
@@ -200 +195 @@
                 { return NULL; }
 
-            int team_;
 
             float health_;