UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set limit to mixing from track entries.

Browse Source
This commit is contained in:
NathanSweet 2017-05-16 14:31:45 +02:00
parent 02660ddd0a
commit d7c4195bc7
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -95,7 +95,7 @@ public class AnimationState {
current.delay = 0; current.delay = 0;
} }
TrackEntry from = current.mixingFrom, next = current.next; TrackEntry next = current.next;
if (next != null) { if (next != null) {
// When the next entry's delay is passed, change to the next entry, preserving leftover time. // When the next entry's delay is passed, change to the next entry, preserving leftover time.
float nextTime = current.trackLast - next.delay; float nextTime = current.trackLast - next.delay;
@ -110,20 +110,21 @@ public class AnimationState {
} }
continue; continue;
} }
} else if (current.trackLast >= current.trackEnd && from == null) { } else if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
// Clear the track when there is no next entry, the track end time is reached, and there is no mixingFrom. // Clear the track when there is no next entry, the track end time is reached, and there is no mixingFrom.
tracks.set(i, null); tracks.set(i, null);
queue.end(current); queue.end(current);
disposeNext(current); disposeNext(current);
continue; continue;
} }
if (from != null && updateMixingFrom(current, delta)) { if (current.mixingFrom != null && updateMixingFrom(current, delta, 2)) {
// End mixing from entries once all have completed. // End mixing from entries once all have completed.
do { TrackEntry from = current.mixingFrom;
current.mixingFrom = null;
while (from != null) {
queue.end(from); queue.end(from);
from = from.mixingFrom; from = from.mixingFrom;
} while (from != null); }
current.mixingFrom = null;
} }
current.trackTime += currentDelta; current.trackTime += currentDelta;
@ -133,12 +134,18 @@ public class AnimationState {
} }
/** Returns true when all mixing from entries are complete. */ /** Returns true when all mixing from entries are complete. */
private boolean updateMixingFrom (TrackEntry entry, float delta) { private boolean updateMixingFrom (TrackEntry entry, float delta, int animationCount) {
TrackEntry from = entry.mixingFrom; TrackEntry from = entry.mixingFrom;
if (from == null) return true; if (from == null) return true;
boolean finished = updateMixingFrom(from, delta); boolean finished = updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime >= entry.mixDuration && entry.mixTime > 0) return finished; if (entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
if (animationCount > 6 && from.mixingFrom == null) { // Limit the mixing from linked list.
entry.mixingFrom = null;
queue.end(from);
}
return finished;
}
from.animationLast = from.nextAnimationLast; from.animationLast = from.nextAnimationLast;
from.trackLast = from.nextTrackLast; from.trackLast = from.nextTrackLast;