diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-10 18:54:26 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-11 22:02:59 +0300 |
commit | 64beaf0a0848a4ffd6bf65d651899d5dd5bc2ce1 (patch) | |
tree | b4cfeb04d664649163e9f176a230a479ebb0d258 | |
parent | 9a1e8d3ebb605847815d5e775e4ad31b1a03c555 (diff) | |
download | qtlocation-mapboxgl-64beaf0a0848a4ffd6bf65d651899d5dd5bc2ce1.tar.gz |
[core] Set fading tiles flag at TilePyramid::updateFadingTiles()
-rw-r--r-- | src/mbgl/renderer/tile_pyramid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp index 54e0b1eb26..7f0fad1500 100644 --- a/src/mbgl/renderer/tile_pyramid.cpp +++ b/src/mbgl/renderer/tile_pyramid.cpp @@ -221,8 +221,6 @@ void TilePyramid::update(const std::vector<Immutable<style::LayerProperties>>& l pair.second->setShowCollisionBoxes(parameters.debugOptions & MapDebugOptions::Collision); } - fadingTiles = false; - // Initialize renderable tiles and update the contained layer render data. for (auto& entry : renderedTiles) { Tile& tile = entry.second; @@ -230,7 +228,6 @@ void TilePyramid::update(const std::vector<Immutable<style::LayerProperties>>& l tile.usedByRenderedLayers = false; const bool holdForFade = tile.holdForFade(); - fadingTiles = (fadingTiles || holdForFade); for (const auto& layerProperties : layers) { const auto* typeInfo = layerProperties->baseImpl->getTypeInfo(); if (holdForFade && typeInfo->fadingTiles == LayerTypeInfo::FadingTiles::NotRequired) { @@ -374,6 +371,7 @@ void TilePyramid::dumpDebugLogs() const { } void TilePyramid::clearAll() { + fadingTiles = false; tiles.clear(); renderedTiles.clear(); cache.clear(); @@ -385,9 +383,11 @@ void TilePyramid::addRenderTile(const UnwrappedTileID& tileID, Tile& tile) { } void TilePyramid::updateFadingTiles() { + fadingTiles = false; for (auto& entry : renderedTiles) { Tile& tile = entry.second; if (tile.holdForFade()) { + fadingTiles = true; tile.performedFadePlacement(); } } |