diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-04-27 17:18:29 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-05-03 14:17:25 -0700 |
| commit | 27b21363e62c105db0b040b4c5a5ef31170ebd30 (patch) | |
| tree | 65e3b174fcf583378450252e2a322dbc79ee1a79 /src/mbgl/renderer/buckets/symbol_bucket.hpp | |
| parent | 60ac08afae3d3ca0e94ce4f1ce7dfb98c25e2345 (diff) | |
| download | qtlocation-mapboxgl-27b21363e62c105db0b040b4c5a5ef31170ebd30.tar.gz | |
[core] Only run placement for first layer per SymbolBucket
Native version of mapbox/mapbox-gl-js#6548.
Port of mapbox/mapbox-gl-js#6550.
Prevents symbols that share the same layout properties from colliding against each other.
Bump GL JS pin to get regression test.
Rename "bucketName" -> "bucketLeaderID" to make it clearer what it represents.
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
| -rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index e52d18372d..e4aaf5ba30 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -47,6 +47,7 @@ public: bool sdfIcons, bool iconsNeedLinear, bool sortFeaturesByY, + const std::string bucketLeaderID, const std::vector<SymbolInstance>&&); void upload(gl::Context&) override; @@ -64,6 +65,8 @@ public: const bool iconsNeedLinear; const bool sortFeaturesByY; + const std::string bucketLeaderID; + optional<float> sortedAngle; bool staticUploaded = false; |