From fb21554a4995b7ef10ee462c8fa744818407330d Mon Sep 17 00:00:00 2001 From: Matias Date: Tue, 28 May 2013 20:41:45 +0300 Subject: [PATCH] Add Lua support for inheriting scale and rotation --- spine-lua/Bone.lua | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/spine-lua/Bone.lua b/spine-lua/Bone.lua index cdf14aaa7..16e8f5f6d 100644 --- a/spine-lua/Bone.lua +++ b/spine-lua/Bone.lua @@ -38,9 +38,18 @@ function Bone.new (data, parent) if parent then self.worldX = self.x * parent.m00 + self.y * parent.m01 + parent.worldX self.worldY = self.x * parent.m10 + self.y * parent.m11 + parent.worldY - self.worldScaleX = parent.worldScaleX * self.scaleX - self.worldScaleY = parent.worldScaleY * self.scaleY - self.worldRotation = parent.worldRotation + self.rotation + if (self.data.inheritScale) then + self.worldScaleX = parent.worldScaleX * self.scaleX + self.worldScaleY = parent.worldScaleY * self.scaleY + else + self.worldScaleX = self.scaleX + self.worldScaleY = self.scaleY + end + if (self.data.inheritRotation) then + self.worldRotation = parent.worldRotation + self.rotation + else + self.worldRotation = self.rotation + end else if flipX then self.worldX = -self.x