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

Allow track entries to finish when timeScale is 0.

Browse Source 
closes #806
This commit is contained in:
NathanSweet 2017-05-17 02:10:34 +02:00
parent d7c4195bc7
commit 859dd76f78
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,9 @@ public class AnimationState {
if (from == null) return true; if (from == null) return true;
boolean finished = updateMixingFrom(from, delta, animationCount + 1); boolean finished = updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { // Limit the mixing from linked list. if (animationCount > 6 && from.mixingFrom == null) { // Limit the mixing from linked list.
entry.mixingFrom = null; entry.mixingFrom = null;
queue.end(from); queue.end(from);
@ -856,6 +858,8 @@ public class AnimationState {
/** Multiplier for the delta time when the animation state is updated, causing time for this animation to pass slower or /** Multiplier for the delta time when the animation state is updated, causing time for this animation to pass slower or
* faster. Defaults to 1. * faster. Defaults to 1.
* <p> * <p>
* If <code>timeScale</code> is 0, any {@link #getMixDuration()} will be ignored.
* <p>
* See AnimationState {@link AnimationState#getTimeScale()} for affecting all animations. */ * See AnimationState {@link AnimationState#getTimeScale()} for affecting all animations. */
public float getTimeScale () { public float getTimeScale () {
return timeScale; return timeScale;