matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix snapping

Browse Source 
why was trigonometry used in such a simple function
This commit is contained in:
mniip 2013-12-13 00:55:20 +04:00
parent 406e71e1ae
commit 0fb08c5e97
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/game/GameView.cpp
View File

@ -2251,12 +2251,15 @@ void GameView::OnDraw()
ui::Point GameView::lineSnapCoords(ui::Point point1, ui::Point point2) ui::Point GameView::lineSnapCoords(ui::Point point1, ui::Point point2)
{ {
ui::Point newPoint(0, 0); ui::Point diff = point2 - point1;
float snapAngle = floor(atan2((float)point2.Y-point1.Y, point2.X-point1.X)/(M_PI*0.25)+0.5)*M_PI*0.25; if(abs(diff.X / 2) > abs(diff.Y)) // vertical
float lineMag = sqrtf(pow((float)(point2.X-point1.X),2)+pow((float)(point2.Y-point1.Y),2)); return point1 + ui::Point(diff.X, 0);
newPoint.X = (int)(lineMag*cos(snapAngle)+point1.X+0.5f); if(abs(diff.X) < abs(diff.Y / 2)) // horizontal
newPoint.Y = (int)(lineMag*sin(snapAngle)+point1.Y+0.5f); return point1 + ui::Point(0, diff.Y);
return newPoint; 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) ui::Point GameView::rectSnapCoords(ui::Point point1, ui::Point point2)