summaryrefslogtreecommitdiff
path: root/src/util/raster.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-04-30 14:20:15 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-04-30 14:20:15 +0200
commit4afe20776d70125131e49913007c95424c4f5247 (patch)
tree59ed61cb2be2c0710fd3bc52aa37b28b8348e9eb /src/util/raster.cpp
parent61442748ab5fd75df4141ea29f6341913392a519 (diff)
downloadqtlocation-mapboxgl-4afe20776d70125131e49913007c95424c4f5247.tar.gz
move animation time api to use nanoseconds
Diffstat (limited to 'src/util/raster.cpp')
-rw-r--r--src/util/raster.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/raster.cpp b/src/util/raster.cpp
index 7741b9f537..84bfe49f55 100644
--- a/src/util/raster.cpp
+++ b/src/util/raster.cpp
@@ -186,16 +186,16 @@ void Raster::bind(bool linear) {
}
void Raster::beginFadeInAnimation() {
- double start = (double)util::now() / 1_second;
- fade_animation = std::make_shared<util::ease_animation>(opacity, 1.0, opacity, start, 0.25);
+ time start = util::now();
+ fade_animation = std::make_shared<util::ease_animation>(opacity, 1.0, opacity, start, 250_milliseconds);
}
bool Raster::needsAnimation() const {
return fade_animation != nullptr;
}
-void Raster::updateAnimations(double time) {
- if (fade_animation->update(time) == util::animation::complete) {
+void Raster::updateAnimations(time now) {
+ if (fade_animation->update(now) == util::animation::complete) {
fade_animation = nullptr;
}
}