[core] Let property evaluation transitions use the transition duration, if set

This commit is contained in:
Bruno de Oliveira Abinader
2018-10-03 13:26:57 -07:00
parent 5c832c225f
commit 5fb0b0c1bc

View File

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