Revert "split renderSync and transition nudging to allow client view syncing"

This reverts commit b8388168dd.

It seems 'nudgeTransitions()' is no longer necessary as #1548 has fixed the update issues.
This commit is contained in:
Bruno de Oliveira Abinader
2015-07-20 16:57:35 +03:00
parent 0753aad57b
commit 263f9fad30
3 changed files with 4 additions and 13 deletions

View File

@@ -67,10 +67,7 @@ public:
void renderStill(StillImageCallback callback);
// Triggers a synchronous or asynchronous render.
bool renderSync();
// Nudges transitions one step, possibly notifying of the need for a rerender.
void nudgeTransitions(bool forceRerender);
void renderSync();
// Notifies the Map thread that the state has changed and an update might be necessary.
void update(Update update = Update::Nothing);

View File

@@ -703,11 +703,9 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration)
_mbglMap->setSourceTileCacheSize(cacheSize);
bool needsRerender = _mbglMap->renderSync();
_mbglMap->renderSync();
[self updateUserLocationAnnotationView];
_mbglMap->nudgeTransitions(needsRerender);
}
}

View File

@@ -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();
}
}