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

[c] Ported latest AnimationState changes. See #792

Browse Source
This commit is contained in:
badlogic 2016-12-02 15:43:58 +01:00
parent 8e9d54b3ad
commit dfd0410acb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-c/spine-c/src/spine/AnimationState.c
View File

@ -582,7 +582,7 @@ void _spAnimationState_setCurrent (spAnimationState* self, int index, spTrackEnt
from->timelinesRotationCount = 0; from->timelinesRotationCount = 0;
/* If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero. */ /* If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero. */
if (from->mixingFrom) current->mixAlpha *= MIN(from->mixTime / from->mixDuration, 1); if (from->mixingFrom && from->mixDuration > 0) current->mixAlpha *= MIN(from->mixTime / from->mixDuration, 1);
} }
_spEventQueue_start(internal->queue, current); _spEventQueue_start(internal->queue, current);
@ -715,7 +715,7 @@ spTrackEntry* _spAnimationState_trackEntry (spAnimationState* self, int trackInd
entry->trackTime = 0; entry->trackTime = 0;
entry->trackLast = -1; entry->trackLast = -1;
entry->nextTrackLast = -1; entry->nextTrackLast = -1;
entry->trackEnd = loop ? (float)INT_MAX : entry->animationEnd; entry->trackEnd = (float)INT_MAX;
entry->timeScale = 1; entry->timeScale = 1;
entry->alpha = 1; entry->alpha = 1;