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

Merge branch 'EsotericSoftware/3.6' into 3.6

Browse Source
This commit is contained in:
Stephen Gowen 2017-11-22 13:07:30 -05:00
commit e7ca5c8378
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ namespace Spine {
trackEntryPool trackEntryPool
); );
} }
/// <summary> /// <summary>
/// Increments the track entry times, setting queued animations as current if needed</summary> /// Increments the track entry times, setting queued animations as current if needed</summary>
/// <param name="delta">delta time</param> /// <param name="delta">delta time</param>
@ -259,17 +259,12 @@ namespace Spine {
break; break;
case Dip: case Dip:
pose = MixPose.Setup; pose = MixPose.Setup;
alpha = mix == 1 ? 0 : alphaDip; alpha = alphaDip;
break; break;
default: default:
pose = MixPose.Setup; pose = MixPose.Setup;
if (mix == 1) { TrackEntry dipMix = timelineDipMix[i];
alpha = 0; alpha = alphaDip * Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
} else {
alpha = alphaDip;
var dipMix = timelineDipMix[i];
alpha *= Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
}
break; break;
} }
from.totalAlpha += alpha; from.totalAlpha += alpha;