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

[csharp] Don't use the dip fix if mixing is complete.

Browse Source 
Based on: 28fd5aff09
See https://github.com/EsotericSoftware/spine-runtimes/issues/1024
This commit is contained in:
John 2017-10-24 00:41:35 +08:00 committed by GitHub
parent 28fd5aff09
commit 1f704aec5e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,13 +258,17 @@ namespace Spine {
break; break;
case Dip: case Dip:
pose = MixPose.Setup; pose = MixPose.Setup;
alpha = alphaDip; alpha = mix == 1 ? 0 : alphaDip;
break; break;
default: default:
pose = MixPose.Setup; pose = MixPose.Setup;
alpha = alphaDip; if (mix == 1) {
var dipMix = timelineDipMix[i]; alpha = 0;
alpha *= 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;