Changeset 9550 for code/trunk/src/libraries/util/Math.h

Timestamp:

Mar 12, 2013, 11:13:03 PM (12 years ago)

Author:

landauf

Message:

merged testing branch back to trunk. unbelievable it took me 13 months to finish this chore…

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/util/Math.h (modified) (3 diffs)

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

@@ -139 +139 @@
     {
         return x*x*x;
-    }
-
-    /**
-        @brief Rounds the value to the nearest integer.
-    */
-    template <typename T>
-    inline int round(T x)
-    {
-        return static_cast<int>(x + 0.5);
     }
 
@@ -247 +238 @@
     inline T interpolate(float time, const T& start, const T& end)
     {
-        return time * (end - start) + start;
+        return static_cast<T>(time * (end - start) + start);
     }
 
@@ -260 +251 @@
     inline T interpolateSmooth(float time, const T& start, const T& end)
     {
-        return (-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start;
+        return static_cast<T>((-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start);
     }