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

Removed bad fix for #1024

Browse Source
This commit is contained in:
Nathan Sweet 2017-10-28 00:05:56 +02:00
parent 93d34666b0
commit 1514b4acbb
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -281,18 +281,12 @@ public class AnimationState {
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 = (TrackEntry)timelineDipMix[i];
alpha = 0; alpha = alphaDip * Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
else {
alpha = alphaDip;
TrackEntry dipMix = (TrackEntry)timelineDipMix[i];
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
}
break;
} }
from.totalAlpha += alpha; from.totalAlpha += alpha;
if (timeline instanceof RotateTimeline) if (timeline instanceof RotateTimeline)