Changeset 10856 for code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

Timestamp:

Nov 25, 2015, 2:05:43 PM (8 years ago)

Author:

gania

Message:

fixed loops

File:

• code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) (2 diffs)

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

@@ -52 +52 @@
         if (this->myFollower_)
         {
-            this->myFollower_->takeActionpoints(this->parsedActionpoints_);
+            this->myFollower_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+        }
+        else if (this->myWingman_)
+        {
+            this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
         }
         for (size_t i = 0; i < this->actionpoints_.size(); ++i)
@@ -82 +86 @@
     {
         CommonController::stayNearProtect();
-    }
-    void DivisionController::setTargetPositionOfWingman()
-    {
-        if (!this->myWingman_)
-            return;
-        Vector3* targetRelativePositionOfWingman;
-        switch (this->formationMode_){
-            case FormationMode::WALL:
-            {
-                targetRelativePositionOfWingman = new Vector3 (400, 0, 0);  
-                break;
-            }
-            case FormationMode::FINGER4: 
-            {
-                targetRelativePositionOfWingman = new Vector3 (400, 0, 200);  
-                break;
-            }
-         
-            case FormationMode::DIAMOND: 
-            {
-                targetRelativePositionOfWingman = new Vector3 (400, 0, 200);                  
-                break;
-            }
-        }
-        Quaternion orient = this->getControllableEntity()->getWorldOrientation();
-        
-        Vector3 targetAbsolutePositionOfWingman = ((this->getControllableEntity()->getWorldPosition()) + 
-        (this->getControllableEntity()->getWorldOrientation()* (*targetRelativePositionOfWingman)));
-        
-        myWingman_->setAction( Action::FLY, targetAbsolutePositionOfWingman, orient);
-       
     }