diff options
Diffstat (limited to 'src/mbgl/text/collision_index.cpp')
| -rw-r--r-- | src/mbgl/text/collision_index.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp index e3d832a854..74923312d5 100644 --- a/src/mbgl/text/collision_index.cpp +++ b/src/mbgl/text/collision_index.cpp @@ -348,12 +348,11 @@ std::pair<float,float> CollisionIndex::projectAnchor(const mat4& posMatrix, cons std::pair<Point<float>,float> CollisionIndex::projectAndGetPerspectiveRatio(const mat4& posMatrix, const Point<float>& point) const { vec4 p = {{ point.x, point.y, 0, 1 }}; matrix::transformMat4(p, p, posMatrix); - auto offset = transformState.getCenterOffset(); auto size = transformState.getSize(); return std::make_pair( Point<float>( - (((p[0] / p[3] + 1) / 2) * size.width) + viewportPadding + offset.x, - (((-p[1] / p[3] + 1) / 2) * size.height) + viewportPadding + offset.y + (((p[0] / p[3] + 1) / 2) * size.width) + viewportPadding, + (((-p[1] / p[3] + 1) / 2) * size.height) + viewportPadding ), // See perspective ratio comment in symbol_sdf.vertex // We're doing collision detection in viewport space so we need @@ -365,11 +364,10 @@ std::pair<Point<float>,float> CollisionIndex::projectAndGetPerspectiveRatio(cons Point<float> CollisionIndex::projectPoint(const mat4& posMatrix, const Point<float>& point) const { vec4 p = {{ point.x, point.y, 0, 1 }}; matrix::transformMat4(p, p, posMatrix); - auto offset = transformState.getCenterOffset(); auto size = transformState.getSize(); return Point<float> { - static_cast<float>((((p[0] / p[3] + 1) / 2) * size.width) + viewportPadding + offset.x), - static_cast<float>((((-p[1] / p[3] + 1) / 2) * size.height) + viewportPadding + offset.y) }; + static_cast<float>((((p[0] / p[3] + 1) / 2) * size.width) + viewportPadding), + static_cast<float>((((-p[1] / p[3] + 1) / 2) * size.height) + viewportPadding) }; } } // namespace mbgl |