Changeset 7184 for code/trunk/src/libraries

Timestamp:

Aug 18, 2010, 9:46:16 PM (14 years ago)

Author:

rgrieder

Message:

Replaced mathematical constants with a common definition in Math.h.
Use math::pi, math::pi_d (double), math::e, etc. from now on.

Location:

code/trunk/src/libraries/util

Files:

• ExprParser.cc (modified) (3 diffs)
• Math.cc (modified) (1 diff)
• Math.h (modified) (1 diff)

code/trunk/src/libraries/util/ExprParser.cc

@@ -33 +33 @@
 
 #include "ExprParser.h"
+
 #include <cmath>
 #include <cstring>
 #include <cstdlib>
+#include "Math.h"
 
 // macros for easier if, else statements
@@ -50 +52 @@
     {
         this->failed_ = false;
-        this->variables_["pi"] = 3.1415926535897932;
-        this->variables_["e"] = 2.7182818284590452;
+        this->variables_["pi"] = math::pi_d;
+        this->variables_["e"] = math::e_d;
     }
 
@@ -328 +330 @@
                     value = sqrt(parse_last_argument());
                 CASE("degrees")
-                    value = parse_last_argument()*180/3.1415926535897932;
+                    value = parse_last_argument()*180/math::pi_d;
                 CASE("radians")
-                    value = parse_last_argument()*3.1415926535897932/180;
+                    value = parse_last_argument()*math::pi_d/180;
                 CASE("mod")
                 {

code/trunk/src/libraries/util/Math.cc

@@ -185 +185 @@
         float distancelength = distance.length();
         if (distancelength == 0) return orxonox::Vector2(0, 0);
-        float radius = acos(clamp<float>(mydirection.dotProduct(distance) / distancelength, -1, 1)) / Ogre::Math::PI;
+        float radius = acos(clamp<float>(mydirection.dotProduct(distance) / distancelength, -1, 1)) / math::pi;
 
         if ((mydirection.crossProduct(myorthonormal)).dotProduct(distance) > 0)

code/trunk/src/libraries/util/Math.h

@@ -59 +59 @@
 namespace orxonox
 {
+    // C++ doesn't define any constants for pi, e, etc.
+    namespace math
+    {
+        const float pi      = 3.14159265f;
+        const float pi_2    = 1.57079633f;
+        const float pi_4    = 7.85398163e-1f;
+        const float e       = 2.71828183f;
+        const float sqrt2   = 1.41421356f;
+        const float sqrt2_2 = 7.07106781e-1f;
+
+        const double pi_d      = 3.14159265358979324;
+        const double pi_2_d    = 1.57079632679489662;
+        const double pi_4_d    = 7.85398163397448310e-1;
+        const double e_d       = 2.71828182845904524;
+        const double sqrt2_d   = 1.41421356237309505;
+        const double sqrt2_2_d = 7.07106781186547524e-1;
+    }
+
 #if OGRE_VERSION < 0x010603
     _UtilExport std::ostream& operator<<(std::ostream& out, const orxonox::Radian& radian);