fix critical timer typo and make timer work
This commit is contained in:
+2
-1
@@ -1,7 +1,7 @@
|
|||||||
local is_callable = function(callback)
|
local is_callable = function(callback)
|
||||||
local _type = type(callback)
|
local _type = type(callback)
|
||||||
if _type == "function" then return true end
|
if _type == "function" then return true end
|
||||||
of _type == "table" then
|
if _type == "table" then
|
||||||
local metatable = getmetatable(callback)
|
local metatable = getmetatable(callback)
|
||||||
return (type(metatable) == "table") and (type(metatable.__call) == "function")
|
return (type(metatable) == "table") and (type(metatable.__call) == "function")
|
||||||
end
|
end
|
||||||
@@ -49,6 +49,7 @@ local new_timer = function(callback, update, ...)
|
|||||||
end
|
end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
version = "v1.0.0-modified",
|
||||||
after = function(deadline, callback, ...)
|
after = function(deadline, callback, ...)
|
||||||
local timer = new_timer(callback, update_after, ...)
|
local timer = new_timer(callback, update_after, ...)
|
||||||
timer.deadline = deadline
|
timer.deadline = deadline
|
||||||
|
|||||||
+13
-5
@@ -1,15 +1,23 @@
|
|||||||
local utility = require "lib.utility"
|
|
||||||
local progress_bar = require "lib.progress_bar"
|
local progress_bar = require "lib.progress_bar"
|
||||||
|
local timer = require "lib.timer"
|
||||||
|
local utility = require "lib.utility"
|
||||||
|
|
||||||
-- test progress_bar
|
-- test progress_bar
|
||||||
local window_width, window_height = love.graphics.getDimensions()
|
local window_width, window_height = love.graphics.getDimensions()
|
||||||
local progress_bar_height = 30 -- TODO should not be hardcoded
|
local progress_bar_height = 30 -- TODO should not be hardcoded
|
||||||
local test = progress_bar(0, window_height - progress_bar_height, window_width, progress_bar_height)
|
local test_bar = progress_bar(0, window_height - progress_bar_height, window_width, progress_bar_height)
|
||||||
test:set_text("This is a test text string of significant length. It exists to test printing over a progress bar.")
|
test_bar:set_text("This is a test text string of significant length. It exists to test printing over a progress bar.")
|
||||||
test:set_progress(math.random())
|
-- test:set_progress(math.random())
|
||||||
|
|
||||||
|
local test_timer = timer.every(1, function() end) -- TODO consider making timer not need a function; cause I don't here!
|
||||||
|
|
||||||
|
love.update = function(dt)
|
||||||
|
timer.update(dt)
|
||||||
|
test_bar:set_progress(test_timer.run_time)
|
||||||
|
end
|
||||||
|
|
||||||
love.draw = function()
|
love.draw = function()
|
||||||
test:draw()
|
test_bar:draw()
|
||||||
end
|
end
|
||||||
|
|
||||||
love.keypressed = function(key)
|
love.keypressed = function(key)
|
||||||
|
|||||||
Reference in New Issue
Block a user