UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 17:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tabs. Always tabs.

Browse Source
This commit is contained in:
NathanSweet 2013-08-17 12:25:39 +02:00
parent 2e88c59280
commit 90b0233e4b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spine-lua/Bone.lua
View File

@ -6,10 +6,10 @@
-- modification, are permitted provided that the following conditions are met: -- modification, are permitted provided that the following conditions are met:
-- --
-- 1. Redistributions of source code must retain the above copyright notice, this -- 1. Redistributions of source code must retain the above copyright notice, this
-- list of conditions and the following disclaimer. -- list of conditions and the following disclaimer.
-- 2. Redistributions in binary form must reproduce the above copyright notice, -- 2. Redistributions in binary form must reproduce the above copyright notice,
-- this list of conditions and the following disclaimer in the documentation -- this list of conditions and the following disclaimer in the documentation
-- and/or other materials provided with the distribution. -- and/or other materials provided with the distribution.
-- --
-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@ -38,18 +38,18 @@ function Bone.new (data, parent)
if parent then if parent then
self.worldX = self.x * parent.m00 + self.y * parent.m01 + parent.worldX 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.worldY = self.x * parent.m10 + self.y * parent.m11 + parent.worldY
if (self.data.inheritScale) then if (self.data.inheritScale) then
self.worldScaleX = parent.worldScaleX * self.scaleX self.worldScaleX = parent.worldScaleX * self.scaleX
self.worldScaleY = parent.worldScaleY * self.scaleY self.worldScaleY = parent.worldScaleY * self.scaleY
else else
self.worldScaleX = self.scaleX self.worldScaleX = self.scaleX
self.worldScaleY = self.scaleY self.worldScaleY = self.scaleY
end end
if (self.data.inheritRotation) then if (self.data.inheritRotation) then
self.worldRotation = parent.worldRotation + self.rotation self.worldRotation = parent.worldRotation + self.rotation
else else
self.worldRotation = self.rotation self.worldRotation = self.rotation
end end
else else
if flipX then if flipX then
self.worldX = -self.x self.worldX = -self.x