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 /include/mbgl/map | |
| 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 'include/mbgl/map')
| -rw-r--r-- | include/mbgl/map/map.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 3aee932070..ca6c62d280 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -37,7 +37,8 @@ public: Scheduler&, MapMode mapMode = MapMode::Continuous, ConstrainMode constrainMode = ConstrainMode::HeightOnly, - ViewportMode viewportMode = ViewportMode::Default); + ViewportMode viewportMode = ViewportMode::Default, + bool crossSourceCollisions = true); ~Map(); // Register a callback that will get called (on the render thread) when all resources have |