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

Fixed AnimationState mixing.

Browse Source
This commit is contained in:
NathanSweet 2013-09-26 11:35:47 +02:00
parent b6cf39665d
commit 5b2dfe3311
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,6 +114,7 @@ void AnimationState_update (AnimationState* self, float delta) {
} }
} }
} }
void AnimationState_apply (AnimationState* self, Skeleton* skeleton) { void AnimationState_apply (AnimationState* self, Skeleton* skeleton) {
_AnimationState* internal = SUB_CAST(_AnimationState, self); _AnimationState* internal = SUB_CAST(_AnimationState, self);
@ -132,14 +133,14 @@ void AnimationState_apply (AnimationState* self, Skeleton* skeleton) {
&eventCount); &eventCount);
} else { } else {
float alpha = current->mixTime / current->mixDuration; float alpha = current->mixTime / current->mixDuration;
Animation_apply(previous->animation, skeleton, (float)INT_MAX, previous->time, previous->loop, internal->events, &eventCount); Animation_apply(previous->animation, skeleton, (float)INT_MAX, previous->time, previous->loop, 0, 0);
if (alpha >= 1) { if (alpha >= 1) {
alpha = 1; alpha = 1;
_TrackEntry_dispose(current->previous); _TrackEntry_dispose(current->previous);
current->previous = 0; current->previous = 0;
} }
Animation_apply(current->animation, skeleton, current->lastTime, current->time, current->loop, internal->events, Animation_mix(current->animation, skeleton, current->lastTime, current->time, current->loop, internal->events,
&eventCount); &eventCount, alpha);
} }
for (ii = 0; ii < eventCount; ii++) { for (ii = 0; ii < eventCount; ii++) {