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

Clean up.

Browse Source
This commit is contained in:
NathanSweet 2016-05-28 01:33:45 +02:00
parent 463020e254
commit 1fa2b35e09
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/BoneData.java
View File

@ -39,7 +39,7 @@ public class BoneData {
final BoneData parent;
float length;
float x, y, rotation, scaleX = 1, scaleY = 1, shearX, shearY;
boolean inheritScale = true, inheritRotation = true;
boolean inheritRotation = true, inheritScale = true;
// Nonessential.
final Color color = new Color(0.61f, 0.61f, 0.61f, 1);
@ -156,14 +156,6 @@ public class BoneData {
this.shearY = shearY;
}
public boolean getInheritScale () {
return inheritScale;
}
public void setInheritScale (boolean inheritScale) {
this.inheritScale = inheritScale;
}
public boolean getInheritRotation () {
return inheritRotation;
}
@ -172,6 +164,14 @@ public class BoneData {
this.inheritRotation = inheritRotation;
}
public boolean getInheritScale () {
return inheritScale;
}
public void setInheritScale (boolean inheritScale) {
this.inheritScale = inheritScale;
}
public Color getColor () {
return color;
}

2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java
View File

@ -123,8 +123,8 @@ public class SkeletonJson {
data.scaleY = boneMap.getFloat("scaleY", 1);
data.shearX = boneMap.getFloat("shearX", 0);
data.shearY = boneMap.getFloat("shearY", 0);
data.inheritScale = boneMap.getBoolean("inheritScale", true);
data.inheritRotation = boneMap.getBoolean("inheritRotation", true);
data.inheritScale = boneMap.getBoolean("inheritScale", true);
String color = boneMap.getString("color", null);
if (color != null) data.getColor().set(Color.valueOf(color));