diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java index 36e16836c..ef126dff2 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java @@ -31,8 +31,6 @@ package com.esotericsoftware.spine; -import java.util.Comparator; - import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; @@ -51,7 +49,6 @@ public class Skeleton { final Array ikConstraints; final Array transformConstraints; final Array pathConstraints; - final Array sortedConstraints = new Array(); final Array updateCache = new Array(); final Array updateCacheReset = new Array(); Skin skin; @@ -60,12 +57,6 @@ public class Skeleton { boolean flipX, flipY; float x, y; - final Comparator constraintComparator = new Comparator() { - public int compare (Constraint o1, Constraint o2) { - return o1.getOrder() - o2.getOrder(); - } - }; - public Skeleton (SkeletonData data) { if (data == null) throw new IllegalArgumentException("data cannot be null."); this.data = data; @@ -116,8 +107,15 @@ public class Skeleton { bones = new Array(skeleton.bones.size); for (Bone bone : skeleton.bones) { - Bone parent = bone.parent == null ? null : bones.get(bone.parent.data.index); - bones.add(new Bone(bone, this, parent)); + Bone newBone; + if (bone.parent == null) + newBone = new Bone(bone, this, null); + else { + Bone parent = bones.get(bone.parent.data.index); + newBone = new Bone(bone, this, parent); + parent.children.add(newBone); + } + bones.add(newBone); } slots = new Array(skeleton.slots.size); diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java index bb3c62432..d4725ff9f 100644 --- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java +++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java @@ -168,7 +168,7 @@ public class SkeletonViewer extends ApplicationAdapter { skeleton = new Skeleton(skeletonData); skeleton.setToSetupPose(); - skeleton = new Skeleton(skeleton); + skeleton = new Skeleton(skeleton); // Tests copy constructors. skeleton.updateWorldTransform(); state = new AnimationState(new AnimationStateData(skeletonData));