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-31 10:25:57 -0700
commit321c0b8b44357518ad220e0a3282314ba03f7dd6 (patch)
tree4c310cf1aeaa41764211700c87f5c4ef2f5d83ac
parenta865929cdaf7aa4f58e3df01da577ac3d5e74ab1 (diff)
downloadqtlocation-mapboxgl-321c0b8b44357518ad220e0a3282314ba03f7dd6.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();
}