summaryrefslogtreecommitdiff
path: root/src/mbgl/text/collision_tile.hpp
diff options
context:
space:
mode:
authorAnsis Brammanis <brammanis@gmail.com>2015-08-14 19:00:21 +0300
committerAnsis Brammanis <brammanis@gmail.com>2015-08-24 18:41:50 -0400
commitbc92c2de3988a39d6def34617ade4afb5b82e214 (patch)
tree1fc1f986d5ef738a47f45a82d98a267c07d3f48f /src/mbgl/text/collision_tile.hpp
parent494489f9a06b538b900c2da5286ead4ab95805f1 (diff)
downloadqtlocation-mapboxgl-bc92c2de3988a39d6def34617ade4afb5b82e214.tar.gz
fix symbol collision detection in perspective view
Diffstat (limited to 'src/mbgl/text/collision_tile.hpp')
-rw-r--r--src/mbgl/text/collision_tile.hpp6
1 files changed, 3 insertions, 3 deletions
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<float, 4> rotationMatrix;
- float yStretch;
bool debug;
};