summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-10-26 15:52:57 -0700
committerChris Loer <chris.loer@gmail.com>2017-10-26 15:53:18 -0700
commitd1ecd4cacd8e056782cc495b3cb891b72d14bf34 (patch)
tree5cc75f8a40d8144094f58c7775f64fa79bb5afd5
parentb3d3efe56bb5ff4b1860621df5ec5b92bdfeac3b (diff)
downloadqtlocation-mapboxgl-d1ecd4cacd8e056782cc495b3cb891b72d14bf34.tar.gz
Make CollisionIndex's GridIndex large enough to include the padding around the viewport.
Move cell size to 25px to be in sync with gl js [skip ci]
-rw-r--r--src/mbgl/text/collision_index.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp
index d16864d1c7..26d956ac22 100644
--- a/src/mbgl/text/collision_index.cpp
+++ b/src/mbgl/text/collision_index.cpp
@@ -27,8 +27,8 @@ static const float viewportPadding = 100;
CollisionIndex::CollisionIndex(const TransformState& transformState_)
: transformState(transformState_)
- , collisionGrid(transformState.getSize().width, transformState.getSize().height, 30)
- , ignoredGrid(transformState.getSize().width, transformState.getSize().height, 30) {
+ , collisionGrid(transformState.getSize().width + 2 * viewportPadding, transformState.getSize().height + 2 * viewportPadding, 25)
+ , ignoredGrid(transformState.getSize().width + 2 * viewportPadding, transformState.getSize().height + 2 * viewportPadding, 25) {
pitchFactor = std::cos(transformState.getPitch()) * transformState.getCameraToCenterDistance();
}