Эх сурвалжийг харах

[ts] Port of additional fix for #1668.

badlogic 5 жил өмнө
parent
commit
4c2788a558

+ 3 - 1
spine-ts/build/spine-all.js

@@ -2564,6 +2564,8 @@ var spine;
 					var prx = 0;
 					if (s > 0.0001) {
 						s = Math.abs(pa * pd - pb * pc) / s;
+						pa /= this.skeleton.scaleX;
+						pc /= this.skeleton.scaleY;
 						pb = pc * s;
 						pd = pa * s;
 						prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
@@ -2583,7 +2585,7 @@ var spine;
 					this.b = pa * lb - pb * ld;
 					this.c = pc * la + pd * lc;
 					this.d = pc * lb + pd * ld;
-					return;
+					break;
 				}
 				case spine.TransformMode.NoScale:
 				case spine.TransformMode.NoScaleOrReflection: {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 3 - 1
spine-ts/build/spine-canvas.js

@@ -2564,6 +2564,8 @@ var spine;
 					var prx = 0;
 					if (s > 0.0001) {
 						s = Math.abs(pa * pd - pb * pc) / s;
+						pa /= this.skeleton.scaleX;
+						pc /= this.skeleton.scaleY;
 						pb = pc * s;
 						pd = pa * s;
 						prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
@@ -2583,7 +2585,7 @@ var spine;
 					this.b = pa * lb - pb * ld;
 					this.c = pc * la + pd * lc;
 					this.d = pc * lb + pd * ld;
-					return;
+					break;
 				}
 				case spine.TransformMode.NoScale:
 				case spine.TransformMode.NoScaleOrReflection: {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 3 - 1
spine-ts/build/spine-core.js

@@ -2564,6 +2564,8 @@ var spine;
 					var prx = 0;
 					if (s > 0.0001) {
 						s = Math.abs(pa * pd - pb * pc) / s;
+						pa /= this.skeleton.scaleX;
+						pc /= this.skeleton.scaleY;
 						pb = pc * s;
 						pd = pa * s;
 						prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
@@ -2583,7 +2585,7 @@ var spine;
 					this.b = pa * lb - pb * ld;
 					this.c = pc * la + pd * lc;
 					this.d = pc * lb + pd * ld;
-					return;
+					break;
 				}
 				case spine.TransformMode.NoScale:
 				case spine.TransformMode.NoScaleOrReflection: {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 3 - 1
spine-ts/build/spine-player.js

@@ -2564,6 +2564,8 @@ var spine;
 					var prx = 0;
 					if (s > 0.0001) {
 						s = Math.abs(pa * pd - pb * pc) / s;
+						pa /= this.skeleton.scaleX;
+						pc /= this.skeleton.scaleY;
 						pb = pc * s;
 						pd = pa * s;
 						prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
@@ -2583,7 +2585,7 @@ var spine;
 					this.b = pa * lb - pb * ld;
 					this.c = pc * la + pd * lc;
 					this.d = pc * lb + pd * ld;
-					return;
+					break;
 				}
 				case spine.TransformMode.NoScale:
 				case spine.TransformMode.NoScaleOrReflection: {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-player.js.map


+ 3 - 1
spine-ts/build/spine-threejs.js

@@ -2564,6 +2564,8 @@ var spine;
 					var prx = 0;
 					if (s > 0.0001) {
 						s = Math.abs(pa * pd - pb * pc) / s;
+						pa /= this.skeleton.scaleX;
+						pc /= this.skeleton.scaleY;
 						pb = pc * s;
 						pd = pa * s;
 						prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
@@ -2583,7 +2585,7 @@ var spine;
 					this.b = pa * lb - pb * ld;
 					this.c = pc * la + pd * lc;
 					this.d = pc * lb + pd * ld;
-					return;
+					break;
 				}
 				case spine.TransformMode.NoScale:
 				case spine.TransformMode.NoScaleOrReflection: {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 3 - 1
spine-ts/build/spine-webgl.js

@@ -2564,6 +2564,8 @@ var spine;
 					var prx = 0;
 					if (s > 0.0001) {
 						s = Math.abs(pa * pd - pb * pc) / s;
+						pa /= this.skeleton.scaleX;
+						pc /= this.skeleton.scaleY;
 						pb = pc * s;
 						pd = pa * s;
 						prx = Math.atan2(pc, pa) * spine.MathUtils.radDeg;
@@ -2583,7 +2585,7 @@ var spine;
 					this.b = pa * lb - pb * ld;
 					this.c = pc * la + pd * lc;
 					this.d = pc * lb + pd * ld;
-					return;
+					break;
 				}
 				case spine.TransformMode.NoScale:
 				case spine.TransformMode.NoScaleOrReflection: {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 3 - 1
spine-ts/core/src/Bone.ts

@@ -201,6 +201,8 @@ module spine {
 				let prx = 0;
 				if (s > 0.0001) {
 					s = Math.abs(pa * pd - pb * pc) / s;
+					pa /= this.skeleton.scaleX;
+					pc /= this.skeleton.scaleY;
 					pb = pc * s;
 					pd = pa * s;
 					prx = Math.atan2(pc, pa) * MathUtils.radDeg;
@@ -219,7 +221,7 @@ module spine {
 				this.b = pa * lb - pb * ld;
 				this.c = pc * la + pd * lc;
 				this.d = pc * lb + pd * ld;
-				return;
+				break;
 			}
 			case TransformMode.NoScale:
 			case TransformMode.NoScaleOrReflection: {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно