UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use lastTime for AttachmentTimeline.

Browse Source 
closes #221
This commit is contained in:
NathanSweet 2014-07-30 00:56:09 +02:00
parent 623e0a7c96
commit a35223328e
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,23 @@ public class Animation {
} }
} }
/** @param target After the first and before the last value.
* @return index of first value greater than the target. */
static int binarySearch (float[] values, float target) {
int low = 0;
int high = values.length - 2;
if (high == 0) return 1;
int current = high >>> 1;
while (true) {
if (values[(current + 1)] <= target)
low = current + 1;
else
high = current;
if (low == high) return (low + 1);
current = (low + high) >>> 1;
}
}
static int linearSearch (float[] values, float target, int step) { static int linearSearch (float[] values, float target, int step) {
for (int i = 0, last = values.length - step; i <= last; i += step) for (int i = 0, last = values.length - step; i <= last; i += step)
if (values[i] > target) return i; if (values[i] > target) return i;
@ -127,7 +144,8 @@ public class Animation {
} }
static public interface Timeline { static public interface Timeline {
/** Sets the value(s) for the specified time. */ /** Sets the value(s) for the specified time.
* @param events May be null. */
public void apply (Skeleton skeleton, float lastTime, float time, Array<Event> events, float alpha); public void apply (Skeleton skeleton, float lastTime, float time, Array<Event> events, float alpha);
} }
@ -486,13 +504,14 @@ public class Animation {
public void apply (Skeleton skeleton, float lastTime, float time, Array<Event> events, float alpha) { public void apply (Skeleton skeleton, float lastTime, float time, Array<Event> events, float alpha) {
float[] frames = this.frames; float[] frames = this.frames;
if (time < frames[0]) return; // Time is before first frame. if (time < frames[0]) {
if (lastTime > time) apply(skeleton, lastTime, Integer.MAX_VALUE, null, 0);
return;
} else if (lastTime > time) //
lastTime = -1;
int frameIndex; int frameIndex = time >= frames[frames.length - 1] ? frames.length - 1 : binarySearch(frames, time, 1) - 1;
if (time >= frames[frames.length - 1]) // Time is after last frame. if (frames[frameIndex] <= lastTime) return;
frameIndex = frames.length - 1;
else
frameIndex = binarySearch(frames, time, 1) - 1;
String attachmentName = attachmentNames[frameIndex]; String attachmentName = attachmentNames[frameIndex];
skeleton.slots.get(slotIndex).setAttachment( skeleton.slots.get(slotIndex).setAttachment(
@ -544,7 +563,7 @@ public class Animation {
if (lastTime < frames[0]) if (lastTime < frames[0])
frameIndex = 0; frameIndex = 0;
else { else {
frameIndex = binarySearch(frames, lastTime, 1); frameIndex = binarySearch(frames, lastTime);
float frame = frames[frameIndex]; float frame = frames[frameIndex];
while (frameIndex > 0) { // Fire multiple events with the same frame. while (frameIndex > 0) { // Fire multiple events with the same frame.
if (frames[frameIndex - 1] != frame) break; if (frames[frameIndex - 1] != frame) break;
@ -592,7 +611,7 @@ public class Animation {
if (time >= frames[frames.length - 1]) // Time is after last frame. if (time >= frames[frames.length - 1]) // Time is after last frame.
frameIndex = frames.length - 1; frameIndex = frames.length - 1;
else else
frameIndex = binarySearch(frames, time, 1) - 1; frameIndex = binarySearch(frames, time) - 1;
Array<Slot> drawOrder = skeleton.drawOrder; Array<Slot> drawOrder = skeleton.drawOrder;
Array<Slot> slots = skeleton.slots; Array<Slot> slots = skeleton.slots;
@ -676,7 +695,7 @@ public class Animation {
} }
// Interpolate between the previous frame and the current frame. // Interpolate between the previous frame and the current frame.
int frameIndex = binarySearch(frames, time, 1); int frameIndex = binarySearch(frames, time);
float frameTime = frames[frameIndex]; float frameTime = frames[frameIndex];
float percent = MathUtils.clamp(1 - (time - frameTime) / (frames[frameIndex - 1] - frameTime), 0, 1); float percent = MathUtils.clamp(1 - (time - frameTime) / (frames[frameIndex - 1] - frameTime), 0, 1);
percent = getCurvePercent(frameIndex - 1, percent); percent = getCurvePercent(frameIndex - 1, percent);