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

[cpp] Port 29bf262d0: Fix track 0 dip mixing to animation with key > frame 0.

Browse Source
This commit is contained in:
Mario Zechner 2026-03-18 16:58:41 +01:00
parent 30678aef83
commit fff715d94d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/include/spine/AnimationState.h
View File

@ -597,7 +597,7 @@ namespace spine {
/// Returns true when all mixing from entries are complete. /// Returns true when all mixing from entries are complete.
bool updateMixingFrom(TrackEntry *to, float delta); bool updateMixingFrom(TrackEntry *to, float delta);
float applyMixingFrom(TrackEntry *to, Skeleton &skeleton, MixBlend currentPose); float applyMixingFrom(TrackEntry *to, Skeleton &skeleton);
void queueEvents(TrackEntry *entry, float animationTime); void queueEvents(TrackEntry *entry, float animationTime);

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

@ -568,12 +568,14 @@ bool AnimationState::apply(Skeleton &skeleton) {
TrackEntry &current = *currentP; TrackEntry &current = *currentP;
applied = true; applied = true;
// Track 0 animations aren't for layering, so never use current values before the first key.
MixBlend blend = i == 0 ? MixBlend_First : current._mixBlend; MixBlend blend = i == 0 ? MixBlend_First : current._mixBlend;
// apply mixing from entries first. // apply mixing from entries first.
float alpha = current._alpha; float alpha = current._alpha;
if (current._mixingFrom != NULL) { if (current._mixingFrom != NULL) {
alpha *= applyMixingFrom(currentP, skeleton, blend); alpha *= applyMixingFrom(currentP, skeleton);
} else if (current._trackTime >= current._trackEnd && current._next == NULL) { } else if (current._trackTime >= current._trackEnd && current._next == NULL) {
alpha = 0;// Set to setup pose the last time the entry will be applied. alpha = 0;// Set to setup pose the last time the entry will be applied.
} }
@ -611,7 +613,7 @@ bool AnimationState::apply(Skeleton &skeleton) {
Timeline *timeline = timelines[ii]; Timeline *timeline = timelines[ii];
assert(timeline); assert(timeline);
MixBlend timelineBlend = timelineMode[ii] == Subsequent ? blend : MixBlend_Setup; MixBlend timelineBlend = timelineMode[ii] == Subsequent ? current._mixBlend : MixBlend_Setup;
if (!shortestRotation && timeline->getRTTI().isExactly(RotateTimeline::rtti)) if (!shortestRotation && timeline->getRTTI().isExactly(RotateTimeline::rtti))
applyRotateTimeline(static_cast<RotateTimeline *>(timeline), skeleton, applyTime, alpha, timelineBlend, timelinesRotation, applyRotateTimeline(static_cast<RotateTimeline *>(timeline), skeleton, applyTime, alpha, timelineBlend, timelinesRotation,
@ -944,21 +946,18 @@ bool AnimationState::updateMixingFrom(TrackEntry *to, float delta) {
return false; return false;
} }
float AnimationState::applyMixingFrom(TrackEntry *to, Skeleton &skeleton, MixBlend blend) { float AnimationState::applyMixingFrom(TrackEntry *to, Skeleton &skeleton) {
TrackEntry *from = to->_mixingFrom; TrackEntry *from = to->_mixingFrom;
if (from->_mixingFrom != NULL) applyMixingFrom(from, skeleton, blend); if (from->_mixingFrom != NULL) applyMixingFrom(from, skeleton);
float mix; float mix;
if (to->_mixDuration == 0) { if (to->_mixDuration == 0) // Single frame mix to undo mixingFrom changes.
// Single frame mix to undo mixingFrom changes.
mix = 1; mix = 1;
if (blend == MixBlend_First) blend = MixBlend_Setup; else {
} else {
mix = to->_mixTime / to->_mixDuration; mix = to->_mixTime / to->_mixDuration;
if (mix > 1) { if (mix > 1) {
mix = 1; mix = 1;
} }
if (blend != MixBlend_First) blend = from->_mixBlend;
} }
bool attachments = mix < from->_mixAttachmentThreshold, drawOrder = mix < from->_mixDrawOrderThreshold; bool attachments = mix < from->_mixAttachmentThreshold, drawOrder = mix < from->_mixDrawOrderThreshold;
@ -974,6 +973,7 @@ float AnimationState::applyMixingFrom(TrackEntry *to, Skeleton &skeleton, MixBle
if (mix < from->_eventThreshold) events = &_events; if (mix < from->_eventThreshold) events = &_events;
} }
MixBlend blend = from->_mixBlend;
if (blend == MixBlend_Add) { if (blend == MixBlend_Add) {
for (size_t i = 0; i < timelineCount; i++) for (size_t i = 0; i < timelineCount; i++)
timelines[i]->apply(skeleton, animationLast, applyTime, events, alphaMix, blend, MixDirection_Out, false); timelines[i]->apply(skeleton, animationLast, applyTime, events, alphaMix, blend, MixDirection_Out, false);