|
@@ -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) {
|
|
|
|
- alpha = 0;
|
|
|
|
- } else {
|
|
|
|
- alpha = alphaDip;
|
|
|
|
- var dipMix = timelineDipMix[i];
|
|
|
|
- alpha *= Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
|
|
|
|
- }
|
|
|
|
|
|
+ TrackEntry dipMix = timelineDipMix[i];
|
|
|
|
+ alpha = alphaDip * Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
from.totalAlpha += alpha;
|
|
from.totalAlpha += alpha;
|