From 5fb0b0c1bc2dbde473742ab281706abff2b24217 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 3 Oct 2018 13:26:57 -0700 Subject: [core] Let property evaluation transitions use the transition duration, if set --- src/mbgl/renderer/renderer_impl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 000c8b9c30..676a9568a4 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -90,15 +90,19 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { const bool zoomChanged = zoomHistory.update(updateParameters.transformState.getZoom(), updateParameters.timePoint); + const bool isMapModeContinuous = updateParameters.mode == MapMode::Continuous; + + const TransitionOptions transitionOptions = isMapModeContinuous ? updateParameters.transitionOptions : TransitionOptions(); + const TransitionParameters transitionParameters { updateParameters.timePoint, - updateParameters.mode == MapMode::Continuous ? updateParameters.transitionOptions : TransitionOptions() + transitionOptions }; const PropertyEvaluationParameters evaluationParameters { zoomHistory, updateParameters.timePoint, - updateParameters.mode == MapMode::Continuous ? util::DEFAULT_TRANSITION_DURATION : Duration::zero() + transitionOptions.duration.value_or(isMapModeContinuous ? util::DEFAULT_TRANSITION_DURATION : Duration::zero()) }; const TileParameters tileParameters { -- cgit v1.2.1