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

Timestamp:

Nov 3, 2015, 2:11:19 PM (10 years ago)

Author:

gania

Message:

Added enums for maneuvers

File:

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

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

@@ -49 +49 @@
 
     }
+    // void WingmanController::chooseManeuver()
+    // {
+    //     if (this->maneuverType_ == ManeuverType::NONE)
+    //     switch (this->maneuverType_ )
+    //     {
+    //         case ManeuverType::NONE:
+    //         {
+
+    //             break;
+    //         }
+    //         case ManeuverType::NEUTRAL:
+    //         {
+
+    //             break;
+    //         }
+    //         case ManeuverType::OFFENSIVE:
+    //         {
+
+    //             break;
+    //         }
+    //         case ManeuverType::DEFENSIVE:
+    //         {
+
+    //             break;
+    //         }
+    //     }
+    //     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::VEE: 
+    //         {
+    //             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_->setTargetOrientation(orient);
+    //     myWingman_->setTargetPosition(targetAbsolutePositionOfWingman);
+       
+    // }
 
     void WingmanController::tick(float dt)
@@ -63 +122 @@
             return;
         //--------------------------Stay in formation--------------------------
+        if (!this->target_)
+        {
+            //stay in formation
+        }
+        else
+        {
+            
+        }
         if (this->bHasTargetPosition_)
         {
-            //targetPosition_ and targetOrientation_ are set by the Leader in its action()
             this->moveToTargetPosition();
         }