From 296d019bace3d9d8e3366a911ac02acd048d3adf Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Fri, 19 Aug 2016 08:47:43 +0200 Subject: [PATCH] Formatting. --- .../src/com/esotericsoftware/spine/Animation.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java index 530aceb69..9b9b22e32 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -391,15 +391,15 @@ public class Animation { x = prevX + (frames[frame + X] - prevX) * percent; y = prevY + (frames[frame + Y] - prevY) * percent; } + x *= bone.data.scaleX; + y *= bone.data.scaleY; if (alpha == 1) { - bone.scaleX = x * bone.data.scaleX; - bone.scaleY = y * bone.data.scaleY; + bone.scaleX = x; + bone.scaleY = y; } else { - x *= bone.data.scaleX; - y *= bone.data.scaleY; float bx = Math.abs(bone.scaleX) * Math.signum(x), by = Math.abs(bone.scaleY) * Math.signum(y); - bone.scaleX = (bx + (x - bx) * alpha); - bone.scaleY = (by + (y - by) * alpha); + bone.scaleX = bx + (x - bx) * alpha; + bone.scaleY = by + (y - by) * alpha; } } }