diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-20 16:57:35 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-20 17:07:55 +0300 |
commit | 263f9fad308873077b9287dd8aeab089fc415b10 (patch) | |
tree | 6423411c0f630eaa911ebc503b8ef163463d2984 /src/mbgl | |
parent | 0753aad57bef0eec51ce7ca748c19ebc588bd995 (diff) | |
download | qtlocation-mapboxgl-263f9fad308873077b9287dd8aeab089fc415b10.tar.gz |
Revert "split renderSync and transition nudging to allow client view syncing"
This reverts commit b8388168dd130c67c77254565cdb576df7905915.
It seems 'nudgeTransitions()' is no longer necessary as #1548 has fixed the update issues.
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/map/map.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index d983a9c518..0e58a2912d 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -48,7 +48,7 @@ void Map::renderStill(StillImageCallback callback) { FrameData{ view.getFramebufferSize() }, callback); } -bool Map::renderSync() { +void Map::renderSync() { if (renderState == RenderState::never) { view.notifyMapChange(MapChangeWillStartRenderingMap); } @@ -69,13 +69,9 @@ bool Map::renderSync() { view.notifyMapChange(MapChangeDidFinishRenderingMapFullyRendered); } - return result.needsRerender; -} - -void Map::nudgeTransitions(bool forceRerender) { if (transform->needsTransition()) { update(Update(transform->updateTransitions(Clock::now()))); - } else if (forceRerender) { + } else if (result.needsRerender) { update(); } } |