mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-28 16:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix skew with pivot on right side of selection (#4823)

Browse Source
This commit is contained in:
Liebranca 2024-11-25 23:28:57 -03:00 committed by David Capello
parent 3aa403d597
commit e66df8da12
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/ui/editor/pixels_movement.cpp
View File

@ -617,6 +617,9 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
gfx::PointF pivot((pivotPoint.x - bounds.x) / ABS(bounds.w),
(pivotPoint.y - bounds.y) / ABS(bounds.h));
// Smallest value possible, used for limit calculations
const double eps = 0.00001;
// Vector from AB (or CD), and AC (or BD)
vec2 u = to_vec2(B - A);
vec2 v = to_vec2(C - A);
@ -651,7 +654,7 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
C.y += delta.y;
vec2 toPivot = to_vec2(pivotPoint - (A * (1.0 - pivot.y) + C * pivot.y));
vec2 toOtherSide = toPivot / (std::fabs(pivot.x) > 0.00001 ? pivot.x : 1.0);
vec2 toOtherSide = toPivot / (std::fabs(pivot.x) > eps ? pivot.x : 1.0);
B = A + to_point(toOtherSide);
D = C + to_point(toOtherSide);
break;
@ -664,7 +667,7 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
D.y += delta.y;
vec2 toPivot = to_vec2(pivotPoint - (B * (1.0 - pivot.y) + D * pivot.y));
vec2 toOtherSide = toPivot / (std::fabs(1.0 - pivot.x) > 0.00001 ? (1.0 - pivot.x) : 1.0);
vec2 toOtherSide = toPivot / (std::fabs(1.0 - pivot.x) > eps ? (1.0 - pivot.x) : 1.0);
A = B + to_point(toOtherSide);
C = D + to_point(toOtherSide);
break;
@ -693,12 +696,16 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
case SkewWHandle:
case SkewEHandle: {
vec2 AB = to_vec2(B - A);
bounds.w = AB.magnitude();
// Clamping bounds width to prevent a segfault with some extreme transforms
bounds.w = std::min(AB.magnitude(), m_initialData.bounds().w * 10);
bounds.x = pivotPoint.x - bounds.w * pivot.x;
// New rotation angle is the angle between AB points
newTransformation.angle(-AB.angle());
// Limit for pivot.x to prevent the 'stretch to infinity' bug
const double limit = (std::fabs(pivot.x) >= 1.0 ? (1.0 - eps) * SGN(pivot.x) : pivot.x);
// New skew angle is the angle between AC0 (vector from A to
// B rotated 45 degrees, like an AC vector without skew) and
// the current to AC vector.
@ -713,7 +720,7 @@ void PixelsMovement::moveImage(const gfx::PointF& pos, MoveModifier moveModifier
// | / <- AC0=AB rotated 45 degrees, if pivot is here
// | /
// C
auto ABp = A * (1.0 - pivot.x) + B * pivot.x;
auto ABp = A * (1.0 - limit) + B * limit;
AC0 = vec2(ABp.y - B.y, B.x - ABp.x);
AC = to_vec2(C - A);