[Orxonox-commit 5946] r10605 - code/branches/SciptableControllerFS15/src/orxonox/controllers

[landauf at orxonox.net]

Author: landauf
Date: 2015-09-27 22:39:57 +0200 (Sun, 27 Sep 2015)
New Revision: 10605

Modified:
   code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc
Log:
added changes from presentationFS15 branch

Modified: code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc
===================================================================
--- code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc	2015-09-27 20:35:32 UTC (rev 10604)
+++ code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc	2015-09-27 20:39:57 UTC (rev 10605)
@@ -234,19 +234,19 @@
             Vector3* a;
               switch ((int) currentEvent.d) {
                 case 3:
-                  a = new Vector3(this->currentEvent.v1.x + 3000*cos(2*M_PI*dl),
-                                  this->currentEvent.v1.y + 3000*sin(2*M_PI*dl),
+                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*cos(2*M_PI*dl),
+                                  this->currentEvent.v1.y + this->currentEvent.e*sin(2*M_PI*dl),
                                   this->currentEvent.v1.z);
                 break;
                 case 2:
-                  a = new Vector3(this->currentEvent.v1.x + 3000*cos(2*M_PI*dl),
+                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*sin(2*M_PI*dl),
                                   this->currentEvent.v1.y,
-                                  this->currentEvent.v1.z + 3000*cos(2*M_PI*dl));
+                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*M_PI*dl));
                 break;
                 case 1:
                   a = new Vector3(this->currentEvent.v1.x,
-                                  this->currentEvent.v1.y + 3000*sin(2*M_PI*dl),
-                                  this->currentEvent.v1.z + 3000*cos(2*M_PI*dl));
+                                  this->currentEvent.v1.y + this->currentEvent.e*sin(2*M_PI*dl),
+                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*M_PI*dl));
                 break;
               }