UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed skeleton flip when rotation and scale are disabled.

Browse Source
This commit is contained in:
NathanSweet 2016-04-12 23:25:31 +02:00
parent 8c55aa1f62
commit b22669711d
1 changed files with 71 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Bone.java
View File

@ -131,7 +131,8 @@ public class Bone implements Updatable {
b = pa * lb + pb * ld; b = pa * lb + pb * ld;
c = pc * la + pd * lc; c = pc * la + pd * lc;
d = pc * lb + pd * ld; d = pc * lb + pd * ld;
} else if (data.inheritRotation) { // No scale inheritance. } else {
if (data.inheritRotation) { // No scale inheritance.
pa = 1; pa = 1;
pb = 0; pb = 0;
pc = 0; pc = 0;
@ -153,21 +154,13 @@ public class Bone implements Updatable {
b = pa * lb + pb * ld; b = pa * lb + pb * ld;
c = pc * la + pd * lc; c = pc * la + pd * lc;
d = pc * lb + pd * ld; d = pc * lb + pd * ld;
if (skeleton.flipX) {
a = -a;
b = -b;
}
if (skeleton.flipY) {
c = -c;
d = -d;
}
} else if (data.inheritScale) { // No rotation inheritance. } else if (data.inheritScale) { // No rotation inheritance.
pa = 1; pa = 1;
pb = 0; pb = 0;
pc = 0; pc = 0;
pd = 1; pd = 1;
do { do {
float r = parent.rotation; float r = parent.appliedRotation;
cos = MathUtils.cosDeg(r); cos = MathUtils.cosDeg(r);
sin = MathUtils.sinDeg(r); sin = MathUtils.sinDeg(r);
float psx = parent.appliedScaleX, psy = parent.appliedScaleY; float psx = parent.appliedScaleX, psy = parent.appliedScaleY;
@ -196,6 +189,12 @@ public class Bone implements Updatable {
b = pa * lb + pb * ld; b = pa * lb + pb * ld;
c = pc * la + pd * lc; c = pc * la + pd * lc;
d = pc * lb + pd * ld; d = pc * lb + pd * ld;
} else {
a = la;
b = lb;
c = lc;
d = ld;
}
if (skeleton.flipX) { if (skeleton.flipX) {
a = -a; a = -a;
b = -b; b = -b;
@ -204,11 +203,6 @@ public class Bone implements Updatable {
c = -c; c = -c;
d = -d; d = -d;
} }
} else {
a = la;
b = lb;
c = lc;
d = ld;
} }
} }