Changeset 9797 for code/trunk/src

Timestamp:

Nov 21, 2013, 3:57:23 PM (11 years ago)

Author:

jo

Message:

Added Team functionality down to the controller class.

Location:

code/trunk/src/orxonox/controllers

Files:

• Controller.cc (modified) (3 diffs)
• Controller.h (modified) (3 diffs)
• FormationController.cc (modified) (2 diffs)
• FormationController.h (modified) (2 diffs)

code/trunk/src/orxonox/controllers/Controller.cc

@@ -29 +29 @@
 #include "Controller.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "worldentities/ControllableEntity.h"
 
@@ -42 +43 @@
         this->controllableEntity_ = 0;
         this->bGodMode_ = false;
+        this->team_=-1;
     }
 
@@ -47 +49 @@
     {
     }
+    void Controller::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(Controller, XMLPort, xmlelement, mode);
+        XMLPortParam(Controller, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
+    }
+
 }

code/trunk/src/orxonox/controllers/Controller.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "core/BaseObject.h"
+#include "core/class/Super.h"
 
 namespace orxonox
@@ -44 +45 @@
             Controller(Context* context);
             virtual ~Controller();
-
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             inline void setPlayer(PlayerInfo* player)
                 { this->player_ = player; }
             inline PlayerInfo* getPlayer() const
                 { return this->player_; }
+            inline void setTeam(int team)
+                { this->team_ = team; }
+            inline int getTeam() const
+                { return this->team_; }
 
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
@@ -79 +84 @@
             PlayerInfo* player_;
             ControllableEntity* controllableEntity_;
+            int team_;
         private:
             bool bGodMode_;

code/trunk/src/orxonox/controllers/FormationController.cc

@@ -88 +88 @@
         this->speedCounter_ = 0.2f;
         this->targetPosition_ = Vector3::ZERO;
-        this->team_=-1;
         this->target_.setCallback(createFunctor(&FormationController::targetDied, this));
     }
@@ -128 +127 @@
         SUPER(FormationController, XMLPort, xmlelement, mode);
 
-        XMLPortParam(FormationController, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
         XMLPortParam(FormationController, "formationFlight", setFormationFlight, getFormationFlight, xmlelement, mode).defaultValues(false);
         XMLPortParam(FormationController, "formationSize", setFormationSize, getFormationSize, xmlelement, mode).defaultValues(STANDARD_MAX_FORMATION_SIZE);

code/trunk/src/orxonox/controllers/FormationController.h

@@ -76 +76 @@
            { return this->passive_; }
 
-      inline void setTeam(int team)
-           { this->team_ = team; }
-      inline int getTeam() const
-           { return this->team_; }
+
 
       /**
@@ -105 +102 @@
       bool formationFlight_;
       bool passive_;
-      int team_;
       unsigned int maxFormationSize_;
       int freedomCount_;