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] Closes #2509, SP_INHERIT_NOSCALE was incorrectly implemented

Browse Source
This commit is contained in:
Mario Zechner 2024-05-02 16:01:04 +02:00
parent 39635f7566
commit 04c132f4af
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,21 +161,26 @@ void spBone_updateWorldTransformWith(spBone *self, float x, float y, float rotat
float za = (pa * cosine + pb * sine) / sx; float za = (pa * cosine + pb * sine) / sx;
float zc = (pc * cosine + pd * sine) / sy; float zc = (pc * cosine + pd * sine) / sy;
float s = SQRT(za * za + zc * zc); float s = SQRT(za * za + zc * zc);
if (self->data->inherit == SP_INHERIT_NOSCALE && (pa * pd - pb * pc < 0) != (sx < 0 != sy < 0)) if (s > 0.00001f) s = 1 / s;
s = -s; za *= s;
rotation = PI / 2 + ATAN2(zc, za); zc *= s;
float zb = COS(rotation) * s; s = SQRT(za * za + zc * zc);
float zd = SIN(rotation) * s; if (self->inherit == SP_INHERIT_NOSCALE &&
shearX *= DEG_RAD; (pa * pd - pb * pc < 0) != (sx < 0 != sy < 0))
shearY = (90 + shearY) * DEG_RAD; s = -s;
float la = COS(shearX) * scaleX; rotation = PI / 2 + ATAN2(zc, za);
float lb = COS(shearY) * scaleY; float zb = COS(rotation) * s;
float lc = SIN(shearX) * scaleX; float zd = SIN(rotation) * s;
float ld = SIN(shearY) * scaleY; shearX *= DEG_RAD;
self->a = za * la + zb * lc; shearY = (90 + shearY) * DEG_RAD;
self->b = za * lb + zb * ld; float la = COS(shearX) * scaleX;
self->c = zc * la + zd * lc; float lb = COS(shearY) * scaleY;
self->d = zc * lb + zd * ld; float lc = SIN(shearX) * scaleX;
float ld = SIN(shearY) * scaleY;
self->a = za * la + zb * lc;
self->b = za * lb + zb * ld;
self->c = zc * la + zd * lc;
self->d = zc * lb + zd * ld;
} }
} }