From 9b537fab29735bd7969c8781c4c54df3d5786d15 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 4 Nov 2015 11:02:19 -0800 Subject: [PATCH] [core] Use frame animation time, not Clock::now(), for fading --- src/mbgl/style/function.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mbgl/style/function.cpp b/src/mbgl/style/function.cpp index 5c8f294da..f6f67d953 100644 --- a/src/mbgl/style/function.cpp +++ b/src/mbgl/style/function.cpp @@ -108,7 +108,7 @@ Faded Function>::evaluate(const StyleCalculationParameters& paramete float z = parameters.z; float fraction = std::fmod(z, 1.0f); std::chrono::duration 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;