Changeset 10935 for code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

Timestamp:

Dec 7, 2015, 3:14:40 PM (9 years ago)

Author:

gania

Message:

cleaned source up a bit

File:

• code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) (3 diffs)

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

@@ -39 +39 @@
     {
         RegisterObject(WingmanController);
-        //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&WingmanController::action, this)));
         this->myLeader_ = 0;
         this->bFirstAction_ = true;
@@ -68 +67 @@
         
         SUPER(WingmanController, tick, dt);
-        if (!this->myLeader_)
-        {
-            /*if (this->actionTime_ == 2.0f)
-            {
-                if (this->timeOffset_ >= 0.0f && this->timeOffset_ <= 0.8f && !this->bActionCalled_)
-                {
-                    this->action();
-                    this->bActionCalled_ = true;
-                }
-                if (this->timeOffset_ > 1.6f)
-                {
-                    this->bActionCalled_ = false;
-                }
-            }
-            else
-            {
-                if (this->timeOffset_ > 0.8f && this->timeOffset_ <= 1.6f && !this->bActionCalled_)
-                {
-                    this->action();
-                    this->bActionCalled_ = true;
-                }
-                if (this->timeOffset_ > 2.0f)
-                {
-                    this->bActionCalled_ = false;
-                }
-            }*/
-        }
-        else
-        {
-           /* if (this->timeOffset_ >= this->actionTime_ && this->timeOffset_ <= this->actionTime_ + 0.4f && !this->bActionCalled_)
-            {
-                this->action();
-                this->bActionCalled_ = true;
-            }
-            if (this->timeOffset_ <= 0.5f)
-            {
-                this->bActionCalled_ = false;
-            }*/
-        }
-       
 
     }
@@ -157 +116 @@
                     this->setTarget(this->myLeader_->getTarget());
                 }
-                if (this->hasTarget())
-                {
-                    // this->maneuver();
-                    // this->bShooting_ = this->canFire();
-                    // Vector3 healthPosition = bestHealthPickup((this->target_->getWorldPosition() - this->getControllableEntity()->getWorldPosition()).length());
-                    // if ((this->getControllableEntity()->getWorldPosition() - healthPosition).length() < this->tolerance_)
-                    // {
-                    //     //----choose where to go----
-                    //     this->maneuver();
-                    // }
-                    // else
-                    // {
-                    //     this->dodgeTowards(healthPosition);
-                    // }
-                    // //----fire if you can----
-                    // this->bShooting_ = this->canFire();               
-                }
+                
             }
         }