summaryrefslogtreecommitdiff
path: root/src/mbgl/text/collision_index.hpp
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-11-10 16:02:11 -0800
committerChris Loer <chris.loer@mapbox.com>2017-11-17 10:05:15 -0800
commit4f0e5374c37d1138e958857022f542cd0dc47e59 (patch)
treef51b04a8067568c4184ed35f28518f957d7098d6 /src/mbgl/text/collision_index.hpp
parent22c07596a0c1e2cca12df730be4448bbe79be13d (diff)
downloadqtlocation-mapboxgl-4f0e5374c37d1138e958857022f542cd0dc47e59.tar.gz
[core] Skip fade animation for placed symbols that are currently offscreen.
Don't mark items that are outside the collision grid range as placed. Requires new ignore because GL JS issue #5654 allows insertion of symbols outside the CollisionIndex range, and those symbols can cascade in to affect items within the viewport.
Diffstat (limited to 'src/mbgl/text/collision_index.hpp')
-rw-r--r--src/mbgl/text/collision_index.hpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/mbgl/text/collision_index.hpp b/src/mbgl/text/collision_index.hpp
index 6f78d8aeda..8653c1d76c 100644
--- a/src/mbgl/text/collision_index.hpp
+++ b/src/mbgl/text/collision_index.hpp
@@ -17,7 +17,7 @@ public:
explicit CollisionIndex(const TransformState&);
- bool placeFeature(CollisionFeature& feature,
+ std::pair<bool,bool> placeFeature(CollisionFeature& feature,
const mat4& posMatrix,
const mat4& labelPlaneMatrix,
const float textPixelRatio,
@@ -34,7 +34,10 @@ public:
private:
- bool placeLineFeature(CollisionFeature& feature,
+ bool isOffscreen(const CollisionBox&) const;
+ bool isInsideGrid(const CollisionBox&) const;
+
+ std::pair<bool,bool> placeLineFeature(CollisionFeature& feature,
const mat4& posMatrix,
const mat4& labelPlaneMatrix,
const float textPixelRatio,
@@ -51,11 +54,17 @@ private:
std::pair<Point<float>,float> projectAndGetPerspectiveRatio(const mat4& posMatrix, const Point<float>& point) const;
Point<float> projectPoint(const mat4& posMatrix, const Point<float>& point) const;
- TransformState transformState;
- float pitchFactor;
+ const TransformState transformState;
CollisionGrid collisionGrid;
CollisionGrid ignoredGrid;
+
+ const float screenRightBoundary;
+ const float screenBottomBoundary;
+ const float gridRightBoundary;
+ const float gridBottomBoundary;
+
+ const float pitchFactor;
};
} // namespace mbgl