diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-29 14:53:54 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-30 13:03:07 +0300 |
commit | b83dfb7eb53cd7c13c98149220b960351501c8c1 (patch) | |
tree | bc6397f13f0c4110fadcfb649ad4d0ab75c22b03 | |
parent | 5cf0fc0f8bb3f66fd7844cae73efca1a4c2d94f5 (diff) | |
download | qtlocation-mapboxgl-b83dfb7eb53cd7c13c98149220b960351501c8c1.tar.gz |
Revert "[core] Factor timePoint initialization"
This reverts commit 3790caafa3c98706c5cf0618c8aec592b2780bba.
-rw-r--r-- | src/mbgl/map/map.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 7544760927..96b8b88044 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -226,9 +226,7 @@ void Map::Impl::render(View& view) { return; } - TimePoint timePoint = mode == MapMode::Continuous - ? Clock::now() - : Clock::time_point::max(); + TimePoint timePoint = Clock::now(); transform.updateTransitions(timePoint); diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index e75925f476..a03a18fdaf 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -306,13 +306,13 @@ void Style::update(const UpdateParameters& parameters) { const bool zoomChanged = zoomHistory.update(parameters.transformState.getZoom(), parameters.timePoint); const TransitionParameters transitionParameters { - parameters.timePoint, + parameters.mode == MapMode::Continuous ? parameters.timePoint : Clock::time_point::max(), parameters.mode == MapMode::Continuous ? transitionOptions : TransitionOptions() }; const PropertyEvaluationParameters evaluationParameters { zoomHistory, - parameters.timePoint, + parameters.mode == MapMode::Continuous ? parameters.timePoint : Clock::time_point::max(), parameters.mode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Duration::zero() }; |