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 16:43:20 +0200 |
commit | 5fb0b0c1bc2dbde473742ab281706abff2b24217 (patch) | |
tree | 49bb4cd67c7fe9b33a7df17e05432fe59e36d8da /src | |
parent | 5c832c225f2ed4dcc417a993a3f3f5c6f2c1436d (diff) | |
download | qtlocation-mapboxgl-5fb0b0c1bc2dbde473742ab281706abff2b24217.tar.gz |
[core] Let property evaluation transitions use the transition duration, if set
Diffstat (limited to 'src')
-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 { |