Changeset 10620 for code/branches/presentationFS15merge

Timestamp:

Oct 4, 2015, 3:18:10 PM (9 years ago)

Author:

landauf

Message:

use our internal definition of pi

File:

• code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.cc (modified) (3 diffs)

code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.cc

@@ -47 +47 @@
 #include "core/LuaState.h"
 #include "core/LuaState.h"
-#include <cmath>
-
+#include "util/Math.h"
 
 namespace orxonox
@@ -216 +215 @@
             Vector3* ortho1 = new Vector3(direction.y, -direction.x, 0);
             float absOrtho1 = sqrt(direction.y * direction.y + direction.x * direction.x);
-            *ortho1 = 400 * cos(2 * M_PI * dl) * (*ortho1)/absOrtho1;
+            *ortho1 = 400 * cos(2 * math::pi * dl) * (*ortho1)/absOrtho1;
 
             Vector3* ortho2 = new Vector3(0, direction.z, -direction.y);
             float absOrtho2 = sqrt(direction.y * direction.y + direction.z * direction.z);
-            *ortho2 = 400 * sin(2 * M_PI * dl) * (*ortho2)/absOrtho2;
+            *ortho2 = 400 * sin(2 * math::pi * dl) * (*ortho2)/absOrtho2;
 
             this->entity_->setPosition( (1-dl)*startpos + dl * this->currentEvent.v1 + *ortho1 + *ortho2);
@@ -235 +234 @@
               switch ((int) currentEvent.d) {
                 case 3:
-                  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),
+                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*cos(2*math::pi*dl),
+                                  this->currentEvent.v1.y + this->currentEvent.e*sin(2*math::pi*dl),
                                   this->currentEvent.v1.z);
                 break;
                 case 2:
-                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*sin(2*M_PI*dl),
+                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*sin(2*math::pi*dl),
                                   this->currentEvent.v1.y,
-                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*M_PI*dl));
+                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*math::pi*dl));
                 break;
                 case 1:
                   a = new Vector3(this->currentEvent.v1.x,
-                                  this->currentEvent.v1.y + this->currentEvent.e*sin(2*M_PI*dl),
-                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*M_PI*dl));
+                                  this->currentEvent.v1.y + this->currentEvent.e*sin(2*math::pi*dl),
+                                  this->currentEvent.v1.z + this->currentEvent.e*cos(2*math::pi*dl));
                 break;
               }