Changeset 7066 for code/branches/presentation3/src/orxonox/controllers/ArtificialController.h

Timestamp:

May 31, 2010, 6:18:50 PM (15 years ago)

Author:

solex

Message:

formationflight final commit before presentation (probably…)

File:

• code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified) (4 diffs)

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

@@ -54 +54 @@
             inline int getTeam() const
                 { return this->team_; }
+
             inline void setFormationFlight(bool formation)
                 { this->formationFlight_ = formation; }
             inline bool getFormationFlight() const
                 { return this->formationFlight_; }
+
             inline void setFormationSize(int size)
                 { this->maxFormationSize_ = size; }
             inline int getFormationSize() const
                 { return this->maxFormationSize_; }
+
             virtual void changedControllableEntity();
 
-            static void formationflight(bool form);
-            static void masteraction(int action);
+            static void formationflight(const bool form);
+            static void masteraction(const int action);
             static void followme();
-            static void passivebehaviour(bool passive);
-            static void formationsize(int size);
+            static void passivebehaviour(const bool passive);
+            static void formationsize(const int size);
 
         protected:
@@ -81 +84 @@
             std::vector<ArtificialController*> slaves_;
             ArtificialController *myMaster_;
-            enum SpecificMasterAction {NONE, HOLD, SPIN, TURN180, FOLLOWHUMAN};
+            enum SpecificMasterAction {NONE, HOLD, SPIN, TURN180, FOLLOW};
             SpecificMasterAction specificMasterAction_;
             int specificMasterActionHoldCount_;
-            Pawn* humanToFollow_;
-
-            void targetDied();
+            float speedCounter_; //for speed adjustment when following
 
             void moveToPosition(const Vector3& target);
             void moveToTargetPosition();
-
-            int getState();
 
             void unregisterSlave();
@@ -109 +108 @@
             void spinInit();
             void spin();
-            void followHumanInit(Pawn* human, bool always);
+            void followInit(Pawn* pawn, const bool always = false, const int secondsToFollow = 100);
+            void followRandomHumanInit();
             void follow();
+            void followForSlaves(const Vector3& target);
 
             void setTargetPosition(const Vector3& target);
@@ -122 +123 @@
             bool isCloseAtTarget(float distance) const;
             bool isLookingAtTarget(float angle) const;
+
+            void targetDied();
 
             static bool sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype); // hack