UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[csharp] Removed bad fix for #1024

Browse Source 
based on 1514b4acbb (diff-2e690293d0fea3104ddda07be1d1e5c9)
This commit is contained in:
John 2017-11-22 18:07:20 +08:00 committed by GitHub
parent 5948e5a62f
commit ed8f238524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;