[Orxonox-commit 6216] r10873 - code/branches/campaignHS15/src/orxonox/controllers

[gania at orxonox.net]

Author: gania
Date: 2015-11-27 09:49:16 +0100 (Fri, 27 Nov 2015)
New Revision: 10873

Modified:
   code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc
   code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc
Log:
introduced spread

Modified: code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc	2015-11-27 08:45:24 UTC (rev 10872)
+++ code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc	2015-11-27 08:49:16 UTC (rev 10873)
@@ -251,18 +251,18 @@
         switch (this->formationMode_){
             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;
             }
         }

Modified: code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc	2015-11-27 08:45:24 UTC (rev 10872)
+++ code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc	2015-11-27 08:49:16 UTC (rev 10873)
@@ -175,17 +175,17 @@
             switch (this->formationMode_){
                 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;
                 }
             }
@@ -196,17 +196,17 @@
             switch (this->formationMode_){
                 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;
                 }
             }