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

Disable inherit rotation can be stable if also disabling reflection.

Browse Source
This commit is contained in:
NathanSweet 2016-10-07 18:30:25 +02:00
parent a42ce71796
commit 6ef7cf3ba4
2 changed files with 15 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,134 +153,21 @@ public class Bone implements Updatable {
d = sinDeg(rotationY) * scaleY; d = sinDeg(rotationY) * scaleY;
break; break;
} }
case noRotation: { case noRotationOrReflection: {
if (false) { if (pa * pd - pb * pc < 0) {
// Simple loop. pb = -pb;
// 1) Inherits scale in the wrong direction. pd = -pd;
// 2) Doesn't flip.
float rotationY = rotation + 90 + shearY;
float la = cosDeg(rotation + shearX) * scaleX;
float lb = cosDeg(rotationY) * scaleY;
float lc = sinDeg(rotation + shearX) * scaleX;
float ld = sinDeg(rotationY) * scaleY;
Bone current = parent;
while (current != null) {
float ca = Math.abs(current.ascaleX);
float cb = 0;
float cc = 0;
float cd = Math.abs(current.ascaleY);
float za = ca * la + cb * lc;
float zb = ca * lb + cb * ld;
float zc = cc * la + cd * lc;
float zd = cc * lb + cd * ld;
la = za;
lb = zb;
lc = zc;
ld = zd;
current = current.parent;
}
a = la;
b = lb;
c = lc;
d = ld;
} else if (false) {
// Summing parent rotations.
// 1) Negative parent scale causes bone to rotate.
float sum = 0;
Bone current = parent;
while (current != null) {
sum += current.arotation;
current = current.parent;
}
rotation -= sum;
float rotationY = rotation + 90 + shearY;
float la = cosDeg(rotation + shearX) * scaleX;
float lb = cosDeg(rotationY) * scaleY;
float lc = sinDeg(rotation + shearX) * scaleX;
float ld = sinDeg(rotationY) * scaleY;
a = pa * la + pb * lc;
b = pa * lb + pb * ld;
c = pc * la + pd * lc;
d = pc * lb + pd * ld;
} else if (true) {
// Old way.
// 1) Immediate parent scale is applied in wrong direction.
// 2) Negative parent scale causes bone to rotate.
pa = 1;
pb = 0;
pc = 0;
pd = 1;
float rotationY, la, lb, lc, ld;
outer:
do {
if (!parent.appliedValid) parent.updateAppliedTransform();
float pr = parent.arotation, psx = parent.ascaleX;
rotationY = pr + 90 + parent.ashearY;
la = cosDeg(pr + parent.shearX);
lb = cosDeg(rotationY);
lc = sinDeg(pr + parent.shearX);
ld = sinDeg(rotationY);
float temp = (pa * la + pb * lc) * psx;
pb = (pb * ld + pa * lb) * parent.ascaleY;
pa = temp;
temp = (pc * la + pd * lc) * psx;
pd = (pd * ld + pc * lb) * parent.ascaleY;
pc = temp;
if (psx < 0) lc = -lc;
temp = pa * la - pb * lc;
pb = pb * ld - pa * lb;
pa = temp;
temp = pc * la - pd * lc;
pd = pd * ld - pc * lb;
pc = temp;
switch (parent.data.transformMode) {
case noScale:
case noScaleOrReflection:
break outer;
}
parent = parent.parent;
} while (parent != null);
rotationY = rotation + 90 + shearY;
la = cosDeg(rotation + shearX) * scaleX;
lb = cosDeg(rotationY) * scaleY;
lc = sinDeg(rotation + shearX) * scaleX;
ld = sinDeg(rotationY) * scaleY;
a = pa * la + pb * lc;
b = pa * lb + pb * ld;
c = pc * la + pd * lc;
d = pc * lb + pd * ld;
} else {
// New way.
// 1) Negative scale can cause bone to flip.
float psx = (float)Math.sqrt(pa * pa + pc * pc), psy, pr;
if (psx > 0.0001f) {
float det = pa * pd - pb * pc;
psy = det / psx;
pr = atan2(pc, pa) * radDeg;
} else {
psx = 0;
psy = (float)Math.sqrt(pb * pb + pd * pd);
pr = 90 - atan2(pd, pb) * radDeg;
}
float blend;
if (pr < -90)
blend = 1 + (pr + 90) / 90;
else if (pr < 0)
blend = -pr / 90;
else if (pr < 90)
blend = pr / 90;
else
blend = 1 - (pr - 90) / 90;
pa = psx + (Math.abs(psy) * Math.signum(psx) - psx) * blend;
pd = psy + (Math.abs(psx) * Math.signum(psy) - psy) * blend;
float rotationY = rotation + 90 + shearY;
a = pa * cosDeg(rotation + shearX) * scaleX;
b = pa * cosDeg(rotationY) * scaleY;
c = pd * sinDeg(rotation + shearX) * scaleX;
d = pd * sinDeg(rotationY) * scaleY;
} }
rotation -= atan2(pc, pa) * radDeg;
float rotationY = rotation + 90 + shearY;
float la = cosDeg(rotation + shearX) * scaleX;
float lb = cosDeg(rotationY) * scaleY;
float lc = sinDeg(rotation + shearX) * scaleX;
float ld = sinDeg(rotationY) * scaleY;
a = pa * la + pb * lc;
b = pa * lb + pb * ld;
c = pc * la + pd * lc;
d = pc * lb + pd * ld;
break; break;
} }
case noScale: case noScale:

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

@ -174,7 +174,7 @@ public class BoneData {
} }
static public enum TransformMode { static public enum TransformMode {
normal, onlyTranslation, noRotation, noScale, noScaleOrReflection; normal, onlyTranslation, noRotationOrReflection, noScale, noScaleOrReflection;
static public final TransformMode[] values = TransformMode.values(); static public final TransformMode[] values = TransformMode.values();
} }