From 322d8ed0abb680e60189394fad7c70c36e3600c2 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 11 Nov 2014 17:42:19 +0100 Subject: [PATCH] Fixed first flip key not being applied. --- spine-c/src/spine/Animation.c | 2 +- spine-csharp/src/Animation.cs | 2 +- spine-libgdx/src/com/esotericsoftware/spine/Animation.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-c/src/spine/Animation.c b/spine-c/src/spine/Animation.c index af34f904c..6d7732863 100644 --- a/spine-c/src/spine/Animation.c +++ b/spine-c/src/spine/Animation.c @@ -805,7 +805,7 @@ void _spFlipTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, fl frameIndex = (time >= self->frames[self->framesCount - 2] ? self->framesCount : binarySearch(self->frames, self->framesCount, time, 2)) - 2; - if (self->frames[frameIndex] <= lastTime) return; + if (self->frames[frameIndex] < lastTime) return; if (self->x) skeleton->bones[self->boneIndex]->flipX = self->frames[frameIndex + 1]; diff --git a/spine-csharp/src/Animation.cs b/spine-csharp/src/Animation.cs index b3843cfd3..278b5d99d 100644 --- a/spine-csharp/src/Animation.cs +++ b/spine-csharp/src/Animation.cs @@ -698,7 +698,7 @@ namespace Spine { lastTime = -1; int frameIndex = (time >= frames[frames.Length - 2] ? frames.Length : Animation.binarySearch(frames, time, 2)) - 2; - if (frames[frameIndex] <= lastTime) return; + if (frames[frameIndex] < lastTime) return; SetFlip(skeleton.bones[boneIndex], frames[frameIndex + 1] != 0); } diff --git a/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/src/com/esotericsoftware/spine/Animation.java index 161102e89..0a0571dac 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -816,7 +816,7 @@ public class Animation { } else if (lastTime > time) // lastTime = -1; int frameIndex = (time >= frames[frames.length - 2] ? frames.length : binarySearch(frames, time, 2)) - 2; - if (frames[frameIndex] <= lastTime) return; + if (frames[frameIndex] < lastTime) return; setFlip(skeleton.bones.get(boneIndex), frames[frameIndex + 1] != 0); }