Changeset 1833Tweet

Timestamp:

Aug 29, 2012, 10:27:53 PM (8 years ago)

Author:

touky

Message:

 

Location:

trunk/src

Files:

• lol/math/math.h (modified) (1 diff)
• lol/math/vector.h (modified) (1 diff)
• numeric.h (modified) (1 diff)

trunk/src/lol/math/math.h

@@ -65 +65 @@
 }
 
+static inline double lerp(double const &a, double const &b, double const &x)
+{
+        return a + (b - a) * x;
+}
+static inline float lerp(float const &a, float const &b, float const &x)
+{
+        return a + (b - a) * x;
+}
+
+
 /* These accelerated functions will be merged into the above, one day */
 double lol_sin(double);

trunk/src/lol/math/vector.h

@@ -1230 +1230 @@
             ret += a[n] * b[n]; \
         return ret; \
+    } \
+    tprefix \
+    inline tname<tf> lerp(tname<t1> const &a, tname<t2> const &b, tf x) \
+    { \
+        tname<tf> ret; \
+        for (size_t n = 0; n < sizeof(a) / sizeof(t1); n++) \
+            ret[n] = a[n] + (a[n] - b[n]) * x; \
+        return ret; \
     }
 

trunk/src/numeric.h

@@ -53 +53 @@
 }
 
+//Lerp for float
+template <typename T1, typename T2, typename Tf> static inline T1 damp(const T1 &a, const T2 &b, const Tf &x, const Tf &dt)
+{
+        if (dt <= .0f)
+                return a;
+    return lol::lerp(a, b, dt / (dt + x));
+}
+
 } /* namespace lol */