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

Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2018-03-28 14:00:27 +02:00
commit 90554dff04
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,13 +528,13 @@ namespace Spine {
float duration = last.animationEnd - last.animationStart; float duration = last.animationEnd - last.animationStart;
if (duration != 0) { if (duration != 0) {
if (last.loop) { if (last.loop) {
delay += duration * (1 + (int)(last.trackTime / duration)); delay += duration * (1 + (int)(last.trackTime / duration)); // Completion of next loop.
} else { } else {
delay += duration; delay += Math.Max(duration, last.trackTime); // After duration, else next update.
} }
delay -= data.GetMix(last.animation, animation); delay -= data.GetMix(last.animation, animation);
} else } else
delay = 0; delay = last.trackTime; // Next update.
} }
} }

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

@ -544,12 +544,12 @@ public class AnimationState {
float duration = last.animationEnd - last.animationStart; float duration = last.animationEnd - last.animationStart;
if (duration != 0) { if (duration != 0) {
if (last.loop) if (last.loop)
delay += duration * (1 + (int)(last.trackTime / duration)); delay += duration * (1 + (int)(last.trackTime / duration)); // Completion of next loop.
else else
delay += duration; delay += Math.max(duration, last.trackTime); // After duration, else next update.
delay -= data.getMix(last.animation, animation); delay -= data.getMix(last.animation, animation);
} else } else
delay = 0; delay = last.trackTime; // Next update.
} }
} }