UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-27 20:21:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
NathanSweet 2016-11-28 18:10:51 +01:00
commit d19a4b22db
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ void _spAnimationState_updateMixingFrom (spAnimationState* self, spTrackEntry* e
float _spAnimationState_applyMixingFrom (spAnimationState* self, spTrackEntry* entry, spSkeleton* skeleton); float _spAnimationState_applyMixingFrom (spAnimationState* self, spTrackEntry* entry, spSkeleton* skeleton);
void _spAnimationState_applyRotateTimeline (spAnimationState* self, spTimeline* timeline, spSkeleton* skeleton, float time, float alpha, int /*boolean*/ setupPose, float* timelinesRotation, int i, int /*boolean*/ firstFrame); void _spAnimationState_applyRotateTimeline (spAnimationState* self, spTimeline* timeline, spSkeleton* skeleton, float time, float alpha, int /*boolean*/ setupPose, float* timelinesRotation, int i, int /*boolean*/ firstFrame);
void _spAnimationState_queueEvents (spAnimationState* self, spTrackEntry* entry, float animationTime); void _spAnimationState_queueEvents (spAnimationState* self, spTrackEntry* entry, float animationTime);
void _spAnimationState_setCurrent (spAnimationState* self, int index, spTrackEntry* current); void _spAnimationState_setCurrent (spAnimationState* self, int index, spTrackEntry* current, int /*boolean*/ interrupt);
spTrackEntry* _spAnimationState_expandToIndex (spAnimationState* self, int index); spTrackEntry* _spAnimationState_expandToIndex (spAnimationState* self, int index);
spTrackEntry* _spAnimationState_trackEntry (spAnimationState* self, int trackIndex, spAnimation* animation, int /*boolean*/ loop, spTrackEntry* last); spTrackEntry* _spAnimationState_trackEntry (spAnimationState* self, int trackIndex, spAnimation* animation, int /*boolean*/ loop, spTrackEntry* last);
void _spAnimationState_disposeNext (spAnimationState* self, spTrackEntry* entry); void _spAnimationState_disposeNext (spAnimationState* self, spTrackEntry* entry);
@ -260,7 +260,7 @@ void spAnimationState_update (spAnimationState* self, float delta) {
next->delay = 0; next->delay = 0;
next->trackTime = nextTime + delta * next->timeScale; next->trackTime = nextTime + delta * next->timeScale;
current->trackTime += currentDelta; current->trackTime += currentDelta;
_spAnimationState_setCurrent(self, i, next); _spAnimationState_setCurrent(self, i, next, 1);
while (next->mixingFrom) { while (next->mixingFrom) {
next->mixTime += currentDelta; next->mixTime += currentDelta;
next = next->mixingFrom; next = next->mixingFrom;
@ -571,13 +571,13 @@ void spAnimationState_clearTrack (spAnimationState* self, int trackIndex) {
_spEventQueue_drain(internal->queue); _spEventQueue_drain(internal->queue);
} }
void _spAnimationState_setCurrent (spAnimationState* self, int index, spTrackEntry* current) { void _spAnimationState_setCurrent (spAnimationState* self, int index, spTrackEntry* current, int /*boolean*/ interrupt) {
_spAnimationState* internal = SUB_CAST(_spAnimationState, self); _spAnimationState* internal = SUB_CAST(_spAnimationState, self);
spTrackEntry* from = _spAnimationState_expandToIndex(self, index); spTrackEntry* from = _spAnimationState_expandToIndex(self, index);
self->tracks[index] = current; self->tracks[index] = current;
if (from) { if (from) {
_spEventQueue_interrupt(internal->queue, from); if (interrupt) _spEventQueue_interrupt(internal->queue, from);
current->mixingFrom = from; current->mixingFrom = from;
current->mixTime = 0; current->mixTime = 0;
@ -598,6 +598,7 @@ spTrackEntry* spAnimationState_setAnimationByName (spAnimationState* self, int t
spTrackEntry* spAnimationState_setAnimation (spAnimationState* self, int trackIndex, spAnimation* animation, int/*bool*/loop) { spTrackEntry* spAnimationState_setAnimation (spAnimationState* self, int trackIndex, spAnimation* animation, int/*bool*/loop) {
spTrackEntry* entry; spTrackEntry* entry;
_spAnimationState* internal = SUB_CAST(_spAnimationState, self); _spAnimationState* internal = SUB_CAST(_spAnimationState, self);
int interrupt = 1;
spTrackEntry* current = _spAnimationState_expandToIndex(self, trackIndex); spTrackEntry* current = _spAnimationState_expandToIndex(self, trackIndex);
if (current) { if (current) {
if (current->nextTrackLast == -1) { if (current->nextTrackLast == -1) {
@ -607,11 +608,12 @@ spTrackEntry* spAnimationState_setAnimation (spAnimationState* self, int trackIn
_spEventQueue_end(internal->queue, current); _spEventQueue_end(internal->queue, current);
_spAnimationState_disposeNext(self, current); _spAnimationState_disposeNext(self, current);
current = current->mixingFrom; current = current->mixingFrom;
interrupt = 0;
} else } else
_spAnimationState_disposeNext(self, current); _spAnimationState_disposeNext(self, current);
} }
entry = _spAnimationState_trackEntry(self, trackIndex, animation, loop, current); entry = _spAnimationState_trackEntry(self, trackIndex, animation, loop, current);
_spAnimationState_setCurrent(self, trackIndex, entry); _spAnimationState_setCurrent(self, trackIndex, entry, interrupt);
_spEventQueue_drain(internal->queue); _spEventQueue_drain(internal->queue);
return entry; return entry;
} }
@ -637,7 +639,7 @@ spTrackEntry* spAnimationState_addAnimation (spAnimationState* self, int trackIn
entry = _spAnimationState_trackEntry(self, trackIndex, animation, loop, last); entry = _spAnimationState_trackEntry(self, trackIndex, animation, loop, last);
if (!last) { if (!last) {
_spAnimationState_setCurrent(self, trackIndex, entry); _spAnimationState_setCurrent(self, trackIndex, entry, 1);
_spEventQueue_drain(internal->queue); _spEventQueue_drain(internal->queue);
} else { } else {
last->next = entry; last->next = entry;

12
spine-csharp/src/AnimationState.cs
View File

@ -95,7 +95,7 @@ namespace Spine {
next.delay = 0; next.delay = 0;
next.trackTime = nextTime + (delta * next.timeScale); next.trackTime = nextTime + (delta * next.timeScale);
current.trackTime += currentDelta; current.trackTime += currentDelta;
SetCurrent(i, next); SetCurrent(i, next, true);
while (next.mixingFrom != null) { while (next.mixingFrom != null) {
next.mixTime += currentDelta; next.mixTime += currentDelta;
next = next.mixingFrom; next = next.mixingFrom;
@ -378,12 +378,12 @@ namespace Spine {
queue.Drain(); queue.Drain();
} }
private void SetCurrent (int index, TrackEntry current) { private void SetCurrent (int index, TrackEntry current, bool interrupt) {
TrackEntry from = ExpandToIndex(index); TrackEntry from = ExpandToIndex(index);
tracks.Items[index] = current; tracks.Items[index] = current;
if (from != null) { if (from != null) {
queue.Interrupt(from); if (interrupt) queue.Interrupt(from);
current.mixingFrom = from; current.mixingFrom = from;
current.mixTime = 0; current.mixTime = 0;
@ -413,6 +413,7 @@ namespace Spine {
/// after <see cref="AnimationState.Dispose"/>.</returns> /// after <see cref="AnimationState.Dispose"/>.</returns>
public TrackEntry SetAnimation (int trackIndex, Animation animation, bool loop) { public TrackEntry SetAnimation (int trackIndex, Animation animation, bool loop) {
if (animation == null) throw new ArgumentNullException("animation", "animation cannot be null."); if (animation == null) throw new ArgumentNullException("animation", "animation cannot be null.");
bool interrupt = true;
TrackEntry current = ExpandToIndex(trackIndex); TrackEntry current = ExpandToIndex(trackIndex);
if (current != null) { if (current != null) {
if (current.nextTrackLast == -1) { if (current.nextTrackLast == -1) {
@ -422,12 +423,13 @@ namespace Spine {
queue.End(current); queue.End(current);
DisposeNext(current); DisposeNext(current);
current = current.mixingFrom; current = current.mixingFrom;
interrupt = false;
} else { } else {
DisposeNext(current); DisposeNext(current);
} }
} }
TrackEntry entry = NewTrackEntry(trackIndex, animation, loop, current); TrackEntry entry = NewTrackEntry(trackIndex, animation, loop, current);
SetCurrent(trackIndex, entry); SetCurrent(trackIndex, entry, interrupt);
queue.Drain(); queue.Drain();
return entry; return entry;
} }
@ -460,7 +462,7 @@ namespace Spine {
TrackEntry entry = NewTrackEntry(trackIndex, animation, loop, last); TrackEntry entry = NewTrackEntry(trackIndex, animation, loop, last);
if (last == null) { if (last == null) {
SetCurrent(trackIndex, entry); SetCurrent(trackIndex, entry, true);
queue.Drain(); queue.Drain();
} else { } else {
last.next = entry; last.next = entry;