summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-06-10 16:01:20 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-06-10 19:36:47 +0300
commit1edebf00356642cba87cf0574c1def309fa4602d (patch)
tree5324e936a209c67c099e3515ed7618fa477bd62c /src
parentf77af317c4e33902eedd2bf8c0527dacb1910522 (diff)
downloadqtlocation-mapboxgl-1edebf00356642cba87cf0574c1def309fa4602d.tar.gz
[core] TilePyramid::getRenderTiles -> getRenderedTiles
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/renderer/layers/render_symbol_layer.cpp2
-rw-r--r--src/mbgl/renderer/render_layer.cpp2
-rw-r--r--src/mbgl/renderer/render_source.hpp2
-rw-r--r--src/mbgl/renderer/sources/render_image_source.hpp2
-rw-r--r--src/mbgl/renderer/sources/render_raster_dem_source.cpp2
-rw-r--r--src/mbgl/renderer/sources/render_raster_source.cpp2
-rw-r--r--src/mbgl/renderer/sources/render_tile_source.cpp4
-rw-r--r--src/mbgl/renderer/sources/render_tile_source.hpp2
-rw-r--r--src/mbgl/renderer/tile_pyramid.hpp2
9 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index 7c0eab699a..51af6fa817 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -493,7 +493,7 @@ style::TextPaintProperties::PossiblyEvaluated RenderSymbolLayer::textPaintProper
}
void RenderSymbolLayer::prepare(const LayerPrepareParameters& params) {
- renderTiles = params.source->getRenderTiles();
+ renderTiles = params.source->getRenderedTiles();
const auto comp = [bearing = params.state.getBearing()](const RenderTile& a, const RenderTile& b) {
Point<float> pa(a.id.canonical.x, a.id.canonical.y);
Point<float> pb(b.id.canonical.x, b.id.canonical.y);
diff --git a/src/mbgl/renderer/render_layer.cpp b/src/mbgl/renderer/render_layer.cpp
index b3da821bb9..a18862ce0a 100644
--- a/src/mbgl/renderer/render_layer.cpp
+++ b/src/mbgl/renderer/render_layer.cpp
@@ -47,7 +47,7 @@ bool RenderLayer::supportsZoom(float zoom) const {
void RenderLayer::prepare(const LayerPrepareParameters& params) {
assert(params.source);
- renderTiles = filterRenderTiles(params.source->getRenderTiles());
+ renderTiles = filterRenderTiles(params.source->getRenderedTiles());
}
optional<Color> RenderLayer::getSolidBackground() const {
diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp
index 599c25b920..71e38f2afd 100644
--- a/src/mbgl/renderer/render_source.hpp
+++ b/src/mbgl/renderer/render_source.hpp
@@ -74,7 +74,7 @@ public:
virtual void updateFadingTiles() = 0;
virtual bool hasFadingTiles() const = 0;
// Returns a list of RenderTiles, sorted by tile id.
- virtual std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() = 0;
+ virtual std::vector<std::reference_wrapper<RenderTile>> getRenderedTiles() = 0;
virtual std::unordered_map<std::string, std::vector<Feature>>
queryRenderedFeatures(const ScreenLineString& geometry,
diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp
index f1d3a86db1..a656ccd539 100644
--- a/src/mbgl/renderer/sources/render_image_source.hpp
+++ b/src/mbgl/renderer/sources/render_image_source.hpp
@@ -33,7 +33,7 @@ public:
bool needsRelayout,
const TileParameters&) final;
- std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final {
+ std::vector<std::reference_wrapper<RenderTile>> getRenderedTiles() final {
return {};
}
diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp
index 96e4e1d2cc..9854b4fdc3 100644
--- a/src/mbgl/renderer/sources/render_raster_dem_source.cpp
+++ b/src/mbgl/renderer/sources/render_raster_dem_source.cpp
@@ -52,7 +52,7 @@ void RenderRasterDEMSource::update(Immutable<style::Source::Impl> baseImpl_,
[&] (const OverscaledTileID& tileID) {
return std::make_unique<RasterDEMTile>(tileID, parameters, *tileset);
});
- algorithm::updateTileMasks(tilePyramid.getRenderTiles());
+ algorithm::updateTileMasks(tilePyramid.getRenderedTiles());
}
void RenderRasterDEMSource::onTileChanged(Tile& tile){
diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp
index 8b460de3f8..827ffb9759 100644
--- a/src/mbgl/renderer/sources/render_raster_source.cpp
+++ b/src/mbgl/renderer/sources/render_raster_source.cpp
@@ -50,7 +50,7 @@ void RenderRasterSource::update(Immutable<style::Source::Impl> baseImpl_,
[&] (const OverscaledTileID& tileID) {
return std::make_unique<RasterTile>(tileID, parameters, *tileset);
});
- algorithm::updateTileMasks(tilePyramid.getRenderTiles());
+ algorithm::updateTileMasks(tilePyramid.getRenderedTiles());
}
void RenderRasterSource::prepare(const SourcePrepareParameters& parameters) {
diff --git a/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp
index b1fa824e68..8d3d97f708 100644
--- a/src/mbgl/renderer/sources/render_tile_source.cpp
+++ b/src/mbgl/renderer/sources/render_tile_source.cpp
@@ -28,7 +28,7 @@ void RenderTileSource::upload(gfx::UploadPass& parameters) {
void RenderTileSource::prepare(const SourcePrepareParameters& parameters) {
renderTiles.clear();
- for (auto& entry : tilePyramid.getRenderTiles()) {
+ for (auto& entry : tilePyramid.getRenderedTiles()) {
renderTiles.emplace_back(entry.first, entry.second);
renderTiles.back().prepare(parameters);
}
@@ -48,7 +48,7 @@ bool RenderTileSource::hasFadingTiles() const {
return tilePyramid.hasFadingTiles();
}
-std::vector<std::reference_wrapper<RenderTile>> RenderTileSource::getRenderTiles() {
+std::vector<std::reference_wrapper<RenderTile>> RenderTileSource::getRenderedTiles() {
return { renderTiles.begin(), renderTiles.end() };
}
diff --git a/src/mbgl/renderer/sources/render_tile_source.hpp b/src/mbgl/renderer/sources/render_tile_source.hpp
index a84c9fbbfe..5501e260f5 100644
--- a/src/mbgl/renderer/sources/render_tile_source.hpp
+++ b/src/mbgl/renderer/sources/render_tile_source.hpp
@@ -22,7 +22,7 @@ public:
void updateFadingTiles() override;
bool hasFadingTiles() const override;
- std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() override;
+ std::vector<std::reference_wrapper<RenderTile>> getRenderedTiles() override;
std::unordered_map<std::string, std::vector<Feature>>
queryRenderedFeatures(const ScreenLineString& geometry,
diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp
index 2c2c43c347..610828bdb3 100644
--- a/src/mbgl/renderer/tile_pyramid.hpp
+++ b/src/mbgl/renderer/tile_pyramid.hpp
@@ -43,7 +43,7 @@ public:
optional<LatLngBounds> bounds,
std::function<std::unique_ptr<Tile> (const OverscaledTileID&)> createTile);
- const std::map<UnwrappedTileID, std::reference_wrapper<Tile>>& getRenderTiles() const { return renderTiles; }
+ const std::map<UnwrappedTileID, std::reference_wrapper<Tile>>& getRenderedTiles() const { return renderTiles; }
Tile* getTile(const OverscaledTileID&);
void handleWrapJump(float lng);