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

Timestamp:

Oct 31, 2015, 4:07:29 PM (9 years ago)

Author:

gania

Message:

added a little bit of firing functionality

File:

• code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) (5 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"
+
 
 namespace orxonox
@@ -39 +41 @@
     {
         public:
+
             static const float ACTION_INTERVAL = 1.0f;
 
-            enum FormationMode {VEE,FINGER4,DIAMOND, WALL};
+
+            CommonController(Context* context);
+            virtual ~CommonController();
+
+
+
+            enum FormationMode { VEE, FINGER4, DIAMOND, WALL };
             virtual void setFormationMode(FormationMode val)
                 { this->formationMode_ = val; }
@@ -47 +56 @@
                 { return this->formationMode_; }
 
-            CommonController(Context* context);
-            virtual ~CommonController();
-            virtual bool isLeader();
+            enum Rank { NONE, SECTIONLEADER, DIVISIONLEADER, WINGMAN };
+            virtual void setRank(Rank val)
+                { this->rank_ = val; }
+            inline Rank getRank() const
+                { return this->rank_; }
+
+
+
+
             virtual bool setWingman(CommonController* wingman);
             virtual bool hasWingman();
@@ -58 +73 @@
             void setTargetPosition(const Vector3& target);
 
+            /*void spin();
+            void turn180();*/
+
+
         protected:
+
             void moveToPosition(const Vector3& target);
-            virtual void positionReached() {}
+            void moveToTargetPosition();
 
-       
-            void moveToTargetPosition();
+
             void copyOrientation(const Quaternion& orient);
             void copyTargetOrientation();
 
+            void doFire();
+            void aimAtTarget();
+            bool isLookingAtTarget(float angle) const;
 
             bool bHasTargetPosition_;
@@ -73 +95 @@
             Quaternion targetOrientation_;
 
+
             WeakPtr<ControllableEntity> target_;
             bool bShooting_;
 
+
             FormationMode formationMode_;
-
+            Rank rank_;