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] Ported AnimationState changes

Browse Source
This commit is contained in:
badlogic 2016-11-24 12:38:03 +01:00
parent be13e57bbc
commit a73c5084b5
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ static spAnimation* SP_EMPTY_ANIMATION = 0;
the same function order in C as we have method order in Java */ the same function order in C as we have method order in Java */
void _spAnimationState_disposeTrackEntry (spTrackEntry* entry); void _spAnimationState_disposeTrackEntry (spTrackEntry* entry);
void _spAnimationState_disposeTrackEntries (spAnimationState* state, spTrackEntry* entry); void _spAnimationState_disposeTrackEntries (spAnimationState* state, spTrackEntry* entry);
void _spAnimationState_updateMixingFrom (spAnimationState* self, spTrackEntry* entry, float delta, int /*boolean*/ canEnd); void _spAnimationState_updateMixingFrom (spAnimationState* self, spTrackEntry* entry, float delta);
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);
@ -255,9 +255,7 @@ void spAnimationState_update (spAnimationState* self, float delta) {
} }
continue; continue;
} }
_spAnimationState_updateMixingFrom(self, current, delta, 1);
} else { } else {
_spAnimationState_updateMixingFrom(self, current, delta, 1);
/* Clear the track when there is no next entry, the track end time is reached, and there is no mixingFrom. */ /* Clear the track when there is no next entry, the track end time is reached, and there is no mixingFrom. */
if (current->trackLast >= current->trackEnd && current->mixingFrom == 0) { if (current->trackLast >= current->trackEnd && current->mixingFrom == 0) {
self->tracks[i] = 0; self->tracks[i] = 0;
@ -266,6 +264,7 @@ void spAnimationState_update (spAnimationState* self, float delta) {
continue; continue;
} }
} }
_spAnimationState_updateMixingFrom(self, current, delta);
current->trackTime += currentDelta; current->trackTime += currentDelta;
} }
@ -273,30 +272,23 @@ void spAnimationState_update (spAnimationState* self, float delta) {
_spEventQueue_drain(internal->queue); _spEventQueue_drain(internal->queue);
} }
void _spAnimationState_updateMixingFrom (spAnimationState* self, spTrackEntry* entry, float delta, int /*boolean*/ canEnd) { void _spAnimationState_updateMixingFrom (spAnimationState* self, spTrackEntry* entry, float delta) {
spTrackEntry* from = entry->mixingFrom; spTrackEntry* from = entry->mixingFrom;
spTrackEntry* newFrom;
float mixingFromDelta;
_spAnimationState* internal = SUB_CAST(_spAnimationState, self); _spAnimationState* internal = SUB_CAST(_spAnimationState, self);
if (!from) return; if (!from) return;
_spAnimationState_updateMixingFrom(self, from, delta);
if (canEnd && entry->mixTime >= entry->mixDuration && entry->mixTime > 0) { if (entry->mixTime >= entry->mixDuration && from->mixingFrom == 0 && entry->mixTime > 0) {
entry->mixingFrom = 0;
_spEventQueue_end(internal->queue, from); _spEventQueue_end(internal->queue, from);
newFrom = from->mixingFrom; return;
entry->mixingFrom = newFrom;
if (!newFrom) return;
entry->mixTime = from->mixTime;
entry->mixDuration = from->mixDuration;
from = newFrom;
} }
from->animationLast = from->nextAnimationLast; from->animationLast = from->nextAnimationLast;
from->trackLast = from->nextTrackLast; from->trackLast = from->nextTrackLast;
mixingFromDelta = delta * from->timeScale; from->trackTime += delta * from->timeScale;
from->trackTime += mixingFromDelta; entry->mixTime += delta * entry->timeScale;
entry->mixTime += mixingFromDelta;
_spAnimationState_updateMixingFrom(self, from, delta, canEnd && from->alpha == 1);
} }
void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) { void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
@ -320,7 +312,10 @@ void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
/* Apply mixing from entries first. */ /* Apply mixing from entries first. */
mix = current->alpha; mix = current->alpha;
if (current->mixingFrom) mix *= _spAnimationState_applyMixingFrom(self, current, skeleton); if (current->mixingFrom)
mix *= _spAnimationState_applyMixingFrom(self, current, skeleton);
else if (current->trackTime >= current->trackEnd)
mix = 0;
/* Apply current entry. */ /* Apply current entry. */
animationLast = current->animationLast; animationTime = spTrackEntry_getAnimationTime(current); animationLast = current->animationLast; animationTime = spTrackEntry_getAnimationTime(current);
@ -595,11 +590,11 @@ spTrackEntry* spAnimationState_setAnimation (spAnimationState* self, int trackIn
if (current) { if (current) {
if (current->nextTrackLast == -1) { if (current->nextTrackLast == -1) {
/* Don't mix from an entry that was never applied. */ /* Don't mix from an entry that was never applied. */
self->tracks[trackIndex] = 0; self->tracks[trackIndex] = current->mixingFrom;
_spEventQueue_interrupt(internal->queue, current); _spEventQueue_interrupt(internal->queue, current);
_spEventQueue_end(internal->queue, current); _spEventQueue_end(internal->queue, current);
_spAnimationState_disposeNext(self, current); _spAnimationState_disposeNext(self, current);
current = 0; current = current->mixingFrom;
} else } else
_spAnimationState_disposeNext(self, current); _spAnimationState_disposeNext(self, current);
} }