diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-06-29 22:40:50 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-04 15:50:50 +0300 |
commit | 60eae41549cec18dfeed5175fe1d6c327060a8de (patch) | |
tree | 8338673b9b01656d14fa645be878004309245e5a /src/mbgl/renderer/render_style.cpp | |
parent | a744e35f44213584574b2e5377076d4b6d99ac7b (diff) | |
download | qtlocation-mapboxgl-60eae41549cec18dfeed5175fe1d6c327060a8de.tar.gz |
[core] Factor timePoint initialization: take 2
Diffstat (limited to 'src/mbgl/renderer/render_style.cpp')
-rw-r--r-- | src/mbgl/renderer/render_style.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/render_style.cpp b/src/mbgl/renderer/render_style.cpp index 79b20a9d71..91efb6c737 100644 --- a/src/mbgl/renderer/render_style.cpp +++ b/src/mbgl/renderer/render_style.cpp @@ -86,13 +86,13 @@ void RenderStyle::update(const UpdateParameters& parameters) { const bool zoomChanged = zoomHistory.update(parameters.transformState.getZoom(), parameters.timePoint); const TransitionParameters transitionParameters { - parameters.mode == MapMode::Continuous ? parameters.timePoint : Clock::time_point::max(), + parameters.timePoint, parameters.mode == MapMode::Continuous ? parameters.transitionOptions : TransitionOptions() }; const PropertyEvaluationParameters evaluationParameters { zoomHistory, - parameters.mode == MapMode::Continuous ? parameters.timePoint : Clock::time_point::max(), + parameters.timePoint, parameters.mode == MapMode::Continuous ? util::DEFAULT_TRANSITION_DURATION : Duration::zero() }; |