diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-16 12:05:11 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-22 14:30:26 +0200 |
| commit | 769a822fec2090fc37e00344dc63d5a1c2e32ac2 (patch) | |
| tree | 83fbd610bd9498b4032077c03592fbcd3d2f930a /src/mbgl/renderer/render_orchestrator.cpp | |
| parent | d24c1d625af61328b8ada2d005ab3f9e659a2c69 (diff) | |
| download | qtlocation-mapboxgl-769a822fec2090fc37e00344dc63d5a1c2e32ac2.tar.gz | |
[core] Pass UpdateParameters to Placement constructor
Diffstat (limited to 'src/mbgl/renderer/render_orchestrator.cpp')
| -rw-r--r-- | src/mbgl/renderer/render_orchestrator.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index 239ad19876..c77eaca37e 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -394,12 +394,7 @@ std::unique_ptr<RenderTree> RenderOrchestrator::createRenderTree( std::set<std::string> usedSymbolLayers; if (renderTreeParameters->placementChanged) { - Mutable<Placement> placement = makeMutable<Placement>(updateParameters->transformState, - updateParameters->mode, - updateParameters->transitionOptions, - updateParameters->crossSourceCollisions, - updateParameters->timePoint, - placementController.getPlacement()); + Mutable<Placement> placement = makeMutable<Placement>(updateParameters, placementController.getPlacement()); for (auto it = layersNeedPlacement.crbegin(); it != layersNeedPlacement.crend(); ++it) { const RenderLayer& layer = *it; @@ -425,11 +420,7 @@ std::unique_ptr<RenderTree> RenderOrchestrator::createRenderTree( crossTileSymbolIndex.reset(); renderTreeParameters->placementChanged = symbolBucketsChanged = !layersNeedPlacement.empty(); if (renderTreeParameters->placementChanged) { - Mutable<Placement> placement = makeMutable<Placement>(updateParameters->transformState, - updateParameters->mode, - updateParameters->transitionOptions, - updateParameters->crossSourceCollisions, - updateParameters->timePoint); + Mutable<Placement> placement = makeMutable<Placement>(updateParameters); for (auto it = layersNeedPlacement.crbegin(); it != layersNeedPlacement.crend(); ++it) { const RenderLayer& layer = *it; crossTileSymbolIndex.addLayer(layer, updateParameters->transformState.getLatLng().longitude()); |