Changeset 10709 for code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc

Timestamp:

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

Author:

gania

Message:

Restructured

File:

• code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified) (4 diffs)

code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc

@@ -33 +33 @@
 namespace orxonox
 {
-    const float LeaderController::ACTION_INTERVAL = 1.0f;
 
     RegisterClass(LeaderController);
 
-    LeaderController::LeaderController(Context* context) : SectionController(context)
+    LeaderController::LeaderController(Context* context) : WingmanController(context)
     {
+
         RegisterObject(LeaderController);
-        this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&LeaderController::action, this)));
+        //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&LeaderController::action, this)));
     }
+
 
     LeaderController::~LeaderController()
@@ -49 +50 @@
     void LeaderController::action()
     {
-        
+        //this->target_ = this->sectionTarget_;        
     }
     /*
@@ -66 +67 @@
     */
     void LeaderController::tick(float dt)
-    {
+    {/*
         if (!this->isActive())
             return;
         
         //--------------------------Stay in division--------------------------
-        this->keepDivisionTick();
+        this->keepDivisionTick();*/
         /*keepDivisionTick(){
             if (this->divisionLeader_ && this->divisionLeader_->getControllableEntity() && desiredRelativePosition_){
@@ -80 +81 @@
         }
         */
-        //If ordered to attack -> follow target and shoot
+        /*//If ordered to attack -> follow target and shoot
         if (this->bAttackOrder_)
         {
-
+ 
         } 
         //If ordered to move -> move to a target Point
-        else if (this->bMoveOrder_)
-        {
-
-        } 
-        else
+        
         //No orders -> Don't move, but shoot at whatever is close, unless Boss is shooting at it. 
         //(Section shoots same target, Boss's section shoots another target) 
         {
 
-        }
+        }*/
 
-
+        orxout(internal_error) << "my Wingman is " << this->wingman_ << endl;
+        
         SUPER(LeaderController, tick, dt);
+    }
+    void LeaderController::setWingman(WingmanController* wingman)
+    {
+        this->wingman_ = wingman;
     }
 //**********************************************NEW