Added a new default line clear animation using easing functions.
parent
c1693524d7
commit
049806d9e2
|
@ -598,11 +598,28 @@ function GameMode:getHighScoreData()
|
||||||
end
|
end
|
||||||
|
|
||||||
function GameMode:animation(x, y, skin, colour)
|
function GameMode:animation(x, y, skin, colour)
|
||||||
|
-- Animation progress where 0 = start and 1 = end
|
||||||
|
local progress = 1
|
||||||
|
if self.last_lcd ~= 0 then
|
||||||
|
progress = (self.last_lcd - self.lcd) / self.last_lcd
|
||||||
|
end
|
||||||
|
-- Change this number to change "bounciness"
|
||||||
|
local bounce = 13
|
||||||
|
-- Convert progress through the animation into an alpha value
|
||||||
|
local alpha = 0
|
||||||
|
-- Cutoff is arbitrary: corresponds to level 500 in Marathon A2
|
||||||
|
if self.last_lcd > 25 then
|
||||||
|
-- Goes up and down: looks better when animation is long
|
||||||
|
alpha = 1 - (bounce * progress^3 - 1.5 * bounce * progress^2 + (0.5 * bounce + 1) * progress)
|
||||||
|
else
|
||||||
|
-- Always decreasing: looks better when animation is short
|
||||||
|
alpha = 1 - progress * progress
|
||||||
|
end
|
||||||
return {
|
return {
|
||||||
1, 1, 1,
|
1, 1, 1,
|
||||||
-0.25 + 1.25 * (self.lcd / self.last_lcd),
|
alpha,
|
||||||
skin, colour,
|
skin, colour,
|
||||||
48 + x * 16, y * 16
|
48 + x * 16, y * 16
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -614,8 +631,37 @@ function GameMode:drawLineClearAnimation()
|
||||||
-- animation function
|
-- animation function
|
||||||
-- params: block x, y, skin, colour
|
-- params: block x, y, skin, colour
|
||||||
-- returns: table with RGBA, skin, colour, x, y
|
-- returns: table with RGBA, skin, colour, x, y
|
||||||
|
|
||||||
-- Fadeout (default)
|
-- Flashy Fadeout (default)
|
||||||
|
--[[
|
||||||
|
function animation(x, y, skin, colour)
|
||||||
|
-- Animation progress where 0 = start and 1 = end
|
||||||
|
local progress = 1
|
||||||
|
if self.last_lcd ~= 0 then
|
||||||
|
progress = (self.last_lcd - self.lcd) / self.last_lcd
|
||||||
|
end
|
||||||
|
-- Change this number to change "bounciness"
|
||||||
|
local bounce = 13
|
||||||
|
-- Convert progress through the animation into an alpha value
|
||||||
|
local alpha = 0
|
||||||
|
-- Cutoff is arbitrary: corresponds to level 500 in Marathon A2
|
||||||
|
if self.last_lcd > 25 then
|
||||||
|
-- Goes up and down: looks better when animation is long
|
||||||
|
alpha = 1 - (bounce * progress^3 - 1.5 * bounce * progress^2 + (0.5 * bounce + 1) * progress)
|
||||||
|
else
|
||||||
|
-- Always decreasing: looks better when animation is short
|
||||||
|
alpha = 1 - progress * progress
|
||||||
|
end
|
||||||
|
return {
|
||||||
|
1, 1, 1,
|
||||||
|
alpha,
|
||||||
|
skin, colour,
|
||||||
|
48 + x * 16, y * 16
|
||||||
|
}
|
||||||
|
end
|
||||||
|
--]]
|
||||||
|
|
||||||
|
-- Fadeout
|
||||||
--[[
|
--[[
|
||||||
function animation(x, y, skin, colour)
|
function animation(x, y, skin, colour)
|
||||||
return {
|
return {
|
||||||
|
|
Loading…
Reference in New Issue