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

[c][cpp] Ported fix for #1224, disable inherit scale.

Browse Source
This commit is contained in:
badlogic 2018-12-10 15:06:51 +01:00
parent de543b2cfc
commit 86334f50ff
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/Bone.c
View File

@ -154,6 +154,8 @@ void spBone_updateWorldTransformWith (spBone* self, float x, float y, float rota
za *= s; za *= s;
zc *= s; zc *= s;
s = SQRT(za * za + zc * zc); s = SQRT(za * za + zc * zc);
if (self->data->transformMode == SP_TRANSFORMMODE_NOSCALE && (pa * pd - pb * pc < 0) != (sx < 0 != sy < 0))
s = -s;
r = PI / 2 + ATAN2(zc, za); r = PI / 2 + ATAN2(zc, za);
zb = COS(r) * s; zb = COS(r) * s;
zd = SIN(r) * s; zd = SIN(r) * s;

3
spine-cpp/spine-cpp/src/spine/Bone.cpp
View File

@ -183,6 +183,9 @@ Bone::updateWorldTransform(float x, float y, float rotation, float scaleX, float
za *= s; za *= s;
zc *= s; zc *= s;
s = MathUtil::sqrt(za * za + zc * zc); s = MathUtil::sqrt(za * za + zc * zc);
if (_data.getTransformMode() == TransformMode_NoScale
&& (pa * pd - pb * pc < 0) != (_skeleton.getScaleX() < 0 != _skeleton.getScaleY() < 0))
s = -s;
r = MathUtil::Pi / 2 + MathUtil::atan2(zc, za); r = MathUtil::Pi / 2 + MathUtil::atan2(zc, za);
zb = MathUtil::cos(r) * s; zb = MathUtil::cos(r) * s;
zd = MathUtil::sin(r) * s; zd = MathUtil::sin(r) * s;