diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-10-03 13:26:57 -0700 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-11-21 14:19:04 +0200 |
commit | 9f51faf77955b2c5f6d0bbd8b55b3ad507e90a16 (patch) | |
tree | 666f805fe6c2996f69954564934b63a45a289308 | |
parent | f30429832e78600b8100a812fb50bcf1b949d567 (diff) | |
download | qtlocation-mapboxgl-9f51faf77955b2c5f6d0bbd8b55b3ad507e90a16.tar.gz |
[core] Let property evaluation transitions use the transition duration, if set
-rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 8 |
1 files 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 { |