diff options
Diffstat (limited to 'include/mbgl/util/transition.hpp')
| -rw-r--r-- | include/mbgl/util/transition.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/mbgl/util/transition.hpp b/include/mbgl/util/transition.hpp index 8a6836c885..16adc41ceb 100644 --- a/include/mbgl/util/transition.hpp +++ b/include/mbgl/util/transition.hpp @@ -15,9 +15,9 @@ public: complete }; - inline transition(timestamp start, timestamp duration) - : start(start), - duration(duration) {} + inline transition(timestamp start_, timestamp duration_) + : start(start_), + duration(duration_) {} inline float progress(timestamp now) const { if (duration == 0) return 1; @@ -36,11 +36,11 @@ protected: template <typename T> class ease_transition : public transition { public: - ease_transition(T from, T to, T& value, timestamp start, timestamp duration) + ease_transition(T from_, T to_, T& value_, timestamp start, timestamp duration) : transition(start, duration), - from(from), - to(to), - value(value) {} + from(from_), + to(to_), + value(value_) {} state update(timestamp now) const; @@ -53,10 +53,10 @@ private: template <typename T> class timeout : public transition { public: - timeout(T final_value, T& value, timestamp start, timestamp duration) + timeout(T final_value_, T& value_, timestamp start, timestamp duration) : transition(start, duration), - final_value(final_value), - value(value) {} + final_value(final_value_), + value(value_) {} state update(timestamp now) const { if (progress(now) >= 1) { |