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

[libgdx] Moved NaN fix when mixDuration is 0 to setTimelineData.

Browse Source
This commit is contained in:
NathanSweet 2017-05-17 15:23:42 +02:00
parent 21e05ea1b0
commit be583ba96d
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-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -248,7 +248,7 @@ public class AnimationState {
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
TrackEntry dipMix = (TrackEntry)timelineDipMix[i]; TrackEntry dipMix = (TrackEntry)timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); if (dipMix != null) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
if (timeline instanceof RotateTimeline) if (timeline instanceof RotateTimeline)
@ -730,7 +730,7 @@ public class AnimationState {
for (int ii = mixingToLast; ii >= 0; ii--) { for (int ii = mixingToLast; ii >= 0; ii--) {
TrackEntry entry = (TrackEntry)mixingTo[ii]; TrackEntry entry = (TrackEntry)mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0) timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }