From 66aae1342d951fe8a84de3915654f84c16642aa5 Mon Sep 17 00:00:00 2001 From: "Squishy (C6H12O6+NaCl+H2O)" <106439598+SweetSea-ButImNotSweet@users.noreply.github.com> Date: Sat, 20 Apr 2024 22:33:55 +0700 Subject: [PATCH] Adding touch screen configuration scene (placeholder) --- scene.lua | 7 ++++++- scene/input_config.lua | 9 +++++---- scene/touch_config.lua | 21 +++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 scene/touch_config.lua diff --git a/scene.lua b/scene.lua index ed4272e..d3e143b 100644 --- a/scene.lua +++ b/scene.lua @@ -9,13 +9,18 @@ function SCENE:onInputPress() end function SCENE:onInputRelease() end ExitScene = require "scene.exit" + GameScene = require "scene.game" NameEntryScene = require "scene.name_entry" + KeyConfigScene = require "scene.key_config" StickConfigScene = require "scene.stick_config" +TouchConfigScene = require "scene.touch_config" InputConfigScene = require "scene.input_config" + ReplaySelectScene = require "scene.replay" +TrainingScene = require "scene.training" + FullscreenScene = require "scene.fullscreen" MusicToggleScene = require "scene.music_toggle" -TrainingScene = require "scene.training" TitleScene = require "scene.title" \ No newline at end of file diff --git a/scene/input_config.lua b/scene/input_config.lua index cb60365..a382a10 100644 --- a/scene/input_config.lua +++ b/scene/input_config.lua @@ -3,7 +3,8 @@ ConfigScene.title = "Input Config" local menu_screens = { KeyConfigScene, - StickConfigScene + StickConfigScene, + TouchConfigScene } function ConfigScene:new(first_time) @@ -27,11 +28,11 @@ function ConfigScene:render() end love.graphics.setColor(1, 1, 1, 0.5) - love.graphics.rectangle("fill", 75, 118 + 50 * self.menu_state, 200, 33) + love.graphics.rectangle("fill", 75, 118 + 50 * self.menu_state, 300, 35) love.graphics.setColor(1, 1, 1, 1) for i, screen in pairs(menu_screens) do - drawText(screen.title, 80, 120 + 50 * i, 200, "left") + drawText(screen.title, 80, 120 + 50 * i, 300, "left") end end @@ -47,7 +48,7 @@ function ConfigScene:onInputPress(e) self:changeOption(-1) elseif e.input == "down" or e.scancode == "down" then self:changeOption(1) - elseif SETTINGS.input and ( + elseif not SETTINGS.firstTime and ( e.input == "menu_back" or e.input == "rotate_right" or e.scancode == "backspace" or e.scancode == "delete" ) then SCENE = TitleScene() diff --git a/scene/touch_config.lua b/scene/touch_config.lua new file mode 100644 index 0000000..0e2de23 --- /dev/null +++ b/scene/touch_config.lua @@ -0,0 +1,21 @@ +local TouchConfigScene = SCENE:extend() +TouchConfigScene.title = "Touchscreen config\n(you can tap anywhere to select this)" + +function TouchConfigScene:new() + -- TODO +end +function TouchConfigScene:update() + -- TODO +end +function TouchConfigScene:onInputPress(e) +end + +function TouchConfigScene:onInputRelease(e) +end + + +function TouchConfigScene:render() + MainBackground() +end + +return TouchConfigScene \ No newline at end of file