Changeset 10873

Timestamp:

Nov 27, 2015, 9:49:16 AM (8 years ago)

Author:

gania

Message:

introduced spread

Location:

code/branches/campaignHS15/src/orxonox/controllers

Files:

• SectionController.cc (modified) (2 diffs)
• WingmanController.cc (modified) (2 diffs)

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

@@ -252 +252 @@
             case FormationMode::WALL:
             {
-                targetRelativePosition = new Vector3 (-400, 0, 0);   
+                targetRelativePosition = new Vector3 (-2*this->spread_, 0, 0);   
                 break;
             }
             case FormationMode::FINGER4: 
             {
-                targetRelativePosition = new Vector3 (-400, 0, 200);   
+                targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_);   
                 break;
             }
@@ -263 +263 @@
             case FormationMode::DIAMOND: 
             {
-                targetRelativePosition = new Vector3 (-400, 0, 200);                   
+                targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_);                   
                 break;
             }

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

@@ -176 +176 @@
                 case FormationMode::WALL:
                 {
-                    targetRelativePosition = new Vector3 (400, 0, 0);  
+                    targetRelativePosition = new Vector3 (2*this->spread_, 0, 0);  
                     break;
                 }
                 case FormationMode::FINGER4: 
                 {
-                    targetRelativePosition = new Vector3 (400, 0, 200);  
+                    targetRelativePosition = new Vector3 (2*this->spread_, 0, this->spread_);  
                     break;
                 }
                 case FormationMode::DIAMOND: 
                 {
-                    targetRelativePosition = new Vector3 (400, 0, 200);                  
+                    targetRelativePosition = new Vector3 (2*this->spread_, 0, this->spread_);                  
                     break;
                 }
@@ -197 +197 @@
                 case FormationMode::WALL:
                 {
-                    targetRelativePosition = new Vector3 (-400, 0, 0);  
+                    targetRelativePosition = new Vector3 (-2*this->spread_, 0, 0);  
                     break;
                 }
                 case FormationMode::FINGER4: 
                 {
-                    targetRelativePosition = new Vector3 (-400, 0, 200);  
+                    targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_);  
                     break;
                 }
                 case FormationMode::DIAMOND: 
                 {
-                    targetRelativePosition = new Vector3 (400, -200, 0);                  
+                    targetRelativePosition = new Vector3 (2*this->spread_, -this->spread_, 0);                  
                     break;
                 }