From 75775bbdac3778ecf0e724f59ac555ae3656c0bd Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Thu, 3 Nov 2016 16:02:41 +0100 Subject: [PATCH 1/2] Use slot local variable. --- .../spine-libgdx/src/com/esotericsoftware/spine/Animation.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java index 51506630a..5ae81fb19 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -693,8 +693,7 @@ public class Animation { frameIndex = binarySearch(frames, time, 1) - 1; String attachmentName = attachmentNames[frameIndex]; - skeleton.slots.get(slotIndex) - .setAttachment(attachmentName == null ? null : skeleton.getAttachment(slotIndex, attachmentName)); + slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slotIndex, attachmentName)); } } From d84a39ba90b79886431bdeb043dced7feb6a0521 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Thu, 3 Nov 2016 16:03:13 +0100 Subject: [PATCH 2/2] Apply setup pose when before first frame for AnimationState rotation timeline apply. --- .../src/com/esotericsoftware/spine/AnimationState.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java index 9429bf305..7535011be 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -248,10 +248,12 @@ public class AnimationState { } RotateTimeline rotateTimeline = (RotateTimeline)timeline; - float[] frames = rotateTimeline.frames; - if (time < frames[0]) return; // Time is before first frame. - Bone bone = skeleton.bones.get(rotateTimeline.boneIndex); + float[] frames = rotateTimeline.frames; + if (time < frames[0]) { // Time is before first frame. + if (setupPose) bone.rotation = bone.data.rotation; + return; + } float r2; if (time >= frames[frames.length - ENTRIES]) // Time is after last frame.