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

Timestamp:

Nov 25, 2015, 6:46:20 PM (8 years ago)

Author:

gania

Message:

almost all works now, check AITest.oxw

File:

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

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

@@ -130 +130 @@
                         return;
                     }
+                    
                     ControllableEntity* leaderEntity = this->myLeader_->getControllableEntity();
                     Quaternion orient = leaderEntity->getWorldOrientation();
@@ -176 +177 @@
                 case FormationMode::WALL:
                 {
-                    targetRelativePositionOfWingman = new Vector3 (400, 0, 0);  
+                    targetRelativePosition = new Vector3 (400, 0, 0);  
                     break;
                 }
                 case FormationMode::FINGER4: 
                 {
-                    targetRelativePositionOfWingman = new Vector3 (400, 0, 200);  
+                    targetRelativePosition = new Vector3 (400, 0, 200);  
                     break;
                 }
                 case FormationMode::DIAMOND: 
                 {
-                    targetRelativePositionOfWingman = new Vector3 (400, 0, 200);                  
+                    targetRelativePosition = new Vector3 (400, 0, 200);                  
                     break;
                 }
@@ -193 +194 @@
         else
         {
+
             switch (this->formationMode_){
                 case FormationMode::WALL:
                 {
-                    targetRelativePositionOfWingman = new Vector3 (-400, 0, 0);  
+                    targetRelativePosition = new Vector3 (-400, 0, 0);  
                     break;
                 }
                 case FormationMode::FINGER4: 
                 {
-                    targetRelativePositionOfWingman = new Vector3 (-400, 0, 200);  
+                    targetRelativePosition = new Vector3 (-400, 0, 200);  
                     break;
                 }
                 case FormationMode::DIAMOND: 
                 {
-                    targetRelativePositionOfWingman = new Vector3 (400, -200, 0);                  
+                    targetRelativePosition = new Vector3 (400, -200, 0);                  
                     break;
                 }