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

[libgdx] AnimationState improved applyMixingFrom readability.

Browse Source
This commit is contained in:
Nathan Sweet 2026-03-24 12:24:19 -04:00
parent 2c53123666
commit feceba3cb7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -252,22 +252,27 @@ public class AnimationState {
TrackEntry from = to.mixingFrom; TrackEntry from = to.mixingFrom;
float fromMix = from.mixingFrom != null ? applyMixingFrom(from, skeleton) : 1; float fromMix = from.mixingFrom != null ? applyMixingFrom(from, skeleton) : 1;
float mix = to.mixDuration == 0 ? 1 : Math.min(1, to.mixTime / to.mixDuration); float mix = to.mixDuration == 0 ? 1 : Math.min(1, to.mixTime / to.mixDuration);
boolean attachments = mix < from.mixAttachmentThreshold, drawOrder = mix < from.mixDrawOrderThreshold;
int timelineCount = from.animation.timelines.size;
Timeline[] timelines = from.animation.timelines.items;
float a = from.alpha * fromMix, keep = 1 - mix * to.alpha; float a = from.alpha * fromMix, keep = 1 - mix * to.alpha;
float alphaMix = a * (1 - mix), alphaHold = keep > 0 ? alphaMix / keep : a; float alphaMix = a * (1 - mix), alphaHold = keep > 0 ? alphaMix / keep : a;
int timelineCount = from.animation.timelines.size;
Timeline[] timelines = from.animation.timelines.items;
int[] timelineMode = from.timelineMode.items;
TrackEntry[] timelineHoldMix = from.timelineHoldMix.items;
boolean attachments = mix < from.mixAttachmentThreshold, drawOrder = mix < from.mixDrawOrderThreshold;
boolean add = from.additive, shortestRotation = add || from.shortestRotation;
boolean firstFrame = !shortestRotation && from.timelinesRotation.size != timelineCount << 1;
float[] timelinesRotation = firstFrame ? from.timelinesRotation.setSize(timelineCount << 1) : from.timelinesRotation.items;
float animationLast = from.animationLast, animationTime = from.getAnimationTime(), applyTime = animationTime; float animationLast = from.animationLast, animationTime = from.getAnimationTime(), applyTime = animationTime;
Array<Event> events = null; Array<Event> events = null;
if (from.reverse) if (from.reverse)
applyTime = from.animation.duration - applyTime; applyTime = from.animation.duration - applyTime;
else if (mix < from.eventThreshold) // else if (mix < from.eventThreshold) //
events = this.events; events = this.events;
int[] timelineMode = from.timelineMode.items;
TrackEntry[] timelineHoldMix = from.timelineHoldMix.items;
boolean add = from.additive, shortestRotation = add || from.shortestRotation;
boolean firstFrame = !shortestRotation && from.timelinesRotation.size != timelineCount << 1;
float[] timelinesRotation = firstFrame ? from.timelinesRotation.setSize(timelineCount << 1) : from.timelinesRotation.items;
from.totalAlpha = 0; from.totalAlpha = 0;
for (int i = 0; i < timelineCount; i++) { for (int i = 0; i < timelineCount; i++) {
Timeline timeline = timelines[i]; Timeline timeline = timelines[i];
@ -292,8 +297,10 @@ public class AnimationState {
timeline.apply(skeleton, animationLast, applyTime, events, alpha, fromSetup, add, out, false); timeline.apply(skeleton, animationLast, applyTime, events, alpha, fromSetup, add, out, false);
} }
} }
if (to.mixDuration > 0) queueEvents(from, animationTime); if (to.mixDuration > 0) queueEvents(from, animationTime);
this.events.clear(); this.events.clear();
from.nextAnimationLast = animationTime; from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime; from.nextTrackLast = from.trackTime;
return mix; return mix;