diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-09-06 14:58:37 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-09-12 14:10:46 -0700 |
| commit | d735d89835fb3076e09594fce2a141fe1495e33f (patch) | |
| tree | 36fb80484b3952fb730fd34a77439d303d002cdc /src/mbgl/geometry | |
| parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
| download | qtlocation-mapboxgl-d735d89835fb3076e09594fce2a141fe1495e33f.tar.gz | |
[core] Port "collision group" plumbing to gl-native.
[node] Hook up map-wide "crossSourceCollisions" option, defaulting to true.
[test] Pass "crossSourceCollisions" test option through test harness; enable cross-source-collisions tests on native.
Diffstat (limited to 'src/mbgl/geometry')
| -rw-r--r-- | src/mbgl/geometry/feature_index.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp index 739c1f282f..cd041a7fdb 100644 --- a/src/mbgl/geometry/feature_index.hpp +++ b/src/mbgl/geometry/feature_index.hpp @@ -28,15 +28,17 @@ public: , bucketLeaderID(std::move(bucketName_)) , sortIndex(sortIndex_) , bucketInstanceId(0) + , collisionGroupId(0) {} - IndexedSubfeature(const IndexedSubfeature& other, uint32_t bucketInstanceId_) + IndexedSubfeature(const IndexedSubfeature& other, uint32_t bucketInstanceId_, uint16_t collisionGroupId_) : index(other.index) , sourceLayerName(other.sourceLayerName) , bucketLeaderID(other.bucketLeaderID) , sortIndex(other.sortIndex) , bucketInstanceId(bucketInstanceId_) + , collisionGroupId(collisionGroupId_) {} size_t index; std::string sourceLayerName; @@ -45,6 +47,7 @@ public: // Only used for symbol features uint32_t bucketInstanceId; + uint16_t collisionGroupId; }; class FeatureIndex { |