refactor: ♻️ cleaned up local variables

This commit is contained in:
usysrc 2024-03-09 23:17:08 +01:00
parent 05b0a9ab3c
commit bc83e9484d

View File

@ -1,7 +1,7 @@
-- lick.lua
--
-- simple LIVECODING environment for Löve
-- overwrites love.run, pressing all errors to the terminal/console
-- overwrites love.run, pressing all errors to the terminal/console or overlays it
local lick = {}
lick.file = "main.lua"
@ -9,9 +9,13 @@ lick.debug = false
lick.reset = false
lick.clearFlag = false
lick.sleepTime = love.graphics.newCanvas and 0.001 or 1
lick.showReloadMessage = true
local drawok_old, updateok_old, loadok_old
local last_modified = 0
local debugoutput = nil
-- Error handler wrapping for pcall
local function handle(err)
return "ERROR: " .. err
end
@ -21,69 +25,72 @@ local function load()
last_modified = 0
end
local function update(dt)
local function checkFileUpdate()
local info = love.filesystem.getInfo(lick.file)
if info and last_modified < info.modtime then
if not info or last_modified >= info.modtime then
return
end
last_modified = info.modtime
success, chunk = pcall(love.filesystem.load, lick.file)
local success, chunk = pcall(love.filesystem.load, lick.file)
if not success then
print(tostring(chunk))
lick.debugoutput = chunk .. "\n"
debugoutput = chunk .. "\n"
end
ok,err = xpcall(chunk, handle)
local ok, err = xpcall(chunk, handle)
if not ok then
print(tostring(err))
if lick.debugoutput then
lick.debugoutput = (lick.debugoutput .."ERROR: ".. err .. "\n" )
if debugoutput then
debugoutput = (debugoutput .. "ERROR: " .. err .. "\n")
else
lick.debugoutput = err .. "\n"
debugoutput = err .. "\n"
end
else
print("CHUNK LOADED\n")
lick.debugoutput = nil
if lick.showReloadMessage then print("CHUNK LOADED\n") end
debugoutput = nil
end
if lick.reset then
loadok, err = xpcall(love.load, handle)
local loadok, err = xpcall(love.load, handle)
if not loadok and not loadok_old then
print("ERROR: "..tostring(err))
if lick.debugoutput then
lick.debugoutput = (lick.debugoutput .."ERROR: ".. err .. "\n" )
print("ERROR: " .. tostring(err))
if debugoutput then
debugoutput = (debugoutput .. "ERROR: " .. err .. "\n")
else
lick.debugoutput = err .. "\n"
debugoutput = err .. "\n"
end
loadok_old = not loadok
end
end
end
end
updateok, err = pcall(love.update,dt)
local function update(dt)
checkFileUpdate()
local updateok, err = pcall(love.update, dt)
if not updateok and not updateok_old then
print("ERROR: "..tostring(err))
if lick.debugoutput then
lick.debugoutput = (lick.debugoutput .."ERROR: ".. err .. "\n" )
print("ERROR: " .. tostring(err))
if debugoutput then
debugoutput = (debugoutput .. "ERROR: " .. err .. "\n")
else
lick.debugoutput = err .. "\n"
debugoutput = err .. "\n"
end
end
updateok_old = not updateok
end
local function draw()
drawok, err = xpcall(love.draw, handle)
local drawok, err = xpcall(love.draw, handle)
if not drawok and not drawok_old then
print(tostring(err))
if lick.debugoutput then
lick.debugoutput = (lick.debugoutput .. err .. "\n" )
if debugoutput then
debugoutput = (debugoutput .. err .. "\n")
else
lick.debugoutput = err .. "\n"
debugoutput = err .. "\n"
end
end
if lick.debug and lick.debugoutput then
love.graphics.setColor(1,1,1,0.8)
love.graphics.printf(lick.debugoutput, (love.graphics.getWidth()/2)+50, 0, 400, "right")
if lick.debug and debugoutput then
love.graphics.setColor(1, 1, 1, 0.8)
love.graphics.printf(debugoutput, (love.graphics.getWidth() / 2) + 50, 0, 400, "right")
end
drawok_old = not drawok
end
@ -91,7 +98,8 @@ end
function love.run()
math.randomseed(os.time())
math.random() math.random()
math.random()
math.random()
load()
local dt = 0
@ -101,7 +109,7 @@ function love.run()
-- Process events.
if love.event then
love.event.pump()
for e,a,b,c,d in love.event.poll() do
for e, a, b, c, d in love.event.poll() do
if e == "quit" then
if not love.quit or not love.quit() then
if love.audio then
@ -111,7 +119,7 @@ function love.run()
end
end
love.handlers[e](a,b,c,d)
love.handlers[e](a, b, c, d)
end
end