@@ -43,7 +43,7 @@ bool CircleLayer::recalculate(const StyleCalculationParameters& parameters) {
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> CircleLayer::createBucket(StyleBucketParameters& parameters) const {
|
||||
auto bucket = std::make_unique<CircleBucket>();
|
||||
auto bucket = std::make_unique<CircleBucket>(parameters.mode);
|
||||
|
||||
parameters.eachFilteredFeature(filter, [&] (const auto& feature) {
|
||||
bucket->addGeometry(getGeometries(feature));
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -2,9 +2,8 @@
|
||||
#define MBGL_RENDERER_CIRCLE_BUCKET
|
||||
|
||||
#include <mbgl/renderer/bucket.hpp>
|
||||
|
||||
#include <mbgl/map/mode.hpp>
|
||||
#include <mbgl/tile/geometry_tile.hpp>
|
||||
|
||||
#include <mbgl/geometry/elements_buffer.hpp>
|
||||
#include <mbgl/geometry/circle_buffer.hpp>
|
||||
|
||||
@@ -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<std::unique_ptr<TriangleGroup>> triangleGroups_;
|
||||
|
||||
const MapMode mode;
|
||||
};
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user