UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

13
spine-ts/spine-core/src/Bone.ts
View File

@ -200,12 +200,13 @@ export class Bone implements Updatable {
break; break;
} }
case Inherit.NoRotationOrReflection: { case Inherit.NoRotationOrReflection: {
let sx = 1 / this.skeleton.scaleX, sy = 1 / this.skeleton.scaleY;
pa *= sx;
pc *= sy;
let s = pa * pa + pc * pc; let s = pa * pa + pc * pc;
let prx = 0; let prx = 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;
pa /= this.skeleton.scaleX;
pc /= this.skeleton.scaleY;
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;
@ -311,10 +312,8 @@ export class Bone implements Updatable {
switch (this.inherit) { switch (this.inherit) {
case Inherit.NoRotationOrReflection: { case Inherit.NoRotationOrReflection: {
let s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc); let s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
let sa = pa / this.skeleton.scaleX; pb = -pc * this.skeleton.scaleX * s / this.skeleton.scaleY;
let sc = pc / this.skeleton.scaleY; pd = pa * this.skeleton.scaleY * s / this.skeleton.scaleX;
pb = -sc * s * this.skeleton.scaleX;
pd = sa * s * this.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;