From 3736352c09e5dedce668bb6e2069e2f2e170234d Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Wed, 8 May 2013 13:01:10 +0200 Subject: [PATCH] Fixed flip x/y for root bone. (reverse-merged from commit 64fd34ba9426e2c7637526b1029721000c14ad5b) #43 --- spine-as3/spine-as3/src/spine/Bone.as | 4 ++-- spine-c/src/spine/Bone.c | 4 ++-- spine-csharp/src/Bone.cs | 4 ++-- spine-js/spine.js | 4 ++-- .../src/com/esotericsoftware/spine/Bone.java | 4 ++-- spine-lua/Bone.lua | 12 ++---------- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/spine-as3/spine-as3/src/spine/Bone.as b/spine-as3/spine-as3/src/spine/Bone.as index 67b5ed951..8503810b0 100644 --- a/spine-as3/spine-as3/src/spine/Bone.as +++ b/spine-as3/spine-as3/src/spine/Bone.as @@ -39,8 +39,8 @@ public class Bone { _worldScaleY = _parent._worldScaleY * scaleY; _worldRotation = _parent._worldRotation + rotation; } else { - _worldX = flipX ? -x : x; - _worldY = flipY ? -y : y; + _worldX = x; + _worldY = y; _worldScaleX = scaleX; _worldScaleY = scaleY; _worldRotation = rotation; diff --git a/spine-c/src/spine/Bone.c b/spine-c/src/spine/Bone.c index bd9ed633c..d4d24d0a7 100644 --- a/spine-c/src/spine/Bone.c +++ b/spine-c/src/spine/Bone.c @@ -66,8 +66,8 @@ void Bone_updateWorldTransform (Bone* self, int flipX, int flipY) { CONST_CAST(float, self->worldScaleY) = self->parent->worldScaleY * self->scaleY; CONST_CAST(float, self->worldRotation) = self->parent->worldRotation + self->rotation; } else { - CONST_CAST(float, self->worldX) = flipX ? -self->x : self->x; - CONST_CAST(float, self->worldY) = flipY ? -self->y : self->y; + CONST_CAST(float, self->worldX) = self->x; + CONST_CAST(float, self->worldY) = 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 index d222ec7a0..c69a7d9a4 100644 --- a/spine-csharp/src/Bone.cs +++ b/spine-csharp/src/Bone.cs @@ -65,8 +65,8 @@ namespace Spine { WorldScaleY = parent.WorldScaleY * ScaleY; WorldRotation = parent.WorldRotation + Rotation; } else { - WorldX = flipX ? -X : X; - WorldY = flipY ? -Y : Y; + WorldX = X; + WorldY = Y; WorldScaleX = ScaleX; WorldScaleY = ScaleY; WorldRotation = Rotation; diff --git a/spine-js/spine.js b/spine-js/spine.js index 4d5f2b684..b1f021e5a 100644 --- a/spine-js/spine.js +++ b/spine-js/spine.js @@ -44,8 +44,8 @@ spine.Bone.prototype = { this.worldScaleY = parent.worldScaleY * this.scaleY; this.worldRotation = parent.worldRotation + this.rotation; } else { - this.worldX = flipX ? -this.x : this.x; - this.worldY = flipY ? -this.y : this.y; + this.worldX = this.x; + this.worldY = this.y; this.worldScaleX = this.scaleX; this.worldScaleY = this.scaleY; this.worldRotation = this.rotation; diff --git a/spine-libgdx/src/com/esotericsoftware/spine/Bone.java b/spine-libgdx/src/com/esotericsoftware/spine/Bone.java index 80262c0b7..d057f252c 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/Bone.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/Bone.java @@ -73,8 +73,8 @@ public class Bone { worldScaleY = parent.worldScaleY * scaleY; worldRotation = parent.worldRotation + rotation; } else { - worldX = flipX ? -x : x; - worldY = flipY ? -y : y; + worldX = x; + worldY = y; worldScaleX = scaleX; worldScaleY = scaleY; worldRotation = rotation; diff --git a/spine-lua/Bone.lua b/spine-lua/Bone.lua index cdf14aaa7..d186225ff 100644 --- a/spine-lua/Bone.lua +++ b/spine-lua/Bone.lua @@ -42,16 +42,8 @@ function Bone.new (data, parent) self.worldScaleY = parent.worldScaleY * self.scaleY self.worldRotation = parent.worldRotation + self.rotation else - if flipX then - self.worldX = -self.x - else - self.worldX = self.x - end - if flipY then - self.worldY = -self.y - else - self.worldY = self.y - end + self.worldX = self.x + self.worldY = self.y self.worldScaleX = self.scaleX self.worldScaleY = self.scaleY self.worldRotation = self.rotation