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

Timestamp:

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

Author:

gania

Message:

Restructured

File:

• code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) (5 diffs)

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

@@ -32 +32 @@
 namespace orxonox
 {
-    const float WingmanController::ACTION_INTERVAL = 1.0f;
 
     RegisterClass(WingmanController);
 
-    WingmanController::WingmanController(Context* context) : SectionController(context)
+    WingmanController::WingmanController(Context* context) : Controller(context)
     {
         RegisterObject(WingmanController);
-        this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&WingmanController::action, this)));
+        //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&WingmanController::action, this)));
     }
 
@@ -55 +54 @@
     void WingmanController::action()
     {
-        //--------------------------Cover Leader's rear--------------------------
-        //check for enemies in Leader's rear that can attack him and if they are visible, meaning there are no other Leader's between Leader and enemies.
-        //if there are enemies, set target_ to the nearest one and set bFollowLeader_ to false, 
-        //otherwise set bFollowLeader_ to true and target_ to sectionTarget_
-        this->coverAllyRear(this->sectionLeader_);
+        //this->target_ = this->sectionTarget_;
     }
 
     void WingmanController::tick(float dt)
-    {
+    {/*
         if (!this->isActive())
             return;
@@ -69 +64 @@
         if (bFollowLeader_)
         {
-            this->keepSectionTick();
+            this->keepSectionTick();*/
             /*keepSectionTick(){
                 if (this->sectionLeader_ && this->sectionLeader_->getControllableEntity() && desiredRelativePosition_){
@@ -78 +73 @@
             }
             */
-            
+          /*  
             //--------------------------Attack same target as the Leader--------------------------
-           
+
             if (this->target_)
             {
@@ -86 +81 @@
                 this->doFire();
             }
-        }
-        //--------------------------Protect Leader by killing target_--------------------------
-
-        else
-        {
-            if (this->target_)
-            {
-                //--------------------------Don't attack if not visible--------------------------                
-                if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
-                {
-                    this->forgetTarget();
-                    //this->bFollowLeader_ = true;
-                }
-                //--------------------------Otherwise destroy it--------------------------
-                else
-                {
-                    this->aimAtTarget();
-                    this->follow();  //If a bot is shooting a player, it shouldn't let him go away easily.
-                }
-                if (this->bHasTargetPosition_)
-                {
-                    this->moveToTargetPosition();
-                }
-                this->doFire();
-            }
-            //--------------------------no target? do nothing until next action() -> either new target appears or bFollowLeader_ set to true--------------------------
-            else
-            {
-
-            }            
-
-        }
+        }*/
+         //orxout(internal_error) << "I am " << this << endl;
+        
         SUPER(WingmanController, tick, dt);
     }