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

[haxe] Port of commit d769c1a: Fixed noRotationOrReflection with skeleton scale.

Browse Source
This commit is contained in:
Davide Tantillo 2024-09-09 11:16:29 +02:00
parent cd69a7c78a
commit 44c7b9120a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-haxe/spine-haxe/spine/Bone.hx
View File

@ -173,10 +173,14 @@ class Bone implements Updatable {
c = Math.sin(rx) * scaleX; c = Math.sin(rx) * scaleX;
d = Math.sin(ry) * scaleY; d = Math.sin(ry) * scaleY;
case Inherit.noRotationOrReflection: case Inherit.noRotationOrReflection:
var sx:Float = 1 / skeleton.scaleX;
var sy:Float = 1 / skeleton.scaleY;
pa *= sx;
pc *= sy;
s = pa * pa + pc * pc; s = pa * pa + pc * pc;
var prx:Float = 0; var prx:Float = 0;
if (s > 0.0001) { if (s > 0.0001) {
s = Math.abs(pa * pd - pb * pc) / s; s = Math.abs(pa * pd * sy - pb * sx * pc) / s;
pb = pc * s; pb = pc * s;
pd = pa * s; pd = pa * s;
prx = Math.atan2(pc, pa) * MathUtils.radDeg; prx = Math.atan2(pc, pa) * MathUtils.radDeg;
@ -280,10 +284,8 @@ class Bone implements Updatable {
switch (inherit) { switch (inherit) {
case Inherit.noRotationOrReflection: case Inherit.noRotationOrReflection:
var s:Float = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); var s:Float = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
var sa:Float = pa / skeleton.scaleX; pb = -pc * skeleton.scaleX * s / skeleton.scaleY;
var sc:Float = pc / skeleton.scaleY; pd = pa * skeleton.scaleY * s / skeleton.scaleX;
pb = -sc * s * skeleton.scaleX;
pd = sa * s * skeleton.scaleY;
pid = 1 / (pa * pd - pb * pc); pid = 1 / (pa * pd - pb * pc);
ia = pd * pid; ia = pd * pid;
ib = pb * pid; ib = pb * pid;