UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-05 06:44:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TranslateTime mixing.

Browse Source
This commit is contained in:
NathanSweet 2016-10-21 21:04:49 +02:00
parent 375e4f6941
commit 21d63cd228
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -63,13 +63,8 @@ public class Animation {
this.duration = duration;
}
/** Poses the skeleton at the specified time for this animation mixed with the current or setup pose.
* @param lastTime The last time the animation was applied.
* @param events Any triggered events are added. May be null.
* @param alpha The percentage between this animation's pose and the current pose.
* @param setupPose If true, the animation is mixed with the setup pose, else it is mixed with the current pose. Passing true
* when alpha is 1 is slightly more efficient.
* @param mixingOut True when mixing over time toward the setup or current pose, false when mixing toward the keyed pose. */
/** Applies all the animation's timelines to the specified skeleton.
* @see Timeline#apply(Skeleton, float, float, Array, float, boolean, boolean) */
public void apply (Skeleton skeleton, float lastTime, float time, boolean loop, Array<Event> events, float alpha,
boolean setupPose, boolean mixingOut) {
if (skeleton == null) throw new IllegalArgumentException("skeleton cannot be null.");
@ -380,8 +375,8 @@ public class Animation {
bone.x = bone.data.x + x * alpha;
bone.y = bone.data.y + y * alpha;
} else {
bone.x += bone.data.x + (x - bone.x) * alpha;
bone.y += bone.data.y + (y - bone.y) * alpha;
bone.x += (bone.data.x + x - bone.x) * alpha;
bone.y += (bone.data.y + y - bone.y) * alpha;
}
}
}