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

oooo wait, rectangle snap too

Browse Source
This commit is contained in:
mniip 2013-12-13 01:19:46 +04:00 committed by jacob1
parent adb46f9590
commit 12d98dada1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2264,10 +2264,9 @@ ui::Point GameView::lineSnapCoords(ui::Point point1, ui::Point point2)
ui::Point GameView::rectSnapCoords(ui::Point point1, ui::Point point2) ui::Point GameView::rectSnapCoords(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)/(M_PI*0.5)+0.5)*M_PI*0.5 - M_PI*0.25; if(diff.X * diff.Y > 0) // NW-SE
float lineMag = sqrtf(pow((float)(point2.X-point1.X),2)+pow((float)(point2.Y-point1.Y),2)); return point1 + ui::Point((diff.X + diff.Y)/2, (diff.X + diff.Y)/2);
newPoint.X = (int)(lineMag*cos(snapAngle)+point1.X+0.5f); // SW-NE
newPoint.Y = (int)(lineMag*sin(snapAngle)+point1.Y+0.5f); return point1 + ui::Point((diff.X - diff.Y)/2, (diff.Y - diff.X)/2);
return newPoint;
} }