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

No need to check mix == 1.

Browse Source
This commit is contained in:
NathanSweet 2014-12-11 03:15:39 +01:00
parent 71b41a60a4
commit e9a9b15f34
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,12 +94,9 @@ public class AnimationState {
if (!loop && time > endTime) time = endTime;
TrackEntry previous = current.previous;
if (previous == null) {
if (current.mix == 1)
current.animation.apply(skeleton, lastTime, time, loop, events);
else
current.animation.mix(skeleton, lastTime, time, loop, events, current.mix);
} else {
if (previous == null)
current.animation.mix(skeleton, lastTime, time, loop, events, current.mix);
else {
float previousTime = previous.time;
if (!previous.loop && previousTime > previous.endTime) previousTime = previous.endTime;
previous.animation.apply(skeleton, previousTime, previousTime, previous.loop, null);