UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libgdx] New math for disable inherit scale.

Browse Source 
More stable (fixes rotation with negative scale) but slightly different behavior: scaling parent bones can cause the rotation to change on a bone with disable inherit scale. This seems like sane behavior though, so likely worth the change. More here:
http://esotericsoftware.com/forum/Disabling-inherit-scale-breaks-rotation-v3-4-0-1-6757
This commit is contained in:
NathanSweet 2016-08-05 01:42:24 +02:00
parent 81a4e3ea1d
commit 2dee5d6103
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,26 +134,26 @@ public class Bone implements Updatable {
d = pc * lb + pd * ld; d = pc * lb + pd * ld;
} else { } else {
if (data.inheritRotation) { // No scale inheritance. if (data.inheritRotation) { // No scale inheritance.
pa = 1;
pb = 0;
pc = 0;
pd = 1;
do {
float cos = cosDeg(parent.appliedRotation), sin = sinDeg(parent.appliedRotation);
float temp = pa * cos + pb * sin;
pb = pb * cos - pa * sin;
pa = temp;
temp = pc * cos + pd * sin;
pd = pd * cos - pc * sin;
pc = temp;
if (!parent.data.inheritRotation) break;
parent = parent.parent;
} while (parent != null);
a = pa * la + pb * lc; a = pa * la + pb * lc;
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;
float bs = (float)Math.sqrt(a * a + c * c), s = bs > 0.00001f ? 1 / bs : 0;
a *= s;
c *= s;
bs = (float)Math.sqrt(b * b + d * d);
s = bs > 0.00001f ? 1 / bs : 0;
b *= s;
d *= s;
float by = atan2(d, b);
float r = PI / 2 - (by - atan2(c, a));
if (r > PI)
r -= PI2;
else if (r < -PI) r += PI2;
r += by;
s = (float)Math.sqrt(b * b + d * d);
b = cos(r) * s;
d = sin(r) * s;
} else if (data.inheritScale) { // No rotation inheritance. } else if (data.inheritScale) { // No rotation inheritance.
pa = 1; pa = 1;
pb = 0; pb = 0;