diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-04 11:02:19 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-06 10:38:48 -0800 |
commit | 9b537fab29735bd7969c8781c4c54df3d5786d15 (patch) | |
tree | e57f96804e0107e9531fc6a82e226d651b9d7964 | |
parent | b81243daa9ec5a16594fa280236e2ee903540f64 (diff) | |
download | qtlocation-mapboxgl-9b537fab29735bd7969c8781c4c54df3d5786d15.tar.gz |
[core] Use frame animation time, not Clock::now(), for fading
-rw-r--r-- | src/mbgl/style/function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/style/function.cpp b/src/mbgl/style/function.cpp index 5c8f294da4..f6f67d9531 100644 --- a/src/mbgl/style/function.cpp +++ b/src/mbgl/style/function.cpp @@ -108,7 +108,7 @@ Faded<T> Function<Faded<T>>::evaluate(const StyleCalculationParameters& paramete float z = parameters.z; float fraction = std::fmod(z, 1.0f); std::chrono::duration<float> d = duration ? *duration : parameters.defaultFadeDuration; - float t = std::min((Clock::now() - parameters.zoomHistory.lastIntegerZoomTime) / d, 1.0f); + float t = std::min((parameters.now - parameters.zoomHistory.lastIntegerZoomTime) / d, 1.0f); float fromScale = 1.0f; float toScale = 1.0f; size_t from, to; |