UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
badlogic 2016-11-03 16:55:13 +01:00
commit 6c10b256ca
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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));
}
}

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

@ -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.