aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.lua4
-rw-r--r--src/init.lua5
-rw-r--r--src/input.lua3
3 files changed, 9 insertions, 3 deletions
diff --git a/main.lua b/main.lua
index 79ee0f8..b177a5a 100644
--- a/main.lua
+++ b/main.lua
@@ -17,6 +17,10 @@ function love.update(dt)
local scn = get_current_scene()
assert(scn, "No scene set.")
+ if is_input_just_pressed("Hot_Reload") and lk.isDown("lctrl") then
+ reload_assets()
+ end
+
fire_event(scn.on_update, dt)
fire_event(global_on_update, dt)
flush_scene()
diff --git a/src/init.lua b/src/init.lua
index 824229d..29cb64d 100644
--- a/src/init.lua
+++ b/src/init.lua
@@ -24,6 +24,8 @@ register_input("Right", {{"key", "right"}, {"key", "d"}})
register_input("Jump", {{"key", "space"}})
register_input("Dash", {{"key", "lshift"}})
+register_input("Hot_Reload", {{"key", "r"}})
+
register_input("Right_Click", {{"mouse", 2}})
register_input("Left_Click", {{"mouse", 1}})
@@ -32,6 +34,8 @@ la = love.audio
lg = love.graphics
lf = love.filesystem
lw = love.window
+lk = love.keyboard
+lm = love.mouse
lmath = love.math
function init_global_systems()
@@ -54,6 +58,7 @@ function reload_assets()
load_textures_from()
load_sounds_from()
load_specks_from()
+ print("Assets loaded.")
end
local function load_dir(path)
diff --git a/src/input.lua b/src/input.lua
index 7c625ed..fd12d9c 100644
--- a/src/input.lua
+++ b/src/input.lua
@@ -1,6 +1,3 @@
-local lk = love.keyboard
-local lm = love.mouse
-
local inputs = {}
local keyEvents = {}
local mouseEvents = {}