diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-16 17:45:00 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-05 11:30:53 -0700 |
commit | 9330d674a983652d248d6a43fa4adbf5970c3d30 (patch) | |
tree | bd9292fcdb14f416922197f36c7707bb52e13591 /src/mbgl/text/collision_feature.hpp | |
parent | f89cfacab2457602c5bd81ab9da35cede23584e2 (diff) | |
download | qtlocation-mapboxgl-9330d674a983652d248d6a43fa4adbf5970c3d30.tar.gz |
[core] Use geometry.hpp's point
Diffstat (limited to 'src/mbgl/text/collision_feature.hpp')
-rw-r--r-- | src/mbgl/text/collision_feature.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp index 0cd0b5554c..0fe248a3de 100644 --- a/src/mbgl/text/collision_feature.hpp +++ b/src/mbgl/text/collision_feature.hpp @@ -1,7 +1,6 @@ #ifndef MBGL_TEXT_COLLISION_FEATURE #define MBGL_TEXT_COLLISION_FEATURE -#include <mbgl/util/vec.hpp> #include <mbgl/geometry/anchor.hpp> #include <mbgl/text/shaping.hpp> #include <mbgl/tile/geometry_tile.hpp> @@ -12,12 +11,12 @@ namespace mbgl { class CollisionBox { public: - explicit CollisionBox(const vec2<float> &_anchor, float _x1, float _y1, float _x2, float _y2, float _maxScale, + explicit CollisionBox(const Point<float> &_anchor, float _x1, float _y1, float _x2, float _y2, float _maxScale, const IndexedSubfeature& indexedFeature_ = { 0, "", "", 0 }) : anchor(_anchor), x1(_x1), y1(_y1), x2(_x2), y2(_y2), maxScale(_maxScale), indexedFeature(indexedFeature_) {} // the box is centered around the anchor point - vec2<float> anchor; + Point<float> anchor; // distances to the edges from the anchor float x1; |