diff options
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/map.cpp | 4 | ||||
-rw-r--r-- | src/map/raster_tile_data.cpp | 4 | ||||
-rw-r--r-- | src/map/source.cpp | 6 | ||||
-rw-r--r-- | src/map/vector_tile_data.cpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index a289e46a29..6bbbfcc1eb 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -633,7 +633,7 @@ void Map::renderLayers(std::shared_ptr<StyleLayerGroup> group) { } } -void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id) { +void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id, const mat4* matrix) { if (layer_desc->layers && layer_desc->type != StyleLayerType::Raster) { // This is a layer group. We render them during our translucent render pass. if (pass == Translucent) { @@ -719,7 +719,7 @@ void Map::renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, c if (!id) { style_source.source->render(painter, layer_desc); } else { - style_source.source->render(painter, layer_desc, *id); + style_source.source->render(painter, layer_desc, *id, *matrix); } } } diff --git a/src/map/raster_tile_data.cpp b/src/map/raster_tile_data.cpp index a401fdc4df..182a614393 100644 --- a/src/map/raster_tile_data.cpp +++ b/src/map/raster_tile_data.cpp @@ -25,8 +25,8 @@ void RasterTileData::parse() { } } -void RasterTileData::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc) { - bucket.render(painter, layer_desc, id); +void RasterTileData::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc, const mat4 &matrix) { + bucket.render(painter, layer_desc, id, matrix); } bool RasterTileData::hasData(std::shared_ptr<StyleLayer> /*layer_desc*/) const { diff --git a/src/map/source.cpp b/src/map/source.cpp index c4cd3a51d9..bbe25969c1 100644 --- a/src/map/source.cpp +++ b/src/map/source.cpp @@ -83,15 +83,15 @@ void Source::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc) { for (const std::pair<const Tile::ID, std::unique_ptr<Tile>> &pair : tiles) { Tile &tile = *pair.second; if (tile.data && tile.data->state == TileData::State::parsed) { - painter.renderTileLayer(tile, layer_desc); + painter.renderTileLayer(tile, layer_desc, tile.matrix); } } } -void Source::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID &id) { +void Source::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID &id, const mat4 &matrix) { auto it = tiles.find(id); if (it != tiles.end() && it->second->data && it->second->data->state == TileData::State::parsed) { - painter.renderTileLayer(*it->second, layer_desc); + painter.renderTileLayer(*it->second, layer_desc, matrix); } } diff --git a/src/map/vector_tile_data.cpp b/src/map/vector_tile_data.cpp index 2bf339b65f..f1c67d8e16 100644 --- a/src/map/vector_tile_data.cpp +++ b/src/map/vector_tile_data.cpp @@ -52,12 +52,12 @@ void VectorTileData::afterParse() { parser.reset(); } -void VectorTileData::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc) { +void VectorTileData::render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc, const mat4 &matrix) { if (state == State::parsed && layer_desc->bucket) { auto databucket_it = buckets.find(layer_desc->bucket->name); if (databucket_it != buckets.end()) { assert(databucket_it->second); - databucket_it->second->render(painter, layer_desc, id); + databucket_it->second->render(painter, layer_desc, id, matrix); } } } |