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

Timestamp:

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

Author:

gania

Message:

fixed loops

File:

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

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

@@ -51 +51 @@
     SectionController::~SectionController()
     {
+        if (this->myWingman_)
+        {
+            this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+        }
        for (size_t i = 0; i < this->actionpoints_.size(); ++i)
         {
@@ -151 +155 @@
     }
 
-    void SectionController::boostControl()
-    {
-        SpaceShip* ship = orxonox_cast<SpaceShip*>(this->getControllableEntity());
-        if(ship == NULL) return;
-        if(ship->getBoostPower()*1.5f > ship->getInitialBoostPower() ) //upper limit ->boost
-        {
-
-            this->getControllableEntity()->boost(true);
-        }
-        else if(ship->getBoostPower()*4.0f < ship->getInitialBoostPower()) //lower limit ->do not boost
-        {
-           this->getControllableEntity()->boost(false);
-        }
-    }
+    
     //PRE: myDivisionLeader_ != 0 && myDivisionLeader_->action_ == Action::FIGHT
     //POST: this->target_ is set unless division leader doesn't have one
@@ -250 +241 @@
     }
 
-    //----stay in formation----
-    //gani-TODO: sum targetAbso... and this->predicted position 
-    void SectionController::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, -200, 0);                  
-                break;
-            }
-        }
-        Quaternion orient = this->getControllableEntity()->getWorldOrientation();
-        
-        Vector3 targetAbsolutePositionOfWingman = ((this->getControllableEntity()->getWorldPosition()) + 
-        (this->getControllableEntity()->getWorldOrientation()* (*targetRelativePositionOfWingman)));
-        
-        myWingman_->setAction (Action::FLY, targetAbsolutePositionOfWingman, orient);
-       
-    }
+    
 
     LeaderController* SectionController::findNewDivisionLeader()