UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-21 09:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[csharp] AnimationState fixes.

Browse Source 
Includes fix: a6ac746b4f
This commit is contained in:
John 2016-12-02 02:10:42 +08:00 committed by GitHub
parent 024b695393
commit 896abf8fd7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ namespace Spine {
float alpha = from.alpha * entry.mixAlpha * (1 - mix); float alpha = from.alpha * entry.mixAlpha * (1 - mix);
bool firstFrame = entry.timelinesRotation.Count == 0; bool firstFrame = entry.timelinesRotation.Count == 0;
if (firstFrame) entry.timelinesRotation.Capacity = timelineCount << 1; if (firstFrame) entry.timelinesRotation.EnsureCapacity(timelines.Count << 1);
var timelinesRotation = entry.timelinesRotation.Items; var timelinesRotation = entry.timelinesRotation.Items;
for (int i = 0; i < timelineCount; i++) { for (int i = 0; i < timelineCount; i++) {
@ -389,7 +389,7 @@ namespace Spine {
from.timelinesRotation.Clear(); from.timelinesRotation.Clear();
// If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero. // If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero.
if (from.mixingFrom != null) from.mixAlpha *= Math.Min(from.mixTime / from.mixDuration, 1); if (from.mixingFrom != null && from.mixDuration > 0) current.mixAlpha *= Math.Min(from.mixTime / from.mixDuration, 1);
} }
queue.Start(current); queue.Start(current);