浏览代码

[as3] Port of additional fix for #1668.

badlogic 5 年之前
父节点
当前提交
b53bccf627
共有 3 个文件被更改,包括 3 次插入1 次删除
  1. 二进制
      spine-as3/spine-as3/lib/spine-as3.swc
  2. 3 1
      spine-as3/spine-as3/src/spine/Bone.as
  3. 二进制
      spine-starling/spine-starling/lib/spine-starling.swc

二进制
spine-as3/spine-as3/lib/spine-as3.swc


+ 3 - 1
spine-as3/spine-as3/src/spine/Bone.as

@@ -143,6 +143,8 @@ package spine {
 					var prx : Number = 0;
 					var prx : Number = 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;
@@ -161,7 +163,7 @@ package 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: {

二进制
spine-starling/spine-starling/lib/spine-starling.swc