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 2def4f12f..1869d4746 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -266,7 +266,7 @@ public class Animation { /** Sets the time and angle of the specified keyframe. */ public void setFrame (int frameIndex, float time, float degrees) { - frameIndex >>= 1; + frameIndex <<= 1; frames[frameIndex] = time; frames[frameIndex + ROTATION] = degrees; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java index 7a59dab2c..d392315c4 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java @@ -23,11 +23,9 @@ public class PathConstraint implements Updatable { rotateMix = data.rotateMix; translateMix = data.translateMix; scaleMix = data.scaleMix; - bones = new Array(data.bones.size); for (BoneData boneData : data.bones) bones.add(skeleton.findBone(boneData.name)); - target = skeleton.findSlot(data.target.name); } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java index 253ad77f2..f53726a19 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java @@ -137,7 +137,7 @@ public class SkeletonRendererDebug { } if (drawMeshHull && hullLength > 0) { shapes.setColor(attachmentLineColor); - hullLength = hullLength / 2 * 5; + hullLength = (hullLength >> 1) * 5; float lastX = vertices[hullLength - 5], lastY = vertices[hullLength - 4]; for (int ii = 0, nn = hullLength; ii < nn; ii += 5) { float x = vertices[ii], y = vertices[ii + 1]; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java index 67858ab5e..bf484eb36 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java @@ -19,7 +19,6 @@ public class TransformConstraint implements Updatable { translateMix = data.translateMix; scaleMix = data.scaleMix; shearMix = data.shearMix; - bone = skeleton.findBone(data.bone.name); target = skeleton.findBone(data.target.name); } @@ -29,12 +28,12 @@ public class TransformConstraint implements Updatable { if (constraint == null) throw new IllegalArgumentException("constraint cannot be null."); if (skeleton == null) throw new IllegalArgumentException("skeleton cannot be null."); data = constraint.data; - bone = skeleton.bones.get(constraint.bone.data.index); - target = skeleton.bones.get(constraint.target.data.index); rotateMix = constraint.rotateMix; translateMix = constraint.translateMix; scaleMix = constraint.scaleMix; shearMix = constraint.shearMix; + bone = skeleton.bones.get(constraint.bone.data.index); + target = skeleton.bones.get(constraint.target.data.index); } public void apply () { diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java index b9fdefa6b..23c94ea17 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/MeshAttachment.java @@ -72,7 +72,7 @@ public class MeshAttachment extends VertexAttachment { public void updateUVs () { float[] regionUVs = this.regionUVs; int verticesLength = regionUVs.length; - int worldVerticesLength = verticesLength / 2 * 5; + int worldVerticesLength = (verticesLength >> 1) * 5; if (worldVertices == null || worldVertices.length != worldVerticesLength) worldVertices = new float[worldVerticesLength]; float u, v, width, height; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionSequenceAttachment.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionSequenceAttachment.java index 2e70db9bc..53f0f0060 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionSequenceAttachment.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionSequenceAttachment.java @@ -58,7 +58,7 @@ public class RegionSequenceAttachment extends RegionAttachment { frameIndex = frameIndex % regions.length; break; case pingPong: - frameIndex = frameIndex % (regions.length * 2); + frameIndex = frameIndex % (regions.length << 1); if (frameIndex >= regions.length) frameIndex = regions.length - 1 - (frameIndex - regions.length); break; case random: