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

Better handling of AnimationState state changes during listeners.

Browse Source 
Except "end" listeners, don't change the state from there.
This commit is contained in:
NathanSweet 2014-03-17 16:54:25 +01:00
parent df70264a5b
commit 11266e0cc5
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,7 @@ void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
int i, ii; int i, ii;
int eventCount; int eventCount;
int entryChanged;
float time; float time;
spTrackEntry* previous; spTrackEntry* previous;
for (i = 0; i < self->trackCount; i++) { for (i = 0; i < self->trackCount; i++) {
@ -148,22 +149,40 @@ void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
current->loop, internal->events, &eventCount, alpha); current->loop, internal->events, &eventCount, alpha);
} }
entryChanged = 0;
for (ii = 0; ii < eventCount; ii++) { for (ii = 0; ii < eventCount; ii++) {
spEvent* event = internal->events[ii]; spEvent* event = internal->events[ii];
if (current->listener) current->listener(self, i, ANIMATION_EVENT, event, 0); if (current->listener) {
if (self->listener) self->listener(self, i, ANIMATION_EVENT, event, 0); current->listener(self, i, ANIMATION_EVENT, event, 0);
if (self->tracks[i] != current) {
entryChanged = 1;
break;
}
}
if (self->listener) {
self->listener(self, i, ANIMATION_EVENT, event, 0);
if (self->tracks[i] != current) {
entryChanged = 1;
break;
}
}
} }
if (entryChanged) continue;
/* Check if completed the animation or a loop iteration. */ /* Check if completed the animation or a loop iteration. */
if (current->loop ? (FMOD(current->lastTime, current->endTime) > FMOD(time, current->endTime)) if (current->loop ? (FMOD(current->lastTime, current->endTime) > FMOD(time, current->endTime))
: (current->lastTime < current->endTime && time >= current->endTime)) { : (current->lastTime < current->endTime && time >= current->endTime)) {
int count = (int)(time / current->endTime); int count = (int)(time / current->endTime);
if (current->listener) current->listener(self, i, ANIMATION_COMPLETE, 0, count); if (current->listener) {
if (self->listener) self->listener(self, i, ANIMATION_COMPLETE, 0, count); current->listener(self, i, ANIMATION_COMPLETE, 0, count);
if (i >= self->trackCount || self->tracks[i] != current) continue; if (self->tracks[i] != current) continue;
}
if (self->listener) {
self->listener(self, i, ANIMATION_COMPLETE, 0, count);
if (self->tracks[i] != current) continue;
}
} }
if (i >= self->trackCount || self->tracks[i] != current) continue;
current->lastTime = current->time; current->lastTime = current->time;
} }
} }
@ -227,7 +246,10 @@ void _spAnimationState_setCurrent (spAnimationState* self, int index, spTrackEnt
self->tracks[index] = entry; self->tracks[index] = entry;
if (entry->listener) entry->listener(self, index, ANIMATION_START, 0, 0); if (entry->listener) {
entry->listener(self, index, ANIMATION_START, 0, 0);
if (self->tracks[index] != entry) return;
}
if (self->listener) self->listener(self, index, ANIMATION_START, 0, 0); if (self->listener) self->listener(self, index, ANIMATION_START, 0, 0);
} }