Changeset 10759 for code/branches/AI_HS15/src/orxonox/controllers/CommonController.h

Timestamp:

Nov 2, 2015, 4:48:27 PM (9 years ago)

Author:

gania

Message:

small fixes

File:

• code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) (6 diffs)

code/branches/AI_HS15/src/orxonox/controllers/CommonController.h

@@ -33 +33 @@
 #include "controllers/Controller.h"
 #include "worldentities/ControllableEntity.h"
-/*#include "worldentities/pawns/Pawn.h"
-*/
+#include "worldentities/pawns/Pawn.h"
+
 
 namespace orxonox
 {
+
+    namespace FormationMode
+    {
+        enum Value
+        {
+            VEE, FINGER4, DIAMOND, WALL
+        };
+    }
+    namespace Rank
+    {
+        enum Value 
+        { 
+            NONE, SECTIONLEADER, DIVISIONLEADER, WINGMAN 
+        };
+
+    }
+
     class _OrxonoxExport CommonController : public Controller
     {
@@ -50 +67 @@
 
 
-            enum FormationMode { VEE, FINGER4, DIAMOND, WALL };
-            virtual void setFormationMode(FormationMode val)
+
+
+            virtual void setFormationMode(FormationMode::Value val)
                 { this->formationMode_ = val; }
-            inline FormationMode getFormationMode() const
+            inline FormationMode::Value getFormationMode() const
                 { return this->formationMode_; }
+            virtual void setFormationModeXML(std::string val);
+            virtual std::string getFormationModeXML();
 
-            enum Rank { NONE, SECTIONLEADER, DIVISIONLEADER, WINGMAN };
-            virtual void setRank(Rank val)
+            virtual void setRank(Rank::Value val)
                 { this->rank_ = val; }
-            inline Rank getRank() const
+            inline Rank::Value getRank() const
                 { return this->rank_; }
 
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
 
@@ -68 +88 @@
             virtual bool hasWingman();
 
+            void setTarget(ControllableEntity* target);
 
             void setTargetOrientation(const Quaternion& orient);
@@ -87 +108 @@
             void copyTargetOrientation();
 
-          /*  bool isCloseAtTarget(float distance) const;
+            bool isCloseAtTarget(float distance) const;
             void doFire();
             void aimAtTarget();
@@ -99 +120 @@
             bool bSetupWorked; //<! If false, setupWeapons() is called.
             int getFiremode(std::string name);
-*/
+
 
             bool bHasTargetPosition_;
@@ -111 +132 @@
 
 
-            FormationMode formationMode_;
-            Rank rank_;
+            FormationMode::Value formationMode_;
+            Rank::Value rank_;