|
@@ -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
|