diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-12 15:21:15 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-15 07:43:51 -0700 |
| commit | 5a8729182652a5cb4d78644a5b9b9a2a2ff343b6 (patch) | |
| tree | 32a946fe3e728a4436d720058bd98c364f7760ac /src/mbgl/renderer/painter.cpp | |
| parent | ae5b0391b62b537ba6813df54221283685edd6f2 (diff) | |
| download | qtlocation-mapboxgl-5a8729182652a5cb4d78644a5b9b9a2a2ff343b6.tar.gz | |
[core] Obey "transition" property from style and its default value
Diffstat (limited to 'src/mbgl/renderer/painter.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 1f55c168a6..edec98047d 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -115,7 +115,7 @@ Painter::Painter(gl::Context& context_, Painter::~Painter() = default; bool Painter::needsAnimation() const { - return frameHistory.needsAnimation(util::DEFAULT_FADE_DURATION); + return frameHistory.needsAnimation(util::DEFAULT_TRANSITION_DURATION); } void Painter::cleanup() { @@ -159,7 +159,7 @@ void Painter::render(RenderStyle& style, const FrameData& frame_, View& view) { } frameHistory.record(frame.timePoint, state.getZoom(), - frame.mapMode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Milliseconds(0)); + frame.mapMode == MapMode::Continuous ? util::DEFAULT_TRANSITION_DURATION : Milliseconds(0)); // - UPLOAD PASS ------------------------------------------------------------------------------- |