UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed event timeline with 1 event.

Browse Source
This commit is contained in:
NathanSweet 2013-08-13 15:32:09 +02:00
parent 1180cee47c
commit e1c5d9b0c6
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -226,7 +226,7 @@ public class Animation {
static private final int LAST_FRAME_TIME = -2;
static private final int FRAME_VALUE = 1;
private int boneIndex;
int boneIndex;
private final float[] frames; // time, angle, ...
public RotateTimeline (int frameCount) {
@ -386,7 +386,7 @@ public class Animation {
static private final int FRAME_B = 3;
static private final int FRAME_A = 4;
private int slotIndex;
int slotIndex;
private final float[] frames; // time, r, g, b, a, ...
public ColorTimeline (int frameCount) {
@ -454,7 +454,7 @@ public class Animation {
}
static public class AttachmentTimeline implements Timeline {
private int slotIndex;
int slotIndex;
private final float[] frames; // time, ...
private final String[] attachmentNames;
@ -535,10 +535,15 @@ public class Animation {
int frameCount = frames.length;
if (lastTime >= frames[frameCount - 1]) return; // Last time is after last frame.
int frameIndex = binarySearch(frames, lastTime, 1);
float frame = frames[frameIndex];
while (frameIndex > 0 && frame == frames[frameIndex - 1])
frameIndex--; // Fire multiple events with the same frame.
int frameIndex;
if (frameCount == 1)
frameIndex = 0;
else {
frameIndex = binarySearch(frames, lastTime, 1);
float frame = frames[frameIndex];
while (frameIndex > 0 && frame == frames[frameIndex - 1])
frameIndex--; // Fire multiple events with the same frame.
}
for (; frameIndex < frameCount && time > frames[frameIndex]; frameIndex++)
firedEvents.add(events[frameIndex]);
}