Changeset 486 for trunk/nv/stl/math/basic.hh

Timestamp:

02/24/16 18:47:54 (9 years ago)

Author:

epyon

Message:

• mass update once again...

File:

• trunk/nv/stl/math/basic.hh (modified) (2 diffs)

trunk/nv/stl/math/basic.hh

@@ -52 +52 @@
                                 typename T,
                                 typename Mix = T,
-                                bool MixBool = is_same< value_type_t<Mix>, bool >,
+                                bool MixBool = is_same< value_type_t<Mix>, bool >::value,
                                 bool TIsVector = is_vec<T>::value,
                                 bool MixIsVector = is_vec<Mix>::value >
@@ -274 +274 @@
                 }
 
+                template < typename T, typename enable_if< is_arithmetic<T>::value >::type* = nullptr >
+                constexpr T lerp( T a, T b, T m )
+                {
+                        return a + m * ( b - a );
+                }
+
+                template < typename T, typename enable_if< is_vec<T>::value >::type* = nullptr >
+                constexpr T lerp( const T& a, const T& b, value_type_t<T> m )
+                {
+                        return a + m * ( b - a );
+                }
+
                 template < typename T, typename enable_if< !is_vec<T>::value >::type* = nullptr >
                 constexpr T step( T edge, T x )