diff --git a/main.lua b/main.lua index 64dfbf7..d6c3703 100644 --- a/main.lua +++ b/main.lua @@ -242,6 +242,14 @@ function love.joystickaxis(joystick, axis, value) end end +local last_hat_direction = "" +local directions = { + ["u"] = "up", + ["d"] = "down", + ["l"] = "left", + ["r"] = "right", +} + function love.joystickhat(joystick, hat, direction) local input_pressed = nil local has_hat = false @@ -258,31 +266,47 @@ function love.joystickhat(joystick, hat, direction) has_hat = true end if input_pressed then - dir = direction - for i, direction in ipairs{"d", "l", "u", "r"} do - if dir:sub(1, 1) == direction or dir:sub(2) == direction then - scene:onInputPress({input=input_pressed, type="joyhat", name=joystick:getName(), hat=hat, direction=direction}) - else - scene:onInputRelease({input=input_pressed, type="joyhat", name=joystick:getName(), hat=hat, direction=direction}) + for i = 1, #direction do + local char = direction:sub(i, i) + local _, count = last_hat_direction:gsub(char, char) + if count == 0 then + scene:onInputPress({input=config.input.joysticks[joystick:getName()].hats[hat][char], type="joyhat", name=joystick:getName(), hat=hat, direction=char}) end end + for i = 1, #last_hat_direction do + local char = last_hat_direction:sub(i, i) + local _, count = direction:gsub(char, char) + if count == 0 then + scene:onInputRelease({input=config.input.joysticks[joystick:getName()].hats[hat][char], type="joyhat", name=joystick:getName(), hat=hat, direction=char}) + end + end + last_hat_direction = direction elseif has_hat then for i, direction in ipairs{"d", "l", "ld", "lu", "r", "rd", "ru", "u"} do scene:onInputRelease({input=config.input.joysticks[joystick:getName()].hats[hat][direction], type="joyhat", name=joystick:getName(), hat=hat, direction=direction}) end + last_hat_direction = "" elseif direction ~= "c" then - dir = direction - for i, direction in ipairs{"d", "l", "u", "r"} do - if dir:sub(1, 1) == direction or dir:sub(2) == direction then - scene:onInputPress({input=nil, type="joyhat", name=joystick:getName(), hat=hat, direction=direction}) - else - scene:onInputRelease({input=nil, type="joyhat", name=joystick:getName(), hat=hat, direction=direction}) + for i = 1, #direction do + local char = direction:sub(i, i) + local _, count = last_hat_direction:gsub(char, char) + if count == 0 then + scene:onInputPress({input=directions[char], type="joyhat", name=joystick:getName(), hat=hat, direction=char}) end end + for i = 1, #last_hat_direction do + local char = last_hat_direction:sub(i, i) + local _, count = direction:gsub(char, char) + if count == 0 then + scene:onInputRelease({input=directions[char], type="joyhat", name=joystick:getName(), hat=hat, direction=char}) + end + end + last_hat_direction = direction else for i, direction in ipairs{"d", "l", "ld", "lu", "r", "rd", "ru", "u"} do scene:onInputRelease({input=nil, type="joyhat", name=joystick:getName(), hat=hat, direction=direction}) end + last_hat_direction = "" end end