diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-06 21:23:12 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-18 01:27:47 +0200 |
| commit | c6ba05bbc3860d310e04faad93de1e82cb4b42fc (patch) | |
| tree | 61bedf81da1a89052072d9a26f3ea8bc5589a1db /src/mbgl/style/style.cpp | |
| parent | 8f96dea8220074059438e9d732d9ce89bddd7fd9 (diff) | |
| download | qtlocation-mapboxgl-c6ba05bbc3860d310e04faad93de1e82cb4b42fc.tar.gz | |
[core] Default fade duration is now a constant
Diffstat (limited to 'src/mbgl/style/style.cpp')
| -rw-r--r-- | src/mbgl/style/style.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 4478285bae..724810a70c 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -207,10 +207,12 @@ void Style::recalculate(float z) { zoomHistory.update(z, data.getAnimationTime()); - StyleCalculationParameters parameters(z, - data.getAnimationTime(), - zoomHistory, - data.getDefaultFadeDuration()); + const StyleCalculationParameters parameters { + z, + data.getAnimationTime(), + zoomHistory, + data.mode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Duration::zero() + }; hasPendingTransitions = false; for (const auto& layer : layers) { |