From faf22ce3cca5c29d941db545bd277470d5430af8 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 5 Nov 2019 21:51:48 +0100 Subject: [PATCH] Removed clamping. It wasn't used in all code paths anyway. --- .../src/com/esotericsoftware/spine/Animation.java | 10 ++++------ 1 file changed, 4 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 21a68a811..bb9f62e93 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -34,7 +34,6 @@ import static com.esotericsoftware.spine.Animation.MixDirection.*; import static com.esotericsoftware.spine.utils.SpineUtils.*; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.FloatArray; import com.badlogic.gdx.utils.ObjectSet; @@ -370,8 +369,8 @@ public class Animation { int i = (int)curves[frameIndex]; if (i < BEZIER) { if (i == STEPPED) return 0; - float time1 = frames[timeIndex]; - return MathUtils.clamp((time - time1) / (frames[timeIndex + entryCount] - time1), 0, 1); + float x = frames[timeIndex]; + return (time - x) / (frames[timeIndex + entryCount] - x); } i -= BEZIER; if (curves[i] > time) { @@ -473,9 +472,8 @@ public class Animation { if (i < BEZIER) { int frame = frameIndex << 1; if (i == STEPPED) return frames[frame + VALUE]; - float time1 = frames[frame], value1 = frames[frame + VALUE]; - return value1 + (frames[frame + NEXT_VALUE] - value1) - * MathUtils.clamp((time - time1) / (frames[frame + ENTRIES] - time1), 0, 1); + float x = frames[frame], y = frames[frame + VALUE]; + return y + (frames[frame + NEXT_VALUE] - y) * (time - x) / (frames[frame + ENTRIES] - x); } i -= BEZIER; if (curves[i] > time) {