diff --git a/src/mbgl/layer/circle_layer.cpp b/src/mbgl/layer/circle_layer.cpp index 0a28b2f2c..b668847f5 100644 --- a/src/mbgl/layer/circle_layer.cpp +++ b/src/mbgl/layer/circle_layer.cpp @@ -43,7 +43,7 @@ bool CircleLayer::recalculate(const StyleCalculationParameters& parameters) { } std::unique_ptr CircleLayer::createBucket(StyleBucketParameters& parameters) const { - auto bucket = std::make_unique(); + auto bucket = std::make_unique(parameters.mode); parameters.eachFilteredFeature(filter, [&] (const auto& feature) { bucket->addGeometry(getGeometries(feature)); diff --git a/src/mbgl/renderer/circle_bucket.cpp b/src/mbgl/renderer/circle_bucket.cpp index fcead38c3..9ed8f98ae 100644 --- a/src/mbgl/renderer/circle_bucket.cpp +++ b/src/mbgl/renderer/circle_bucket.cpp @@ -7,7 +7,7 @@ using namespace mbgl; -CircleBucket::CircleBucket() { +CircleBucket::CircleBucket(MapMode mode_) : mode(mode_) { } CircleBucket::~CircleBucket() { @@ -38,7 +38,10 @@ void CircleBucket::addGeometry(const GeometryCollection& geometryCollection) { auto y = geometry.y; // Do not include points that are outside the tile boundaries. - if (x < 0 || x >= util::EXTENT || y < 0 || y >= util::EXTENT) continue; + // Include all points in Still mode. You need to include points from + // neighbouring tiles so that they are not clipped at tile boundaries. + if ((mode != MapMode::Still) && + (x < 0 || x >= util::EXTENT || y < 0 || y >= util::EXTENT)) continue; // this geometry will be of the Point type, and we'll derive // two triangles from it. diff --git a/src/mbgl/renderer/circle_bucket.hpp b/src/mbgl/renderer/circle_bucket.hpp index 875e5bb4a..89d8de27b 100644 --- a/src/mbgl/renderer/circle_bucket.hpp +++ b/src/mbgl/renderer/circle_bucket.hpp @@ -2,9 +2,8 @@ #define MBGL_RENDERER_CIRCLE_BUCKET #include - +#include #include - #include #include @@ -17,7 +16,7 @@ class CircleBucket : public Bucket { using TriangleGroup = ElementGroup<3>; public: - CircleBucket(); + CircleBucket(const MapMode); ~CircleBucket() override; void upload(gl::GLObjectStore&) override; @@ -33,6 +32,8 @@ private: TriangleElementsBuffer elementsBuffer_; std::vector> triangleGroups_; + + const MapMode mode; }; } // namespace mbgl diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp index 4ae562d67..a6a7ab625 100644 --- a/src/mbgl/renderer/painter_circle.cpp +++ b/src/mbgl/renderer/painter_circle.cpp @@ -17,7 +17,7 @@ void Painter::renderCircle(CircleBucket& bucket, // Abort early. if (pass == RenderPass::Opaque) return; - config.stencilTest = GL_FALSE; + config.stencilTest = data.mode == MapMode::Still ? GL_TRUE : GL_FALSE; config.depthFunc.reset(); config.depthTest = GL_TRUE; config.depthMask = GL_FALSE;