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

[cpp] Port of #2837

Browse Source
This commit is contained in:
Mario Zechner 2025-05-07 13:06:50 +02:00
parent 5b2d479d4b
commit ec3231f861
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-cpp/spine-cpp/src/spine/AnimationState.cpp
View File

@ -164,7 +164,12 @@ void TrackEntry::setMixDuration(float inValue) { _mixDuration = inValue; }
void TrackEntry::setMixDuration(float mixDuration, float delay) { void TrackEntry::setMixDuration(float mixDuration, float delay) {
_mixDuration = mixDuration; _mixDuration = mixDuration;
if (_previous && delay <= 0) delay += _previous->getTrackComplete() - mixDuration; if (delay <= 0) {
if (_previous != nullptr)
delay = MathUtil::max(delay + _previous->getTrackComplete() - mixDuration, 0.0f);
else
delay = 0;
}
this->_delay = delay; this->_delay = delay;
} }
@ -606,10 +611,11 @@ TrackEntry *AnimationState::addAnimation(size_t trackIndex, Animation *animation
if (last == NULL) { if (last == NULL) {
setCurrent(trackIndex, entry, true); setCurrent(trackIndex, entry, true);
_queue->drain(); _queue->drain();
if (delay < 0) delay = 0;
} else { } else {
last->_next = entry; last->_next = entry;
entry->_previous = last; entry->_previous = last;
if (delay <= 0) delay += last->getTrackComplete() - entry->_mixDuration; if (delay <= 0) delay = MathUtil::max(delay + last->getTrackComplete() - entry->_mixDuration, 0.0f);
} }
entry->_delay = delay; entry->_delay = delay;
@ -625,7 +631,7 @@ TrackEntry *AnimationState::setEmptyAnimation(size_t trackIndex, float mixDurati
TrackEntry *AnimationState::addEmptyAnimation(size_t trackIndex, float mixDuration, float delay) { TrackEntry *AnimationState::addEmptyAnimation(size_t trackIndex, float mixDuration, float delay) {
TrackEntry *entry = addAnimation(trackIndex, AnimationState::getEmptyAnimation(), false, delay); TrackEntry *entry = addAnimation(trackIndex, AnimationState::getEmptyAnimation(), false, delay);
if (delay <= 0) entry->_delay += entry->_mixDuration - mixDuration; if (delay <= 0) entry->_delay = MathUtil::max(entry->_delay + entry->_mixDuration - mixDuration, 0.0f);
entry->_mixDuration = mixDuration; entry->_mixDuration = mixDuration;
entry->_trackEnd = mixDuration; entry->_trackEnd = mixDuration;
return entry; return entry;