From 116ad3ce533607769ee7a68ddf27bc664863155b Mon Sep 17 00:00:00 2001 From: Matias Date: Wed, 29 May 2013 12:29:49 +0300 Subject: [PATCH] fix indentation --- spine-corona/spine-corona/spine.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spine-corona/spine-corona/spine.lua b/spine-corona/spine-corona/spine.lua index 754112e0d..bc565e2e8 100644 --- a/spine-corona/spine-corona/spine.lua +++ b/spine-corona/spine-corona/spine.lua @@ -113,16 +113,16 @@ function spine.Skeleton.new (skeletonData, group) image.y = -(slot.bone.worldY + attachment.x * slot.bone.m10 + attachment.y * slot.bone.m11) image.rotation = -(slot.bone.worldRotation + attachment.rotation) - -- fix scaling when attachment is rotated 90 degrees - local rot = math.abs(attachment.rotation) % 180 - if (rot == 90) then - image.xScale = slot.bone.worldScaleY * attachment.scaleX - image.yScale = slot.bone.worldScaleX * attachment.scaleY - else - --if (rot ~= 0 and (slot.bone.worldScaleX ~= 1 or slot.bone.worldScaleY ~= 1)) then print("WARNING: Scaling bones with attachments not rotated to the cardinal angles will not work as expected in Corona!") end - image.xScale = slot.bone.worldScaleX * attachment.scaleX - image.yScale = slot.bone.worldScaleY * attachment.scaleY - end + -- fix scaling when attachment is rotated 90 degrees + local rot = math.abs(attachment.rotation) % 180 + if (rot == 90) then + image.xScale = slot.bone.worldScaleY * attachment.scaleX + image.yScale = slot.bone.worldScaleX * attachment.scaleY + else + --if (rot ~= 0 and (slot.bone.worldScaleX ~= 1 or slot.bone.worldScaleY ~= 1)) then print("WARNING: Scaling bones with attachments not rotated to the cardinal angles will not work as expected in Corona!") end + image.xScale = slot.bone.worldScaleX * attachment.scaleX + image.yScale = slot.bone.worldScaleY * attachment.scaleY + end if self.flipX then image.xScale = -image.xScale