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

[c] Fix for clearTracks, see #805

Browse Source
This commit is contained in:
badlogic 2016-12-15 13:32:44 +01:00
parent dc8f89fd65
commit fe33e912c6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,12 +534,13 @@ void _spAnimationState_queueEvents (spAnimationState* self, spTrackEntry* entry,
void spAnimationState_clearTracks (spAnimationState* self) { void spAnimationState_clearTracks (spAnimationState* self) {
_spAnimationState* internal = SUB_CAST(_spAnimationState, self); _spAnimationState* internal = SUB_CAST(_spAnimationState, self);
int i, n; int i, n, oldDrainDisabled;
oldDrainDisabled = internal->queue->drainDisabled;
internal->queue->drainDisabled = 1; internal->queue->drainDisabled = 1;
for (i = 0, n = self->tracksCount; i < n; i++) for (i = 0, n = self->tracksCount; i < n; i++)
spAnimationState_clearTrack(self, i); spAnimationState_clearTrack(self, i);
self->tracksCount = 0; self->tracksCount = 0;
internal->queue->drainDisabled = 0; internal->queue->drainDisabled = oldDrainDisabled;
_spEventQueue_drain(internal->queue); _spEventQueue_drain(internal->queue);
} }
@ -674,15 +675,16 @@ spTrackEntry* spAnimationState_addEmptyAnimation(spAnimationState* self, int tra
} }
void spAnimationState_setEmptyAnimations(spAnimationState* self, float mixDuration) { void spAnimationState_setEmptyAnimations(spAnimationState* self, float mixDuration) {
int i, n; int i, n, oldDrainDisabled;
spTrackEntry* current; spTrackEntry* current;
_spAnimationState* internal = SUB_CAST(_spAnimationState, self); _spAnimationState* internal = SUB_CAST(_spAnimationState, self);
oldDrainDisabled = internal->queue->drainDisabled;
internal->queue->drainDisabled = 1; internal->queue->drainDisabled = 1;
for (i = 0, n = self->tracksCount; i < n; i++) { for (i = 0, n = self->tracksCount; i < n; i++) {
current = self->tracks[i]; current = self->tracks[i];
if (current) spAnimationState_setEmptyAnimation(self, current->trackIndex, mixDuration); if (current) spAnimationState_setEmptyAnimation(self, current->trackIndex, mixDuration);
} }
internal->queue->drainDisabled = 0; internal->queue->drainDisabled = oldDrainDisabled;
_spEventQueue_drain(internal->queue); _spEventQueue_drain(internal->queue);
} }