mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-26 19:51:47 +08:00
Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8
This commit is contained in:
commit
9e7ff6ad2c
@ -189,6 +189,8 @@ namespace Spine {
|
|||||||
float s = pa * pa + pc * pc, prx;
|
float s = pa * pa + pc * pc, prx;
|
||||||
if (s > 0.0001f) {
|
if (s > 0.0001f) {
|
||||||
s = Math.Abs(pa * pd - pb * pc) / s;
|
s = Math.Abs(pa * pd - pb * pc) / s;
|
||||||
|
pa /= skeleton.ScaleX;
|
||||||
|
pc /= skeleton.ScaleY;
|
||||||
pb = pc * s;
|
pb = pc * s;
|
||||||
pd = pa * s;
|
pd = pa * s;
|
||||||
prx = MathUtils.Atan2(pc, pa) * MathUtils.RadDeg;
|
prx = MathUtils.Atan2(pc, pa) * MathUtils.RadDeg;
|
||||||
@ -207,7 +209,7 @@ namespace Spine {
|
|||||||
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;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case TransformMode.NoScale:
|
case TransformMode.NoScale:
|
||||||
case TransformMode.NoScaleOrReflection: {
|
case TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user