[core] Use frame animation time, not Clock::now(), for fading

This commit is contained in:
John Firebaugh
2015-11-04 11:02:19 -08:00
parent b81243daa9
commit 9b537fab29

View File

@@ -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;