mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix isometric lines when snap angle + from center modifiers are used

Browse Source
This commit is contained in:
David Capello 2020-08-03 20:09:56 -03:00
parent b95f96f645
commit 49c4534a95
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/tools/controllers.h
View File

@ -153,6 +153,8 @@ public:
stroke[0] = m_first;
stroke[1] = pt;
bool isoAngle = false;
if ((int(loop->getModifiers()) & int(ToolLoopModifiers::kSquareAspect))) {
int dx = stroke[1].x - m_first.x;
int dy = stroke[1].y - m_first.y;
@ -173,6 +175,7 @@ public:
else if (angle < 36.0) {
stroke[1].x = m_first.x + SGN(dx)*maxsize;
stroke[1].y = m_first.y + SGN(dy)*maxsize/2;
isoAngle = true;
}
// Snap at 45
else if (angle < 54.0) {
@ -183,6 +186,7 @@ public:
else if (angle < 72.0) {
stroke[1].x = m_first.x + SGN(dx)*maxsize/2;
stroke[1].y = m_first.y + SGN(dy)*maxsize;
isoAngle = true;
}
// Snap vertically
else {
@ -207,8 +211,8 @@ public:
else if ((int(loop->getModifiers()) & int(ToolLoopModifiers::kFromCenter))) {
int rx = stroke[1].x - m_first.x;
int ry = stroke[1].y - m_first.y;
stroke[0].x = m_first.x - rx;
stroke[0].y = m_first.y - ry;
stroke[0].x = m_first.x - rx + (isoAngle && ABS(rx) > ABS(ry) ? SGN(rx)*(rx & 1): 0);
stroke[0].y = m_first.y - ry + (isoAngle && ABS(rx) < ABS(ry) ? SGN(ry)*(ry & 1): 0);
stroke[1].x = m_first.x + rx;
stroke[1].y = m_first.y + ry;
}