[core] Improved label pitch-scaling: approximate collision box shapes based on tile distance from camera.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp
index a8e6c128ba..57e7f6d375 100644
--- a/src/mbgl/renderer/tile_pyramid.cpp
+++ b/src/mbgl/renderer/tile_pyramid.cpp
@@ -175,11 +175,16 @@ void TilePyramid::update(const std::vector<Immutable<style::Layer::Impl>>& layer
 
     removeStaleTiles(retain);
 
-    const PlacementConfig config { parameters.transformState.getAngle(),
-                                   parameters.transformState.getPitch(),
-                                   parameters.debugOptions & MapDebugOptions::Collision };
-
     for (auto& pair : tiles) {
+        // TODO: Calculating yStretch based on tile distance means we can no longer use the same collision tile for two wrapped
+        // copies of the same data tile. For now the assumption that we're always at "wrap = 0" means collision detection is broken
+        // for wrapped tiles.
+        const PlacementConfig config { parameters.transformState.getAngle(),
+                                       parameters.transformState.getPitch(),
+                                       parameters.transformState.getCameraToCenterDistance(),
+                                       parameters.transformState.getCameraToTileDistance(pair.first.unwrapTo(0)),
+                                       parameters.debugOptions & MapDebugOptions::Collision };
+        
         pair.second->setPlacementConfig(config);
     }
 }