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

[ts] Ported AnimationState change

Browse Source
This commit is contained in:
badlogic 2017-04-10 15:43:38 +02:00
parent dab4c27da7
commit d34f7c7b11
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spine-ts/core/src/AnimationState.ts
View File

@ -82,14 +82,11 @@ module spine {
} }
continue; continue;
} }
} else { } 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. tracks[i] = null;
if (current.trackLast >= current.trackEnd && current.mixingFrom == null) { this.queue.end(current);
tracks[i] = null; this.disposeNext(current);
this.queue.end(current); continue;
this.disposeNext(current);
continue;
}
} }
this.updateMixingFrom(current, delta); this.updateMixingFrom(current, delta);
@ -132,7 +129,7 @@ module spine {
let mix = current.alpha; let mix = current.alpha;
if (current.mixingFrom != null) if (current.mixingFrom != null)
mix *= this.applyMixingFrom(current, skeleton); mix *= this.applyMixingFrom(current, skeleton);
else if (current.trackTime >= current.trackEnd) else if (current.trackTime >= current.trackEnd && current.next == null)
mix = 0; mix = 0;
// Apply current entry. // Apply current entry.