Changeset 6978 for code/branches/ai/src/orxonox/controllers/ArtificialController.h

Timestamp:

May 27, 2010, 6:39:59 PM (15 years ago)

Author:

solex

Message:

consle commands

File:

• code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) (5 diffs)

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

@@ -36 +36 @@
 #include "util/Math.h"
 #include "Controller.h"
+#include "controllers/NewHumanController.h"
 
 namespace orxonox
@@ -61 +62 @@
             static void formationflight(bool form);
             static void masteraction(int action);
+            static void followme();
 
         protected:
@@ -71 +73 @@
             std::vector<ArtificialController*> slaves_;
             ArtificialController *myMaster_;
-            enum SpecificMasterAction {NONE, HOLD, SPIN, TURN180};
+            enum SpecificMasterAction {NONE, HOLD, SPIN, TURN180, FOLLOWHUMAN};
             SpecificMasterAction specificMasterAction_;
             int specificMasterActionHoldCount_;
+            Pawn* humanToFollow_;
 
             void targetDied();
@@ -86 +89 @@
             void commandSlaves();
             void setNewMasterWithinFormation();
+
             void freeSlaves();
             void forceFreeSlaves();
@@ -91 +95 @@
             void forceFreedom();
             bool forcedFree();
+
             void specificMasterActionHold();
             void turn180();
             void spin();
+            void followHuman(Pawn* humanController, bool always);
 
             void setTargetPosition(const Vector3& target);