fix some screwups and formatting, restore find-functions

This commit is contained in:
Matias 2013-06-13 16:10:43 +03:00
parent 3a0ba4a70a
commit 1ea5aa54f0
3 changed files with 16 additions and 6 deletions

View File

@ -371,11 +371,11 @@ function Animation.ColorTimeline.new ()
local g = lastFrameG + (frames[frameIndex + FRAME_G] - lastFrameG) * percent
local b = lastFrameB + (frames[frameIndex + FRAME_B] - lastFrameB) * percent
local a = lastFrameA + (frames[frameIndex + FRAME_A] - lastFrameA) * percent
--if alpha < 1 then
-- slot:setColor(slot.r + (r - color.r) * alpha, slot.g + (g - color.g) * alpha, slot.b + (b - color.b) * alpha, slot.a + (a - color.a) * alpha)
--else
if alpha < 1 then
slot:setColor(slot.r + (r - slot.r) * alpha, slot.g + (g - slot.g) * alpha, slot.b + (b - slot.b) * alpha, slot.a + (a - slot.a) * alpha)
else
slot:setColor(r, g, b, a)
--end
end
end
return self

View File

@ -35,7 +35,7 @@ function Skeleton.new (skeletonData)
data = skeletonData,
bones = {},
slots = {},
slotsByName = {},
slotsByName = {},
drawOrder = {}
}
@ -74,6 +74,11 @@ function Skeleton.new (skeletonData)
return nil
end
function self:findSlot (slotName)
if not slotName then error("slotName cannot be nil.", 2) end
return slotsByName[slotName]
end
function self:setSkin (skinName)
local newSkin
if skinName then

View File

@ -28,7 +28,7 @@ function SkeletonData.new ()
local self = {
bones = {},
slots = {},
slotNameIndices = {},
slotNameIndices = {},
skins = {},
animations = {}
}
@ -57,6 +57,11 @@ function SkeletonData.new ()
return nil
end
function self:findSlotIndex (slotName)
if not slotName then error("slotName cannot be nil.", 2) end
return slotNameIndices[slotName] or -1
end
function self:findSkin (skinName)
if not skinName then error("skinName cannot be nil.", 2) end
for i,skin in ipairs(self.skins) do