[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.
This commit is contained in:
@@ -61,7 +61,7 @@ Renderer::Impl::Impl(RendererBackend& backend_,
|
||||
, sourceImpls(makeMutable<std::vector<Immutable<style::Source::Impl>>>())
|
||||
, layerImpls(makeMutable<std::vector<Immutable<style::Layer::Impl>>>())
|
||||
, renderLight(makeMutable<Light::Impl>())
|
||||
, placement(std::make_unique<Placement>(TransformState{}, MapMode::Static)) {
|
||||
, placement(std::make_unique<Placement>(TransformState{}, MapMode::Static, true)) {
|
||||
glyphManager->setObserver(this);
|
||||
}
|
||||
|
||||
@@ -398,7 +398,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
|
||||
if (!placement->stillRecent(parameters.timePoint)) {
|
||||
placementChanged = true;
|
||||
|
||||
auto newPlacement = std::make_unique<Placement>(parameters.state, parameters.mapMode);
|
||||
auto newPlacement = std::make_unique<Placement>(parameters.state, parameters.mapMode, updateParameters.crossSourceCollisions);
|
||||
std::set<std::string> usedSymbolLayers;
|
||||
for (auto it = order.rbegin(); it != order.rend(); ++it) {
|
||||
if (it->layer.is<RenderSymbolLayer>()) {
|
||||
|
||||
Reference in New Issue
Block a user