From 555726a87daf815d71e73c89749f56d0ac525717 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 22 May 2022 18:12:23 -0700 Subject: rename --- app.lua | 37 +++++++++++++++++++++++++++++++++++++ main.lua | 4 +++- run.lua | 37 ------------------------------------- 3 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 app.lua delete mode 100644 run.lua diff --git a/app.lua b/app.lua new file mode 100644 index 0000000..a2124d0 --- /dev/null +++ b/app.lua @@ -0,0 +1,37 @@ +-- main entrypoint from LÖVE + +function love.run() + if love.load then love.load(love.arg.parseGameArguments(arg), arg) end + if love.timer then love.timer.step() end + + local dt = 0 + + return function() + if love.event then + love.event.pump() + for name, a,b,c,d,e,f in love.event.poll() do + if name == "quit" then + if not love.quit or not love.quit() then + return a or 0 + end + end + love.handlers[name](a,b,c,d,e,f) + end + end + + if love.timer then dt = love.timer.step() end + + if love.update then love.update(dt) end -- will pass 0 if love.timer is disabled + + if love.graphics and love.graphics.isActive() then + love.graphics.origin() + love.graphics.clear(love.graphics.getBackgroundColor()) + + if love.draw then love.draw() end + + love.graphics.present() + end + + if love.timer then love.timer.sleep(0.001) end + end +end diff --git a/main.lua b/main.lua index 551451c..168eabb 100644 --- a/main.lua +++ b/main.lua @@ -1,4 +1,7 @@ local utf8 = require 'utf8' + +require 'app' + require 'keychord' require 'file' require 'button' @@ -7,7 +10,6 @@ local Drawing = require 'drawing' local geom = require 'geom' require 'help' require 'icons' -require 'run' -- a line is either text or a drawing -- a text is a table with: diff --git a/run.lua b/run.lua deleted file mode 100644 index a2124d0..0000000 --- a/run.lua +++ /dev/null @@ -1,37 +0,0 @@ --- main entrypoint from LÖVE - -function love.run() - if love.load then love.load(love.arg.parseGameArguments(arg), arg) end - if love.timer then love.timer.step() end - - local dt = 0 - - return function() - if love.event then - love.event.pump() - for name, a,b,c,d,e,f in love.event.poll() do - if name == "quit" then - if not love.quit or not love.quit() then - return a or 0 - end - end - love.handlers[name](a,b,c,d,e,f) - end - end - - if love.timer then dt = love.timer.step() end - - if love.update then love.update(dt) end -- will pass 0 if love.timer is disabled - - if love.graphics and love.graphics.isActive() then - love.graphics.origin() - love.graphics.clear(love.graphics.getBackgroundColor()) - - if love.draw then love.draw() end - - love.graphics.present() - end - - if love.timer then love.timer.sleep(0.001) end - end -end -- cgit 1.4.1-2-gfad0