diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-01 19:16:01 +0300 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-05 16:13:26 +0300 |
| commit | 65d2f7ed6afe17c6fbc8155cb116aae7de16db9a (patch) | |
| tree | f286adaa51f589f1305b4059f213046cda6e2064 /src/mbgl/text/collision_index.hpp | |
| parent | 55581b6e61aa0f3bdbcbe4e2a1b8d67a52031aa1 (diff) | |
| download | qtlocation-mapboxgl-65d2f7ed6afe17c6fbc8155cb116aae7de16db9a.tar.gz | |
[core] Introduce ProjectedCollisionBox type
ProjectedCollisionBox encapsulates geometry of the projected
collision box, it is using union and thus provides memory save
- 12 bytes per collision box instance.
Diffstat (limited to 'src/mbgl/text/collision_index.hpp')
| -rw-r--r-- | src/mbgl/text/collision_index.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/text/collision_index.hpp b/src/mbgl/text/collision_index.hpp index ea65a426fd..a1b277d06d 100644 --- a/src/mbgl/text/collision_index.hpp +++ b/src/mbgl/text/collision_index.hpp @@ -45,9 +45,9 @@ public: const TransformState& getTransformState() const { return transformState; } private: - bool isOffscreen(const CollisionBox&) const; - bool isInsideGrid(const CollisionBox&) const; - bool isInsideTile(const CollisionBox&, const CollisionTileBoundaries& tileBoundaries) const; + bool isOffscreen(float x1, float y1, float x2, float y2) const; + bool isInsideGrid(float x1, float y1, float x2, float y2) const; + bool isInsideTile(float x1, float y1, float x2, float y2, const CollisionTileBoundaries& tileBoundaries) const; std::pair<bool,bool> placeLineFeature(CollisionFeature& feature, const mat4& posMatrix, |