Use std::chrono

This commit is contained in:
Leith Bade
2015-02-03 13:54:12 +11:00
parent 33b4922220
commit 89bbd29278
46 changed files with 289 additions and 315 deletions

View File

@@ -2,7 +2,6 @@
#include <mbgl/platform/gl.hpp>
#include <mbgl/util/raster.hpp>
#include <mbgl/util/time.hpp>
#include <mbgl/util/uv_detail.hpp>
#include <mbgl/util/std.hpp>
@@ -91,15 +90,15 @@ void Raster::bind(const GLuint custom_texture) {
}
void Raster::beginFadeInTransition() {
timestamp start = util::now();
fade_transition = std::make_shared<util::ease_transition<double>>(opacity, 1.0, opacity, start, 250_milliseconds);
std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
fade_transition = std::make_shared<util::ease_transition<double>>(opacity, 1.0, opacity, start, std::chrono::milliseconds(250));
}
bool Raster::needsTransition() const {
return fade_transition != nullptr;
}
void Raster::updateTransitions(timestamp now) {
void Raster::updateTransitions(std::chrono::steady_clock::time_point now) {
if (fade_transition->update(now) == util::transition::complete) {
fade_transition = nullptr;
}