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

Fix variable shadowing

Browse Source
This commit is contained in:
John Firebaugh
2014-10-29 10:12:41 -04:00
parent 8ae0dcb5a4
commit 7caac537b8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbgl/renderer/painter.hpp
View File

@@ -81,7 +81,7 @@ public:
timestamp time);
void renderLayers(util::ptr<StyleLayerGroup> group);
void renderLayer(util::ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id = nullptr, const mat4* matrix = nullptr);
void renderLayer(util::ptr<StyleLayer> layer_desc, const Tile::ID* id = nullptr, const mat4* matrix = nullptr);
// Renders a particular layer from a tile.
void renderTileLayer(const Tile& tile, util::ptr<StyleLayer> layer_desc, const mat4 &matrix);

6
src/renderer/painter.cpp
View File

@@ -259,7 +259,7 @@ void Painter::renderLayers(util::ptr<StyleLayerGroup> group) {
for (auto it = group->layers.rbegin(), end = group->layers.rend(); it != end; ++it, ++i) {
setOpaque();
setStrata(i * strata_thickness);
renderLayer(*it, RenderPass::Opaque);
renderLayer(*it);
}
if (debug::renderTree) {
std::cout << std::string(--indent * 4, ' ') << "}" << std::endl;
@@ -275,14 +275,14 @@ void Painter::renderLayers(util::ptr<StyleLayerGroup> group) {
for (auto it = group->layers.begin(), end = group->layers.end(); it != end; ++it, --i) {
setTranslucent();
setStrata(i * strata_thickness);
renderLayer(*it, RenderPass::Translucent);
renderLayer(*it);
}
if (debug::renderTree) {
std::cout << std::string(--indent * 4, ' ') << "}" << std::endl;
}
}
void Painter::renderLayer(util::ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id, const mat4* matrix) {
void Painter::renderLayer(util::ptr<StyleLayer> layer_desc, const Tile::ID* id, const mat4* matrix) {
if (layer_desc->type == StyleLayerType::Background) {
// This layer defines a background color/image.

4
src/renderer/painter_raster.cpp
View File

@@ -33,9 +33,9 @@ void Painter::renderRaster(RasterBucket& bucket, util::ptr<StyleLayer> layer_des
for (const util::ptr<StyleLayer> &layer : layer_desc->layers->layers) {
setOpaque();
renderLayer(layer, RenderPass::Opaque, &id, &preMatrix);
renderLayer(layer, &id, &preMatrix);
setTranslucent();
renderLayer(layer, RenderPass::Translucent, &id, &preMatrix);
renderLayer(layer, &id, &preMatrix);
}
if (bucket.properties.blur > 0) {