mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
[ts] Port of additional fix for #1668.
This commit is contained in:
parent
d7203eec1a
commit
4c2788a558
@ -2564,6 +2564,8 @@ var spine;
|
|||||||
var prx = 0;
|
var prx = 0;
|
||||||
if (s > 0.0001) {
|
if (s > 0.0001) {
|
||||||
s = Math.abs(pa * pd - pb * pc) / s;
|
s = Math.abs(pa * pd - pb * 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) * spine.MathUtils.radDeg;
|
prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
|
||||||
@ -2583,7 +2585,7 @@ var spine;
|
|||||||
this.b = pa * lb - pb * ld;
|
this.b = pa * lb - pb * ld;
|
||||||
this.c = pc * la + pd * lc;
|
this.c = pc * la + pd * lc;
|
||||||
this.d = pc * lb + pd * ld;
|
this.d = pc * lb + pd * ld;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case spine.TransformMode.NoScale:
|
case spine.TransformMode.NoScale:
|
||||||
case spine.TransformMode.NoScaleOrReflection: {
|
case spine.TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2564,6 +2564,8 @@ var spine;
|
|||||||
var prx = 0;
|
var prx = 0;
|
||||||
if (s > 0.0001) {
|
if (s > 0.0001) {
|
||||||
s = Math.abs(pa * pd - pb * pc) / s;
|
s = Math.abs(pa * pd - pb * 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) * spine.MathUtils.radDeg;
|
prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
|
||||||
@ -2583,7 +2585,7 @@ var spine;
|
|||||||
this.b = pa * lb - pb * ld;
|
this.b = pa * lb - pb * ld;
|
||||||
this.c = pc * la + pd * lc;
|
this.c = pc * la + pd * lc;
|
||||||
this.d = pc * lb + pd * ld;
|
this.d = pc * lb + pd * ld;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case spine.TransformMode.NoScale:
|
case spine.TransformMode.NoScale:
|
||||||
case spine.TransformMode.NoScaleOrReflection: {
|
case spine.TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2564,6 +2564,8 @@ var spine;
|
|||||||
var prx = 0;
|
var prx = 0;
|
||||||
if (s > 0.0001) {
|
if (s > 0.0001) {
|
||||||
s = Math.abs(pa * pd - pb * pc) / s;
|
s = Math.abs(pa * pd - pb * 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) * spine.MathUtils.radDeg;
|
prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
|
||||||
@ -2583,7 +2585,7 @@ var spine;
|
|||||||
this.b = pa * lb - pb * ld;
|
this.b = pa * lb - pb * ld;
|
||||||
this.c = pc * la + pd * lc;
|
this.c = pc * la + pd * lc;
|
||||||
this.d = pc * lb + pd * ld;
|
this.d = pc * lb + pd * ld;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case spine.TransformMode.NoScale:
|
case spine.TransformMode.NoScale:
|
||||||
case spine.TransformMode.NoScaleOrReflection: {
|
case spine.TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2564,6 +2564,8 @@ var spine;
|
|||||||
var prx = 0;
|
var prx = 0;
|
||||||
if (s > 0.0001) {
|
if (s > 0.0001) {
|
||||||
s = Math.abs(pa * pd - pb * pc) / s;
|
s = Math.abs(pa * pd - pb * 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) * spine.MathUtils.radDeg;
|
prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
|
||||||
@ -2583,7 +2585,7 @@ var spine;
|
|||||||
this.b = pa * lb - pb * ld;
|
this.b = pa * lb - pb * ld;
|
||||||
this.c = pc * la + pd * lc;
|
this.c = pc * la + pd * lc;
|
||||||
this.d = pc * lb + pd * ld;
|
this.d = pc * lb + pd * ld;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case spine.TransformMode.NoScale:
|
case spine.TransformMode.NoScale:
|
||||||
case spine.TransformMode.NoScaleOrReflection: {
|
case spine.TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2564,6 +2564,8 @@ var spine;
|
|||||||
var prx = 0;
|
var prx = 0;
|
||||||
if (s > 0.0001) {
|
if (s > 0.0001) {
|
||||||
s = Math.abs(pa * pd - pb * pc) / s;
|
s = Math.abs(pa * pd - pb * 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) * spine.MathUtils.radDeg;
|
prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
|
||||||
@ -2583,7 +2585,7 @@ var spine;
|
|||||||
this.b = pa * lb - pb * ld;
|
this.b = pa * lb - pb * ld;
|
||||||
this.c = pc * la + pd * lc;
|
this.c = pc * la + pd * lc;
|
||||||
this.d = pc * lb + pd * ld;
|
this.d = pc * lb + pd * ld;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case spine.TransformMode.NoScale:
|
case spine.TransformMode.NoScale:
|
||||||
case spine.TransformMode.NoScaleOrReflection: {
|
case spine.TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -2564,6 +2564,8 @@ var spine;
|
|||||||
var prx = 0;
|
var prx = 0;
|
||||||
if (s > 0.0001) {
|
if (s > 0.0001) {
|
||||||
s = Math.abs(pa * pd - pb * pc) / s;
|
s = Math.abs(pa * pd - pb * 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) * spine.MathUtils.radDeg;
|
prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
|
||||||
@ -2583,7 +2585,7 @@ var spine;
|
|||||||
this.b = pa * lb - pb * ld;
|
this.b = pa * lb - pb * ld;
|
||||||
this.c = pc * la + pd * lc;
|
this.c = pc * la + pd * lc;
|
||||||
this.d = pc * lb + pd * ld;
|
this.d = pc * lb + pd * ld;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case spine.TransformMode.NoScale:
|
case spine.TransformMode.NoScale:
|
||||||
case spine.TransformMode.NoScaleOrReflection: {
|
case spine.TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -201,6 +201,8 @@ module spine {
|
|||||||
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 - pb * 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;
|
||||||
@ -219,7 +221,7 @@ module spine {
|
|||||||
this.b = pa * lb - pb * ld;
|
this.b = pa * lb - pb * ld;
|
||||||
this.c = pc * la + pd * lc;
|
this.c = pc * la + pd * lc;
|
||||||
this.d = pc * lb + pd * ld;
|
this.d = pc * lb + pd * ld;
|
||||||
return;
|
break;
|
||||||
}
|
}
|
||||||
case TransformMode.NoScale:
|
case TransformMode.NoScale:
|
||||||
case TransformMode.NoScaleOrReflection: {
|
case TransformMode.NoScaleOrReflection: {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user