UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-01 05:09:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[csharp] Match fewer ifs for mixAlpha fix.

Browse Source 
f8ea8e99ca
This commit is contained in:
John 2017-04-07 23:11:13 +08:00 committed by GitHub
parent fb6336bf73
commit facae4cb12
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spine-csharp/src/AnimationState.cs
View File

@ -413,22 +413,22 @@ namespace Spine {
//from.timelinesRotation.Clear(); //from.timelinesRotation.Clear();
var mixingFrom = from.mixingFrom; var mixingFrom = from.mixingFrom;
float mixProgress = from.mixTime / from.mixDuration;
if (mixingFrom != null && from.mixDuration > 0) { if (mixingFrom != null && from.mixDuration > 0) {
// A mix was interrupted, mix from the closest animation. if (multipleMixing) {
if (!multipleMixing && mixProgress < 0.5f && mixingFrom.animation != AnimationState.EmptyAnimation) { // The interrupted mix will mix out from its current percentage to zero.
current.mixingFrom = mixingFrom; current.mixAlpha *= Math.Min(from.mixTime / from.mixDuration, 1);
mixingFrom.mixingFrom = from; } else {
mixingFrom.mixTime = from.mixDuration - from.mixTime; // A mix was interrupted, mix from the closest animation.
mixingFrom.mixDuration = from.mixDuration; if (from.mixTime / from.mixDuration < 0.5f && mixingFrom.animation != AnimationState.EmptyAnimation) {
from.mixingFrom = null; current.mixingFrom = mixingFrom;
from = mixingFrom; mixingFrom.mixingFrom = from;
} mixingFrom.mixTime = from.mixDuration - from.mixTime;
mixingFrom.mixDuration = from.mixDuration;
from.mixingFrom = null;
from = mixingFrom;
}
// The interrupted mix will mix out from its current percentage to zero.
if (multipleMixing) current.mixAlpha *= Math.Min(mixProgress, 1);
if (!multipleMixing) {
from.mixAlpha = 0; from.mixAlpha = 0;
from.mixTime = 0; from.mixTime = 0;
from.mixDuration = 0; from.mixDuration = 0;
@ -650,7 +650,7 @@ namespace Spine {
var timelinesItems = timelines.Items; var timelinesItems = timelines.Items;
for (int ii = 0, nn = timelines.Count; ii < nn; ii++) for (int ii = 0, nn = timelines.Count; ii < nn; ii++)
propertyIDs.Add(timelinesItems[ii].PropertyId); propertyIDs.Add(timelinesItems[ii].PropertyId);
entry = entry.mixingFrom; entry = entry.mixingFrom;
while (entry != null) { while (entry != null) {
CheckTimelinesUsage(entry, entry.timelinesLast); CheckTimelinesUsage(entry, entry.timelinesLast);