[csharp] Ported latest AnimationState changes, see c512ee5d595076842cbb12d95a3a7f06792b81d1

This commit is contained in:
badlogic 2016-12-06 13:53:25 +01:00
parent 0b30e94241
commit 14f9d28d06

View File

@ -186,6 +186,7 @@ namespace Spine {
} }
} }
QueueEvents(current, animationTime); QueueEvents(current, animationTime);
events.Clear(false);
current.nextAnimationLast = animationTime; current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime; current.nextTrackLast = current.trackTime;
} }
@ -234,7 +235,8 @@ namespace Spine {
} }
} }
QueueEvents(from, animationTime); if (entry.mixDuration > 0 ) QueueEvents(from, animationTime);
events.Clear(false);
from.nextAnimationLast = animationTime; from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime; from.nextTrackLast = from.trackTime;
@ -333,8 +335,7 @@ namespace Spine {
Event e = eventsItems[i]; Event e = eventsItems[i];
if (e.time < animationStart) continue; // Discard events outside animation start/end. if (e.time < animationStart) continue; // Discard events outside animation start/end.
queue.Event(entry, eventsItems[i]); queue.Event(entry, eventsItems[i]);
} }
events.Clear(false);
} }
/// <summary> /// <summary>