From 2dc486b2d58bfb3e1dd69c62e0695bdedc5e32eb Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sun, 29 Sep 2013 23:42:55 +0200 Subject: [PATCH] Fixed first event not getting fired. Damn this is hard to get exactly right! --- 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 76bb3e308..4d4a81def 100644 --- a/spine-c/src/spine/Animation.c +++ b/spine-c/src/spine/Animation.c @@ -524,7 +524,7 @@ void _EventTimeline_apply (const Timeline* timeline, Skeleton* skeleton, float l lastTime = 0; } else if (lastTime >= self->frames[self->framesLength - 1]) return; /* Last time is after last frame. */ - if (lastTime < self->frames[0] || self->framesLength == 1) + if (lastTime <= self->frames[0] || self->framesLength == 1) frameIndex = 0; else { float frame; diff --git a/spine-csharp/src/Animation.cs b/spine-csharp/src/Animation.cs index 3328185bc..660bcd17d 100644 --- a/spine-csharp/src/Animation.cs +++ b/spine-csharp/src/Animation.cs @@ -479,7 +479,7 @@ namespace Spine { } else if (lastTime >= frames[frameCount - 1]) return; // Last time is after last frame. int frameIndex; - if (lastTime < frames[0] || frameCount == 1) + if (lastTime <= frames[0] || frameCount == 1) frameIndex = 0; else { frameIndex = Animation.binarySearch(frames, lastTime, 1); diff --git a/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/src/com/esotericsoftware/spine/Animation.java index ac6429615..907b670f2 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -553,7 +553,7 @@ public class Animation { } else if (lastTime >= frames[frameCount - 1]) return; // Last time is after last frame. int frameIndex; - if (lastTime < frames[0] || frameCount == 1) + if (lastTime <= frames[0] || frameCount == 1) frameIndex = 0; else { frameIndex = binarySearch(frames, lastTime, 1);