diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-08-05 18:04:31 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-08-20 13:58:37 -0700 |
| commit | b9c7e1bdd99b4c6d37672ef34ffe178d4bc54ad3 (patch) | |
| tree | d53d5f9068a3501bad712e8c0c3e999a25068297 /include/mbgl/util/math.hpp | |
| parent | 2660b7bd1b77d9571ceb12adfef4b83e56d8e0f0 (diff) | |
| download | qtlocation-mapboxgl-b9c7e1bdd99b4c6d37672ef34ffe178d4bc54ad3.tar.gz | |
Consolidate duplicate interpolation definitions
While here, do not interpolate style properties that
are not transitionable. The previous behavior was to
switch from old to new value halfway through the transition;
now the new value is used immediately, as in JS.
Diffstat (limited to 'include/mbgl/util/math.hpp')
| -rw-r--r-- | include/mbgl/util/math.hpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/mbgl/util/math.hpp b/include/mbgl/util/math.hpp index 277fdc8fc3..fde2a4720b 100644 --- a/include/mbgl/util/math.hpp +++ b/include/mbgl/util/math.hpp @@ -57,11 +57,6 @@ inline T angle_to(const vec2<S>& a, const vec2<S>& b) { return std::atan2(a.y - b.y, a.x - b.x); } -template <typename T, typename S1, typename S2> -inline T interp(S1 a, S2 b, T t) { - return (a * ((T)1 - t)) + (b * t); -} - // Reflect an angle around 0 degrees template <typename T> inline std::array<T, 2> flip(const std::array<T, 2>& c) { |