diff options
Diffstat (limited to 'src/mbgl/util')
-rw-r--r-- | src/mbgl/util/raster.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/util/raster.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/util/stopwatch.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/util/stopwatch.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/util/transition.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/util/transition.hpp | 22 |
6 files changed, 23 insertions, 23 deletions
diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp index 72e266af94..7300c291e5 100644 --- a/src/mbgl/util/raster.cpp +++ b/src/mbgl/util/raster.cpp @@ -91,7 +91,7 @@ void Raster::bind(const GLuint custom_texture) { } void Raster::beginFadeInTransition() { - std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now(); + TimePoint start = Clock::now(); fade_transition = std::make_shared<util::ease_transition<double>>(opacity, 1.0, opacity, start, std::chrono::milliseconds(250)); } @@ -99,7 +99,7 @@ bool Raster::needsTransition() const { return fade_transition != nullptr; } -void Raster::updateTransitions(std::chrono::steady_clock::time_point now) { +void Raster::updateTransitions(TimePoint now) { if (fade_transition->update(now) == util::transition::complete) { fade_transition = nullptr; } diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index f9e275461c..6e5a819916 100644 --- a/src/mbgl/util/raster.hpp +++ b/src/mbgl/util/raster.hpp @@ -5,10 +5,10 @@ #include <mbgl/util/texture_pool.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/ptr.hpp> +#include <mbgl/util/chrono.hpp> #include <string> #include <mutex> -#include <chrono> typedef struct uv_loop_s uv_loop_t; @@ -35,7 +35,7 @@ public: // transitions void beginFadeInTransition(); bool needsTransition() const; - void updateTransitions(std::chrono::steady_clock::time_point now); + void updateTransitions(TimePoint now); public: // loaded image dimensions diff --git a/src/mbgl/util/stopwatch.cpp b/src/mbgl/util/stopwatch.cpp index 310bdb8ff2..aa1ab43baa 100644 --- a/src/mbgl/util/stopwatch.cpp +++ b/src/mbgl/util/stopwatch.cpp @@ -9,19 +9,19 @@ using namespace mbgl::util; stopwatch::stopwatch(Event event_) - : event(event_), start(std::chrono::steady_clock::now()) {} + : event(event_), start(Clock::now()) {} stopwatch::stopwatch(EventSeverity severity_, Event event_) - : severity(severity_), event(event_), start(std::chrono::steady_clock::now()) {} + : severity(severity_), event(event_), start(Clock::now()) {} stopwatch::stopwatch(const std::string &name_, Event event_) - : name(name_), event(event_), start(std::chrono::steady_clock::now()) {} + : name(name_), event(event_), start(Clock::now()) {} stopwatch::stopwatch(const std::string &name_, EventSeverity severity_, Event event_) - : name(name_), severity(severity_), event(event_), start(std::chrono::steady_clock::now()) {} + : name(name_), severity(severity_), event(event_), start(Clock::now()) {} void stopwatch::report(const std::string &name_) { - std::chrono::steady_clock::duration duration = std::chrono::steady_clock::now() - start; + Duration duration = Clock::now() - start; Log::Record(severity, event, name_ + ": " + util::toString(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count()) + "ms"); start += duration; diff --git a/src/mbgl/util/stopwatch.hpp b/src/mbgl/util/stopwatch.hpp index bfa384c07e..57807afa76 100644 --- a/src/mbgl/util/stopwatch.hpp +++ b/src/mbgl/util/stopwatch.hpp @@ -2,9 +2,9 @@ #define MBGL_UTIL_STOPWATCH #include <mbgl/platform/event.hpp> +#include <mbgl/util/chrono.hpp> #include <string> -#include <chrono> namespace mbgl { namespace util { @@ -23,7 +23,7 @@ private: const std::string name; EventSeverity severity = EventSeverity::Debug; Event event = Event::General; - std::chrono::steady_clock::time_point start; + TimePoint start; }; #else class stopwatch { diff --git a/src/mbgl/util/transition.cpp b/src/mbgl/util/transition.cpp index c47776c9b5..55de25f0c5 100644 --- a/src/mbgl/util/transition.cpp +++ b/src/mbgl/util/transition.cpp @@ -10,7 +10,7 @@ UnitBezier ease(0, 0, 0.25, 1); transition::~transition() {} template <typename T> -transition::state ease_transition<T>::update(std::chrono::steady_clock::time_point now) const { +transition::state ease_transition<T>::update(TimePoint now) const { float t = progress(now); if (t >= 1) { value = to; 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; |