浏览代码

[ts] Port of commit 508e501: Don't wrap angles for transform constraint absolute local.

Davide Tantillo 1 年之前
父节点
当前提交
8b5c66b8f8
共有 1 个文件被更改,包括 2 次插入10 次删除
  1. 2 10
      spine-ts/spine-core/src/TransformConstraint.ts

+ 2 - 10
spine-ts/spine-core/src/TransformConstraint.ts

@@ -248,11 +248,7 @@ export class TransformConstraint implements Updatable {
 			let bone = bones[i];
 			let bone = bones[i];
 
 
 			let rotation = bone.arotation;
 			let rotation = bone.arotation;
-			if (mixRotate != 0) {
-				let r = target.arotation - rotation + this.data.offsetRotation;
-				r -= Math.ceil(r / 360 - 0.5) * 360;
-				rotation += r * mixRotate;
-			}
+			if (mixRotate != 0) rotation += (target.arotation - rotation + this.data.offsetRotation) * mixRotate;
 
 
 			let x = bone.ax, y = bone.ay;
 			let x = bone.ax, y = bone.ay;
 			x += (target.ax - x + this.data.offsetX) * mixX;
 			x += (target.ax - x + this.data.offsetX) * mixX;
@@ -265,11 +261,7 @@ export class TransformConstraint implements Updatable {
 				scaleY = (scaleY + (target.ascaleY - scaleY + this.data.offsetScaleY) * mixScaleY) / scaleY;
 				scaleY = (scaleY + (target.ascaleY - scaleY + this.data.offsetScaleY) * mixScaleY) / scaleY;
 
 
 			let shearY = bone.ashearY;
 			let shearY = bone.ashearY;
-			if (mixShearY != 0) {
-				let r = target.ashearY - shearY + this.data.offsetShearY;
-				r -= Math.ceil(r / 360 - 0.5) * 360;
-				shearY += r * mixShearY;
-			}
+			if (mixShearY != 0) shearY += (target.ashearY - shearY + this.data.offsetShearY) * mixShearY;
 
 
 			bone.updateWorldTransformWith(x, y, rotation, scaleX, scaleY, bone.ashearX, shearY);
 			bone.updateWorldTransformWith(x, y, rotation, scaleX, scaleY, bone.ashearX, shearY);
 		}
 		}