diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java index 319b7e943..d70c690f6 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java @@ -30,7 +30,7 @@ package com.esotericsoftware.spine; -import static com.esotericsoftware.spine.utils.TrigUtils.*; +import static com.esotericsoftware.spine.utils.SpineUtils.*; import static com.badlogic.gdx.math.Matrix3.*; import com.badlogic.gdx.math.Matrix3; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java index 4929cd9f4..ae51142c6 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java @@ -30,7 +30,7 @@ package com.esotericsoftware.spine; -import static com.esotericsoftware.spine.utils.TrigUtils.*; +import static com.esotericsoftware.spine.utils.SpineUtils.*; import com.badlogic.gdx.utils.Array; 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 582db4387..2913922ad 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java @@ -38,7 +38,7 @@ import com.esotericsoftware.spine.PathConstraintData.RotateMode; import com.esotericsoftware.spine.PathConstraintData.SpacingMode; import com.esotericsoftware.spine.attachments.Attachment; import com.esotericsoftware.spine.attachments.PathAttachment; -import com.esotericsoftware.spine.utils.TrigUtils; +import com.esotericsoftware.spine.utils.SpineUtils; /** Stores the current pose for a path constraint. A path constraint adjusts the rotation, translation, and scale of the * constrained bones so they follow a {@link PathAttachment}. @@ -131,7 +131,7 @@ public class PathConstraint implements Constraint { else { tip = false; Bone p = target.bone; - offsetRotation *= p.a * p.d - p.b * p.c > 0 ? TrigUtils.degRad : -TrigUtils.degRad; + offsetRotation *= p.a * p.d - p.b * p.c > 0 ? SpineUtils.degRad : -SpineUtils.degRad; } for (int i = 0, p = 3; i < boneCount; i++, p += 3) { Bone bone = (Bone)bones[i]; @@ -165,10 +165,10 @@ public class PathConstraint implements Constraint { boneY += (length * (sin * a + cos * c) - dy) * rotateMix; } else r += offsetRotation; - if (r > TrigUtils.PI) - r -= TrigUtils.PI2; - else if (r < -TrigUtils.PI) // - r += TrigUtils.PI2; + if (r > SpineUtils.PI) + r -= SpineUtils.PI2; + else if (r < -SpineUtils.PI) // + r += SpineUtils.PI2; r *= rotateMix; cos = (float)Math.cos(r); sin = (float)Math.sin(r); 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 67e0376f6..62bad7d0b 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java @@ -30,7 +30,7 @@ package com.esotericsoftware.spine; -import static com.esotericsoftware.spine.utils.TrigUtils.*; +import static com.esotericsoftware.spine.utils.SpineUtils.*; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/TrigUtils.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/SpineUtils.java similarity index 99% rename from spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/TrigUtils.java rename to spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/SpineUtils.java index 581d56794..826b892cb 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/TrigUtils.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/SpineUtils.java @@ -30,7 +30,7 @@ package com.esotericsoftware.spine.utils; -public class TrigUtils { +public class SpineUtils { static public final float PI = 3.1415927f; static public final float PI2 = PI * 2; static public final float radiansToDegrees = 180f / PI;