From bc92c2de3988a39d6def34617ade4afb5b82e214 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Fri, 14 Aug 2015 19:00:21 +0300 Subject: fix symbol collision detection in perspective view --- src/mbgl/text/collision_tile.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mbgl/text/collision_tile.hpp') diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp index aed9b59f32..632652256b 100644 --- a/src/mbgl/text/collision_tile.hpp +++ b/src/mbgl/text/collision_tile.hpp @@ -35,8 +35,8 @@ namespace mbgl { class CollisionTile { public: - inline explicit CollisionTile(float _zoom, float tileExtent, float tileSize, float angle_, bool debug_) : - zoom(_zoom), tilePixelRatio(tileExtent / tileSize), debug(debug_) { reset(angle_, 0); } + inline explicit CollisionTile(float _zoom, float tileExtent, float tileSize, float angle_, float pitch_, bool debug_) : + zoom(_zoom), tilePixelRatio(tileExtent / tileSize), debug(debug_) { reset(angle_, pitch_); } void reset(const float angle, const float pitch); float placeFeature(const CollisionFeature &feature); @@ -51,6 +51,7 @@ class CollisionTile { const float minScale = 0.5f; const float maxScale = 2.0f; + float yStretch; private: @@ -58,7 +59,6 @@ class CollisionTile { Tree tree; std::array rotationMatrix; - float yStretch; bool debug; }; -- cgit v1.2.1