Changeset 10709 for code/branches/AI_HS15/src/orxonox/controllers/FleetController.h

Timestamp:

Oct 26, 2015, 5:44:31 PM (9 years ago)

Author:

gania

Message:

Restructured

File:

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

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

@@ -29 +29 @@
 #ifndef _FleetController_H__
 #define _FleetController_H__
+#include "controllers/FormationController.h"
 
 #include "controllers/Controller.h"
+#include "controllers/DivisionController.h"
+#include "controllers/LeaderController.h"
+#include "controllers/WingmanController.h"
 
 #include "OrxonoxPrereqs.h"
 #include "core/class/Super.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "core/command/ConsoleCommandIncludes.h"
-#include "core/command/Executor.h"
+
 
 #include <vector>
@@ -51 +53 @@
 #include "worldentities/pawns/TeamBaseMatchBase.h"
 
-#include "gametypes/TeamDeathmatch.h"
-#include "gametypes/Dynamicmatch.h"
-#include "gametypes/Mission.h"
-#include "gametypes/Gametype.h"
-
-#include "controllers/WaypointPatrolController.h"
-#include "controllers/NewHumanController.h"
-#include "controllers/DroneController.h"
 
 
@@ -64 +58 @@
 {   
 
-    class _OrxonoxExport FleetController : public Controller
+    class _OrxonoxExport FleetController : public FormationController, public Tickable
     {
         public:
@@ -70 +64 @@
           virtual ~FleetController();
 
+          virtual void tick(float dt); //<! Carrying out the targets set in action().
 
           virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -80 +75 @@
           enum GameGoal {DOMINATE, MOVE, DESTROY, PROTECT};
           
-          /*void setGameGoal(GameGoal gameGoal)
-             { this->gameGoal_ = gameGoal; }
-          GameGoal getGameGoal() const
-             { return this->gameGoal_; }
           
-          void setGoalPosition(Vector3* goalPosition)
-             { this->goalPosition_ = goalPosition; }
-          Vector3* getGoalPosition() const
-             { return this->goalPosition_; }
-          
-          void setGoalTarget(Pawn* goalTarget)
-             { this->goalTarget_ = goalTarget; }
-          Pawn* getGoalTarget() const
-             { return this->goalTarget_; }
-          
-          void setGoalProtect(Pawn* goalProtect)
-             { this->goalProtect_ = goalProtect; }
-          Pawn* getGoalProtect() const
-             { return this->goalProtect_; }*/
-
 
 
@@ -110 +86 @@
             WeakPtr<Pawn> goalProtect_;
 
+            virtual void action();
+        private:
+            int nTicks_;
+            bool bTicked_;
+
+            std::vector<WeakPtr<DivisionController> > divisions_;
+            //Timer actionTimer_; //<! Regularly calls action().
 
     };