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

Timestamp:

Oct 30, 2015, 11:07:34 PM (8 years ago)

Author:

gania

Message:

fixed pointers

File:

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

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

@@ -39 +39 @@
     {
         public:
-           
+            enum FormationMode {VEE,FINGER4,DIAMOND, WALL};
+            virtual void setFormationMode(FormationMode val)
+                { this->formationMode_ = val; }
+            inline FormationMode getFormationMode() const
+                { return this->formationMode_; }
+
             CommonController(Context* context);
             virtual ~CommonController();
@@ -45 +50 @@
             virtual bool setWingman(CommonController* wingman);
             virtual bool hasWingman();
-            CommonController* myWingman_;
+            Vector3* desiredRelativePosition_;
 
-            CommonController* myLeader_;
 
         protected:
+            void moveToPosition(const Vector3& target);
+            virtual void positionReached() {}
+
+        /*    void moveToTargetPosition();
+            void absoluteMoveToPosition(const Vector3& target);
+            void copyOrientation(const Quaternion& orient);
+            void copyTargetOrientation();
+
+            void spin();
+            void turn180();
+            void follow();
+            void setTargetPosition(const Vector3& target);
+
+            void setTargetOrientation(const Quaternion& orient);
+            void setTargetOrientation(Pawn* target);
+
+
+
+            void setTarget(Pawn* target);
+
+            void searchNewTarget();
+            void forgetTarget();
+
+            void targetDied();
+*/
+            bool bHasTargetPosition_;
+            Vector3 targetPosition_;
+            bool bHasTargetOrientation_;
+            Quaternion targetOrientation_;
+
+            WeakPtr<ControllableEntity> target_;
+            bool bShooting_;
+
+            FormationMode formationMode_;
+
+
 
             //void defaultBehaviour(float maxrand); //<! Helper function for code reusage. Some concrete commands for a bot.