Fixed root bone translation.

Again.
EsotericSoftware · Jan 16, 2014 · 2b241c3 · 2b241c3
1 parent 9787e7c
commit 2b241c3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/spine-as3/spine-as3/src/spine/Bone.as b/spine-as3/spine-as3/src/spine/Bone.as
@@ -73,7 +73,7 @@ public class Bone {
 			_worldRotation = _data.inheritRotation ? _parent._worldRotation + rotation : rotation;
 		} else {
 			_worldX = flipX ? -x : x;
-			_worldY = (flipY && spine.Bone.yDown != flipY) ? -y : y;
+			_worldY = flipY != yDown ? -y : y;
 			_worldScaleX = scaleX;
 			_worldScaleY = scaleY;
 			_worldRotation = rotation;

diff --git a/spine-c/src/spine/Bone.c b/spine-c/src/spine/Bone.c
@@ -71,7 +71,7 @@ void spBone_updateWorldTransform (spBone* self, int flipX, int flipY) {
 				self->data->inheritRotation ? self->parent->worldRotation + self->rotation : self->rotation;
 	} else {
 		CONST_CAST(float, self->worldX) = flipX ? -self->x : self->x;
-		CONST_CAST(float, self->worldY) = (flipY && flipY != yDown) ? -self->y : self->y;
+		CONST_CAST(float, self->worldY) = flipY != yDown ? -self->y : self->y;
 		CONST_CAST(float, self->worldScaleX) = self->scaleX;
 		CONST_CAST(float, self->worldScaleY) = self->scaleY;
 		CONST_CAST(float, self->worldRotation) = self->rotation;

diff --git a/spine-csharp/src/Bone.cs b/spine-csharp/src/Bone.cs
@@ -80,7 +80,7 @@ public class Bone {
 				worldRotation = data.inheritRotation ? parent.worldRotation + rotation : rotation;
 			} else {
 				worldX = flipX ? -x : x;
-				worldY = (flipY && flipY != yDown) ? -y : y;
+				worldY = flipY != yDown ? -y : y;
 				worldScaleX = scaleX;
 				worldScaleY = scaleY;
 				worldRotation = rotation;

diff --git a/spine-js/spine.js b/spine-js/spine.js
@@ -80,7 +80,7 @@ spine.Bone.prototype = {
 			this.worldRotation = this.data.inheritRotation ? parent.worldRotation + this.rotation : this.rotation;
 		} else {
 			this.worldX = flipX ? -this.x : this.x;
-			this.worldY = (flipY && spine.Bone.yDown != flipY) ? -this.y : this.y;
+			this.worldY = flipY != spine.Bone.yDown ? -this.y : this.y;
 			this.worldScaleX = this.scaleX;
 			this.worldScaleY = this.scaleY;
 			this.worldRotation = this.rotation;