From b7b955289a7cb5006cff715ce2ff21a511644769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 20 Jan 2013 01:28:23 +0100
Subject: [PATCH] Math: Vector::lerp() can take `t` of arbitrary type.

Usable when interpolating e.g. colors in denormalized integral form, as
`t` could be only `0` or `1` in that case, which is pretty unusable.
---
 src/Math/Test/VectorTest.cpp | 5 +++++
 src/Math/Vector.h            | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Math/Test/VectorTest.cpp b/src/Math/Test/VectorTest.cpp
index b1f93a472..56eb0083b 100644
--- a/src/Math/Test/VectorTest.cpp
+++ b/src/Math/Test/VectorTest.cpp
@@ -160,6 +160,11 @@ void VectorTest::lerp() {
     Vector3 b(3.0f, -2.0f, 11.0f);
 
     CORRADE_COMPARE(Vector3::lerp(a, b, 0.25f), Vector3(0.0f, 1.0f, 5.0f));
+
+    typedef Math::Vector<3, std::int32_t> Vector3ub;
+    Vector3ub c(0, 128, 64);
+    Vector3ub d(16, 0, 32);
+    CORRADE_COMPARE(Vector3ub::lerp(c, d, 0.25f), Vector3ub(4, 96, 56));
 }
 
 void VectorTest::debug() {
diff --git a/src/Math/Vector.h b/src/Math/Vector.h
index 6d25c787c..d7b1b6d78 100644
--- a/src/Math/Vector.h
+++ b/src/Math/Vector.h
@@ -79,8 +79,8 @@ template<std::size_t size, class T> class Vector: public RectangularMatrix<1, si
          * @todo http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/
          *      (when SIMD is in place)
          */
-        inline static Vector<size, T> lerp(const Vector<size, T>& a, const Vector<size, T>& b, T t) {
-            return (T(1) - t)*a + t*b;
+        template<class U> inline static Vector<size, T> lerp(const Vector<size, T>& a, const Vector<size, T>& b, U t) {
+            return (U(1) - t)*a + t*b;
         }
 
         /** @brief Default constructor */
@@ -358,7 +358,7 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit
     template<class U> inline constexpr static Type<T> from(const Math::Vector<size, U>& other) { \
         return Math::Vector<size, T>::from(other);                          \
     }                                                                       \
-    inline static const Type<T> lerp(const Math::Vector<size, T>& a, const Math::Vector<size, T>& b, T t) { \
+    template<class U> inline static const Type<T> lerp(const Math::Vector<size, T>& a, const Math::Vector<size, T>& b, U t) { \
         return Math::Vector<size, T>::lerp(a, b, t);                        \
     }                                                                       \
                                                                             \