summaryrefslogtreecommitdiff
path: root/src/mbgl/util/transition.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/util/transition.hpp')
-rw-r--r--src/mbgl/util/transition.hpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/util/transition.hpp b/src/mbgl/util/transition.hpp
index fc1ecd23c3..de9fffb669 100644
--- a/src/mbgl/util/transition.hpp
+++ b/src/mbgl/util/transition.hpp
@@ -2,7 +2,7 @@
#define MBGL_UTIL_TRANSITION
#include <mbgl/util/noncopyable.hpp>
-#include <chrono>
+#include <mbgl/util/chrono.hpp>
namespace mbgl {
namespace util {
@@ -14,35 +14,35 @@ public:
complete
};
- inline transition(std::chrono::steady_clock::time_point start_, std::chrono::steady_clock::duration duration_)
+ inline transition(TimePoint start_, Duration duration_)
: start(start_),
duration(duration_) {}
- inline float progress(std::chrono::steady_clock::time_point now) const {
- if (duration == std::chrono::steady_clock::duration::zero()) return 1;
+ inline float progress(TimePoint now) const {
+ if (duration == Duration::zero()) return 1;
if (start > now) return 0;
return std::chrono::duration<float>(now - start) / duration;
}
- virtual state update(std::chrono::steady_clock::time_point now) const = 0;
+ virtual state update(TimePoint now) const = 0;
virtual ~transition();
protected:
- const std::chrono::steady_clock::time_point start;
- const std::chrono::steady_clock::duration duration;
+ const TimePoint start;
+ const Duration duration;
};
template <typename T>
class ease_transition : public transition {
public:
- ease_transition(T from_, T to_, T& value_, std::chrono::steady_clock::time_point start_, std::chrono::steady_clock::duration duration_)
+ ease_transition(T from_, T to_, T& value_, TimePoint start_, Duration duration_)
: transition(start_, duration_),
from(from_),
to(to_),
value(value_) {}
- state update(std::chrono::steady_clock::time_point now) const;
+ state update(TimePoint now) const;
private:
const T from, to;
@@ -53,12 +53,12 @@ private:
template <typename T>
class timeout : public transition {
public:
- timeout(T final_value_, T& value_, std::chrono::steady_clock::time_point start_, std::chrono::steady_clock::duration duration_)
+ timeout(T final_value_, T& value_, TimePoint start_, Duration duration_)
: transition(start_, duration_),
final_value(final_value_),
value(value_) {}
- state update(std::chrono::steady_clock::time_point now) const {
+ state update(TimePoint now) const {
if (progress(now) >= 1) {
value = final_value;
return complete;