diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index 8d62afec4..df7477e79 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -2251,12 +2251,15 @@ void GameView::OnDraw() ui::Point GameView::lineSnapCoords(ui::Point point1, ui::Point point2) { - ui::Point newPoint(0, 0); - float snapAngle = floor(atan2((float)point2.Y-point1.Y, point2.X-point1.X)/(M_PI*0.25)+0.5)*M_PI*0.25; - float lineMag = sqrtf(pow((float)(point2.X-point1.X),2)+pow((float)(point2.Y-point1.Y),2)); - newPoint.X = (int)(lineMag*cos(snapAngle)+point1.X+0.5f); - newPoint.Y = (int)(lineMag*sin(snapAngle)+point1.Y+0.5f); - return newPoint; + ui::Point diff = point2 - point1; + if(abs(diff.X / 2) > abs(diff.Y)) // vertical + return point1 + ui::Point(diff.X, 0); + if(abs(diff.X) < abs(diff.Y / 2)) // horizontal + return point1 + ui::Point(0, diff.Y); + if(diff.X * diff.Y > 0) // NW-SE + return point1 + ui::Point((diff.X + diff.Y)/2, (diff.X + diff.Y)/2); + // SW-NE + return point1 + ui::Point((diff.X - diff.Y)/2, (diff.Y - diff.X)/2); } ui::Point GameView::rectSnapCoords(ui::Point point1, ui::Point point2)