UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-22 02:06:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c] Port of #2837

Browse Source
This commit is contained in:
Mario Zechner 2025-05-07 13:11:49 +02:00
parent ec3231f861
commit 3f440bfc4a
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

@ -855,7 +855,7 @@ spAnimationState_addAnimation(spAnimationState *self, int trackIndex, spAnimatio
} else { } else {
last->next = entry; last->next = entry;
entry->previous = last; entry->previous = last;
if (delay <= 0) delay += spTrackEntry_getTrackComplete(last) - entry->mixDuration; if (delay <= 0) delay = MAX(delay +spTrackEntry_getTrackComplete(last) - entry->mixDuration, 0);
} }
entry->delay = delay; entry->delay = delay;
@ -872,7 +872,7 @@ spTrackEntry *spAnimationState_setEmptyAnimation(spAnimationState *self, int tra
spTrackEntry * spTrackEntry *
spAnimationState_addEmptyAnimation(spAnimationState *self, int trackIndex, float mixDuration, float delay) { spAnimationState_addEmptyAnimation(spAnimationState *self, int trackIndex, float mixDuration, float delay) {
spTrackEntry *entry = spAnimationState_addAnimation(self, trackIndex, SP_EMPTY_ANIMATION, 0, delay); spTrackEntry *entry = spAnimationState_addAnimation(self, trackIndex, SP_EMPTY_ANIMATION, 0, delay);
if (delay <= 0) entry->delay += entry->mixDuration - mixDuration; if (delay <= 0) entry->delay = MAX(delay + entry->mixDuration - mixDuration, 0);
entry->mixDuration = mixDuration; entry->mixDuration = mixDuration;
entry->trackEnd = mixDuration; entry->trackEnd = mixDuration;
return entry; return entry;
@ -1061,7 +1061,12 @@ float spTrackEntry_getTrackComplete(spTrackEntry *entry) {
void spTrackEntry_setMixDuration(spTrackEntry *entry, float mixDuration, float delay) { void spTrackEntry_setMixDuration(spTrackEntry *entry, float mixDuration, float delay) {
entry->mixDuration = mixDuration; entry->mixDuration = mixDuration;
if (entry->previous && delay <= 0) delay += spTrackEntry_getTrackComplete(entry) - mixDuration; if (delay <= 0) {
if (entry->previous)
delay = MAX(delay + spTrackEntry_getTrackComplete(entry->previous) - mixDuration, 0);
else
delay = 0;
}
entry->delay = delay; entry->delay = delay;
} }