mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-21 01:36:02 +08:00
[ts] Ported fix for #1224, disable inherit scale.
This commit is contained in:
parent
86334f50ff
commit
dd2d63a2ee
@ -2489,6 +2489,9 @@ var spine;
|
|||||||
za *= s;
|
za *= s;
|
||||||
zc *= s;
|
zc *= s;
|
||||||
s = Math.sqrt(za * za + zc * zc);
|
s = Math.sqrt(za * za + zc * zc);
|
||||||
|
if (this.data.transformMode == spine.TransformMode.NoScale
|
||||||
|
&& (pa * pd - pb * pc < 0) != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
||||||
|
s = -s;
|
||||||
var r = Math.PI / 2 + Math.atan2(zc, za);
|
var r = Math.PI / 2 + Math.atan2(zc, za);
|
||||||
var zb = Math.cos(r) * s;
|
var zb = Math.cos(r) * s;
|
||||||
var zd = Math.sin(r) * s;
|
var zd = Math.sin(r) * s;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2489,6 +2489,9 @@ var spine;
|
|||||||
za *= s;
|
za *= s;
|
||||||
zc *= s;
|
zc *= s;
|
||||||
s = Math.sqrt(za * za + zc * zc);
|
s = Math.sqrt(za * za + zc * zc);
|
||||||
|
if (this.data.transformMode == spine.TransformMode.NoScale
|
||||||
|
&& (pa * pd - pb * pc < 0) != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
||||||
|
s = -s;
|
||||||
var r = Math.PI / 2 + Math.atan2(zc, za);
|
var r = Math.PI / 2 + Math.atan2(zc, za);
|
||||||
var zb = Math.cos(r) * s;
|
var zb = Math.cos(r) * s;
|
||||||
var zd = Math.sin(r) * s;
|
var zd = Math.sin(r) * s;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2489,6 +2489,9 @@ var spine;
|
|||||||
za *= s;
|
za *= s;
|
||||||
zc *= s;
|
zc *= s;
|
||||||
s = Math.sqrt(za * za + zc * zc);
|
s = Math.sqrt(za * za + zc * zc);
|
||||||
|
if (this.data.transformMode == spine.TransformMode.NoScale
|
||||||
|
&& (pa * pd - pb * pc < 0) != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
||||||
|
s = -s;
|
||||||
var r = Math.PI / 2 + Math.atan2(zc, za);
|
var r = Math.PI / 2 + Math.atan2(zc, za);
|
||||||
var zb = Math.cos(r) * s;
|
var zb = Math.cos(r) * s;
|
||||||
var zd = Math.sin(r) * s;
|
var zd = Math.sin(r) * s;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2489,6 +2489,9 @@ var spine;
|
|||||||
za *= s;
|
za *= s;
|
||||||
zc *= s;
|
zc *= s;
|
||||||
s = Math.sqrt(za * za + zc * zc);
|
s = Math.sqrt(za * za + zc * zc);
|
||||||
|
if (this.data.transformMode == spine.TransformMode.NoScale
|
||||||
|
&& (pa * pd - pb * pc < 0) != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
||||||
|
s = -s;
|
||||||
var r = Math.PI / 2 + Math.atan2(zc, za);
|
var r = Math.PI / 2 + Math.atan2(zc, za);
|
||||||
var zb = Math.cos(r) * s;
|
var zb = Math.cos(r) * s;
|
||||||
var zd = Math.sin(r) * s;
|
var zd = Math.sin(r) * s;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2489,6 +2489,9 @@ var spine;
|
|||||||
za *= s;
|
za *= s;
|
||||||
zc *= s;
|
zc *= s;
|
||||||
s = Math.sqrt(za * za + zc * zc);
|
s = Math.sqrt(za * za + zc * zc);
|
||||||
|
if (this.data.transformMode == spine.TransformMode.NoScale
|
||||||
|
&& (pa * pd - pb * pc < 0) != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
||||||
|
s = -s;
|
||||||
var r = Math.PI / 2 + Math.atan2(zc, za);
|
var r = Math.PI / 2 + Math.atan2(zc, za);
|
||||||
var zb = Math.cos(r) * s;
|
var zb = Math.cos(r) * s;
|
||||||
var zd = Math.sin(r) * s;
|
var zd = Math.sin(r) * s;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2489,6 +2489,9 @@ var spine;
|
|||||||
za *= s;
|
za *= s;
|
||||||
zc *= s;
|
zc *= s;
|
||||||
s = Math.sqrt(za * za + zc * zc);
|
s = Math.sqrt(za * za + zc * zc);
|
||||||
|
if (this.data.transformMode == spine.TransformMode.NoScale
|
||||||
|
&& (pa * pd - pb * pc < 0) != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
||||||
|
s = -s;
|
||||||
var r = Math.PI / 2 + Math.atan2(zc, za);
|
var r = Math.PI / 2 + Math.atan2(zc, za);
|
||||||
var zb = Math.cos(r) * s;
|
var zb = Math.cos(r) * s;
|
||||||
var zd = Math.sin(r) * s;
|
var zd = Math.sin(r) * s;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -150,6 +150,8 @@ module spine {
|
|||||||
za *= s;
|
za *= s;
|
||||||
zc *= s;
|
zc *= s;
|
||||||
s = Math.sqrt(za * za + zc * zc);
|
s = Math.sqrt(za * za + zc * zc);
|
||||||
|
if (this.data.transformMode == TransformMode.NoScale
|
||||||
|
&& (pa * pd - pb * pc < 0) != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0)) s = -s;
|
||||||
let r = Math.PI / 2 + Math.atan2(zc, za);
|
let r = Math.PI / 2 + Math.atan2(zc, za);
|
||||||
let zb = Math.cos(r) * s;
|
let zb = Math.cos(r) * s;
|
||||||
let zd = Math.sin(r) * s;
|
let zd = Math.sin(r) * s;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user