Clean up.

This commit is contained in:
NathanSweet 2016-06-01 02:36:44 +02:00
parent bcee9ede8d
commit a990d6dfdd
6 changed files with 6 additions and 9 deletions

View File

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

View File

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

View File

@ -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];

View File

@ -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 () {

View File

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

View File

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