UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-14 19:11:36 +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:08:47 +02:00
parent 0d4ce16fc3
commit 980352a7ce
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,7 +259,7 @@ public class AnimationState {
float animationLast = from.animationLast, animationTime = from.getAnimationTime();
int timelineCount = from.animation.timelines.size;
Object[] timelines = from.animation.timelines.items;
float alphaDip = from.alpha * to.interruptAlpha, alphaMix = alphaDip * (1 - mix), alpha;
float alphaDip = from.alpha * to.interruptAlpha, alphaMix = alphaDip * (1 - mix);
if (blend != MixBlend.first) blend = from.mixBlend;
if (blend == MixBlend.add) {
@ -277,6 +277,7 @@ public class AnimationState {
for (int i = 0; i < timelineCount; i++) {
Timeline timeline = (Timeline)timelines[i];
MixBlend timelineBlend;
float alpha;
switch (timelineData[i]) {
case SUBSEQUENT:
if (!attachments && timeline instanceof AttachmentTimeline) continue;
@ -290,18 +291,12 @@ public class AnimationState {
break;
case DIP:
timelineBlend = MixBlend.setup;
// alpha = mix == 1 ? 0 : alphaDip;
alpha = alphaDip;
break;
default:
timelineBlend = MixBlend.setup;
// BOZO! - Bad fix.
// if (mix == 1)
// alpha = 0;
// else {
TrackEntry dipMix = (TrackEntry)timelineDipMix[i];
alpha = alphaDip * Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
// }
break;
}
from.totalAlpha += alpha;