diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-01 17:28:25 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-01 19:36:02 +0300 |
commit | 4720b56b17b1341c400ac0331484581d7c5da77c (patch) | |
tree | ab615f59c272fa0ecbce83a6a5b3dae76254b132 | |
parent | c8ec1db1a0076a6d0e9d36e25600ffbebac3c383 (diff) | |
download | qtlocation-mapboxgl-4720b56b17b1341c400ac0331484581d7c5da77c.tar.gz |
[core] Remove unused CollisionBox::offset
-rw-r--r-- | src/mbgl/text/collision_feature.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/text/collision_feature.hpp | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/mbgl/text/collision_feature.cpp b/src/mbgl/text/collision_feature.cpp index c708f834da..fbf259d1db 100644 --- a/src/mbgl/text/collision_feature.cpp +++ b/src/mbgl/text/collision_feature.cpp @@ -54,9 +54,9 @@ CollisionFeature::CollisionFeature(const GeometryCoordinates& line, const float yMin = std::min({tl.y, tr.y, bl.y, br.y}); const float yMax = std::max({tl.y, tr.y, bl.y, br.y}); - boxes.emplace_back(anchor.point, Point<float>{ 0, 0 }, xMin, yMin, xMax, yMax); + boxes.emplace_back(anchor.point, xMin, yMin, xMax, yMax); } else { - boxes.emplace_back(anchor.point, Point<float>{ 0, 0 }, x1, y1, x2, y2); + boxes.emplace_back(anchor.point, x1, y1, x2, y2); } } } @@ -155,7 +155,7 @@ void CollisionFeature::bboxifyLabel(const GeometryCoordinates& line, GeometryCoo 0 : (boxDistanceToAnchor - firstBoxOffset) * 0.8; - boxes.emplace_back(boxAnchor, boxAnchor - convertPoint<float>(anchorPoint), -boxSize / 2, -boxSize / 2, boxSize / 2, boxSize / 2, paddedAnchorDistance, boxSize / 2); + boxes.emplace_back(boxAnchor, -boxSize / 2, -boxSize / 2, boxSize / 2, boxSize / 2, paddedAnchorDistance, boxSize / 2); } } diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp index 5fbd8a5e4b..f8197435df 100644 --- a/src/mbgl/text/collision_feature.hpp +++ b/src/mbgl/text/collision_feature.hpp @@ -11,14 +11,11 @@ namespace mbgl { class CollisionBox { public: - CollisionBox(Point<float> _anchor, Point<float> _offset, float _x1, float _y1, float _x2, float _y2, float _signedDistanceFromAnchor = 0, float _radius = 0) : - anchor(std::move(_anchor)), offset(_offset), x1(_x1), y1(_y1), x2(_x2), y2(_y2), used(true), signedDistanceFromAnchor(_signedDistanceFromAnchor), radius(_radius) {} + CollisionBox(Point<float> _anchor, float _x1, float _y1, float _x2, float _y2, float _signedDistanceFromAnchor = 0, float _radius = 0) : + anchor(std::move(_anchor)), x1(_x1), y1(_y1), x2(_x2), y2(_y2), used(true), signedDistanceFromAnchor(_signedDistanceFromAnchor), radius(_radius) {} // the box is centered around the anchor point Point<float> anchor; - - // the offset of the box from the label's anchor point - Point<float> offset; // distances to the edges from the anchor float x1; |