mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-06 07:14:55 +08:00
[csharp] Port of commit 8d058fb: Improved AnimationState behavior when paused. See #2705.
This commit is contained in:
parent
140335636c
commit
08a29352ef
@ -204,16 +204,18 @@ namespace Spine {
|
||||
from.animationLast = from.nextAnimationLast;
|
||||
from.trackLast = from.nextTrackLast;
|
||||
|
||||
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
||||
if (to.mixTime > 0 && to.mixTime >= to.mixDuration) {
|
||||
// Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame).
|
||||
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||
to.mixingFrom = from.mixingFrom;
|
||||
if (from.mixingFrom != null) from.mixingFrom.mixingTo = to;
|
||||
to.interruptAlpha = from.interruptAlpha;
|
||||
queue.End(from);
|
||||
if (to.nextTrackLast != -1) { // The from entry was applied at least once.
|
||||
bool discard = to.mixTime == 0 && from.mixTime == 0; // Discard the from entry when neither have advanced yet.
|
||||
if (to.mixTime >= to.mixDuration || discard) {
|
||||
// Require totalAlpha == 0 to ensure mixing is complete or the transition is a single frame or discarded.
|
||||
if (from.totalAlpha == 0 || to.mixDuration == 0 || discard) {
|
||||
to.mixingFrom = from.mixingFrom;
|
||||
if (from.mixingFrom != null) from.mixingFrom.mixingTo = to;
|
||||
to.interruptAlpha = from.interruptAlpha;
|
||||
queue.End(from);
|
||||
}
|
||||
return finished;
|
||||
}
|
||||
return finished;
|
||||
}
|
||||
|
||||
from.trackTime += delta * from.timeScale;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"name": "com.esotericsoftware.spine.spine-csharp",
|
||||
"displayName": "spine-csharp Runtime",
|
||||
"description": "This plugin provides the spine-csharp core runtime.",
|
||||
"version": "4.2.32",
|
||||
"version": "4.2.33",
|
||||
"unity": "2018.3",
|
||||
"author": {
|
||||
"name": "Esoteric Software",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user