From 49b39259e587b34467f577bea036133fb8fb60cd Mon Sep 17 00:00:00 2001
From: Rin <ry00001@protonmail.com>
Date: Fri, 20 Aug 2021 18:44:01 +0100
Subject: [PATCH] Implement a new run system

---
 load/version.lua |  2 +-
 main.lua         | 88 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/load/version.lua b/load/version.lua
index f722ac9..0e5b04a 100644
--- a/load/version.lua
+++ b/load/version.lua
@@ -1 +1 @@
-version = "v0.3-beta6"
\ No newline at end of file
+version = "v0.3-beta6-nrs"
\ No newline at end of file
diff --git a/main.lua b/main.lua
index 88d60f8..61d61b5 100644
--- a/main.lua
+++ b/main.lua
@@ -18,6 +18,13 @@ function love.load()
 	--config["das_last_key"] = false
 	--config["fullscreen"] = false
 
+    runsystem = {
+        drawfps = 0,
+        updatefps = 0,
+        updatedelta = 0,
+        showperformancestatistics = false
+    }
+
 	love.window.setMode(love.graphics.getWidth(), love.graphics.getHeight(), {resizable = true});
 		
 	-- used for screenshots
@@ -74,6 +81,14 @@ function love.draw()
 	love.graphics.scale(scale_factor)
 		
 	scene:render()
+    
+    if runsystem.showperformancestatistics then
+        love.graphics.setColor(1, 1, 1, 1)
+        love.graphics.print('u='..tostring(runsystem.updatefps)..
+                            '\nd='..tostring(runsystem.drawfps)..
+                            '\ndel='..tostring(runsystem.updatedelta), 0, 0)
+    end
+
 	love.graphics.pop()
 		
 	love.graphics.setCanvas()
@@ -97,9 +112,9 @@ function love.keypressed(key, scancode)
 		scene.restart_message = true
 		if config.secret then playSE("mode_decide")
 		else playSE("erase") end
-		-- f12 is reserved for saving screenshots
-		elseif scancode == "f12" then
-				local ss_name = os.date("ss/%Y-%m-%d_%H-%M-%S.png")
+	-- f12 is reserved for saving screenshots
+	elseif scancode == "f12" then
+		local ss_name = os.date("ss/%Y-%m-%d_%H-%M-%S.png")
 		local info = love.filesystem.getInfo("ss", "directory")
 		if not info then
 			love.filesystem.remove("ss")
@@ -107,6 +122,9 @@ function love.keypressed(key, scancode)
 		end
 		print("Saving screenshot as "..ss_name)
 		GLOBAL_CANVAS:newImageData():encode("png", ss_name)
+    -- F9 toggles performance statistics for the new runsystem
+    elseif scancode == "f9" then
+        runsystem.showperformancestatistics = not runsystem.showperformancestatistics
 	-- function keys are reserved
 	elseif string.match(scancode, "^f[1-9]$") or string.match(scancode, "^f[1-9][0-9]+$") then
 		return	
@@ -274,6 +292,8 @@ end
 
 local TARGET_FPS = 60
 
+--[[
+-- OLD RUN CODE BELOW
 function love.run()
 	if love.load then love.load(love.arg.parseGameArguments(arg), arg) end
 
@@ -324,3 +344,65 @@ function love.run()
 		last_time = love.timer.getTime()
 	end
 end
+]]
+
+function love.run()
+    -- New Run system
+    -- by rin
+    -- aims to speedup the responsiveness of the game by
+    -- only updating 60 times per second, but letting
+    -- it poll as fast as it wants
+
+    if not love.timer then
+        error('new run system requires love.timer to function.')
+    end
+
+    if love.load then love.load(love.arg.parseGameArguments(arg), arg) end
+
+	if love.timer then love.timer.step() end
+
+    local tacc = 0
+    local start_time = love.timer.getTime()
+
+    return function()
+        if love.event then
+            love.event.pump()
+            for n, a, b, c, d, e, f in love.event.poll() do
+                if n == 'quit' then
+                    if not love.quit or not love.quit() then
+                        return a or 0
+                    end
+                end
+                love.handlers[n](a, b, c, d, e, f)
+            end
+        end
+
+        if love.timer then
+			processBGMFadeout(love.timer.step())
+		end
+
+        local ut = love.timer.getTime() 
+        runsystem.updatedelta = ut - start_time
+        runsystem.updatefps = 1 / (ut - start_time)
+
+        if scene and scene.update and love.timer then
+            local delta = ut - start_time
+            start_time = ut
+            tacc = tacc + delta
+        
+            if tacc >= 1 / TARGET_FPS then
+                runsystem.drawfps = 1 / tacc
+                tacc = 0
+
+                scene:update()
+
+				if love.graphics and love.graphics.isActive() and love.draw then                    
+					love.graphics.origin()
+					love.graphics.clear(love.graphics.getBackgroundColor())
+					love.draw()
+					love.graphics.present()
+				end
+            end
+        end
+    end
+end