diff --git a/include/llmr/renderer/fill_bucket.hpp b/include/llmr/renderer/fill_bucket.hpp index 0955d3491..71764af4f 100644 --- a/include/llmr/renderer/fill_bucket.hpp +++ b/include/llmr/renderer/fill_bucket.hpp @@ -15,7 +15,7 @@ class FillBucket : public Bucket { public: FillBucket(FillBuffer& buffer); - virtual void render(Painter& painter); + virtual void render(Painter& painter, const std::string& layer_name); void addGeometry(pbf& data); void drawElements(int32_t attrib); diff --git a/include/llmr/renderer/painter.hpp b/include/llmr/renderer/painter.hpp index 658227e9b..85b2b9100 100644 --- a/include/llmr/renderer/painter.hpp +++ b/include/llmr/renderer/painter.hpp @@ -34,7 +34,7 @@ public: void renderDebug(const std::shared_ptr& tile); void renderBackground(); - void renderFill(FillBucket& bucket, const FillProperties& style); + void renderFill(FillBucket& bucket, const std::string& layer_name); void drawClippingMask(); diff --git a/src/renderer/fill_bucket.cpp b/src/renderer/fill_bucket.cpp index bfd7293cb..f3d09511d 100644 --- a/src/renderer/fill_bucket.cpp +++ b/src/renderer/fill_bucket.cpp @@ -112,11 +112,6 @@ void FillBucket::drawVertices(int32_t attrib) { glDrawArrays(GL_LINE_STRIP, 0, length); } -void FillBucket::render(Painter& painter) { - // TODO: obtain the correct style information for this layer - FillProperties properties; - properties.fill_color = {{ 0, 0, 1, 0.5 }}; - properties.stroke_color = properties.fill_color; - - painter.renderFill(*this, properties); +void FillBucket::render(Painter& painter, const std::string& layer_name) { + painter.renderFill(*this, layer_name); } diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp index dc78dab54..e899e8192 100644 --- a/src/renderer/painter.cpp +++ b/src/renderer/painter.cpp @@ -169,7 +169,7 @@ void Painter::render(const Tile::Ptr& tile) { // glDrawArrays(GL_LINE_STRIP, 0, tile->lineVertex.length()); for (Layer& layer : tile->layers) { - layer.bucket->render(*this); + layer.bucket->render(*this, layer.name); } if (settings.debug) { @@ -179,7 +179,13 @@ void Painter::render(const Tile::Ptr& tile) { renderBackground(); } -void Painter::renderFill(FillBucket& bucket, const FillProperties& properties) { +void Painter::renderFill(FillBucket& bucket, const std::string& layer_name) { + // TODO: obtain the correct style information for this layer + FillProperties properties; + properties.fill_color = {{ 0, 0, 1, 0.5 }}; + properties.stroke_color = properties.fill_color; + + // Draw the stencil mask. { // We're only drawing to the first seven bits (== support a maximum of