tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] TilePyramid::getRenderTiles -> getRenderedTiles

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-06-10 16:01:20 +03:00
parent f77af317c4
commit 1edebf0035
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/renderer/layers/render_symbol_layer.cpp
View File

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

2
src/mbgl/renderer/render_layer.cpp
View File

@@ -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 {

2
src/mbgl/renderer/render_source.hpp
View File

@@ -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,

2
src/mbgl/renderer/sources/render_image_source.hpp
View File

@@ -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 {};
}

2
src/mbgl/renderer/sources/render_raster_dem_source.cpp
View File

@@ -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){

2
src/mbgl/renderer/sources/render_raster_source.cpp
View File

@@ -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) {

4
src/mbgl/renderer/sources/render_tile_source.cpp
View File

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

2
src/mbgl/renderer/sources/render_tile_source.hpp
View File

@@ -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,

2
src/mbgl/renderer/tile_pyramid.hpp
View File

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