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

[c] Fix for #1064, delay was calculated incorrectly for non-loop previous track entries.

Browse Source
This commit is contained in:
badlogic 2018-01-12 11:16:35 +01:00
parent b5e5d4aabb
commit 095424ee98
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,9 +720,14 @@ spTrackEntry* spAnimationState_addAnimation (spAnimationState* self, int trackIn
last->next = entry; last->next = entry;
if (delay <= 0) { if (delay <= 0) {
float duration = last->animationEnd - last->animationStart; float duration = last->animationEnd - last->animationStart;
if (duration != 0) if (duration != 0) {
delay += duration * (1 + (int)(last->trackTime / duration)) - spAnimationStateData_getMix(self->data, last->animation, animation); if (last->loop) {
else delay += duration * (1 + (int) (last->trackTime / duration));
} else {
delay += duration;
}
delay -= spAnimationStateData_getMix(self->data, last->animation, animation);
} else
delay = 0; delay = 0;
} }
} }