From 1c6857bca9859294cf3b47c8616ac167acb783b5 Mon Sep 17 00:00:00 2001
From: SweetSea <106439598+SweetSea-ButImNotSweet@users.noreply.github.com>
Date: Sun, 24 Nov 2024 15:40:16 +0700
Subject: [PATCH] Fix longlasting wrong icon key
---
game/vctrl.lua | 8 +++----
modules/scene.lua | 55 -----------------------------------------------
2 files changed, 4 insertions(+), 59 deletions(-)
delete mode 100644 modules/scene.lua
diff --git a/game/vctrl.lua b/game/vctrl.lua
index 5bf2b44..d3fda1e 100644
--- a/game/vctrl.lua
+++ b/game/vctrl.lua
@@ -41,7 +41,7 @@ local virtual_quad=setmetatable((function()
empty_quad=gc_newQuad(0,0,1,1,5*w,2*w)
for i,name in next,{
'left','right','up','down','restart',
- 'rotate_right','rotate_left','rotate_right2','rotate_left2'
+ 'rotate_left','rotate_right','rotate_left2','rotate_right2'
} do if #name>0 then t[name]=gc_newQuad((i-1)%5*w,math.floor((i-1)/5)*w,w,w,5*w,2*w) end end
return t
end)(),{
@@ -108,7 +108,7 @@ function control_type.button:draw(forceAlpha)
if self.shape=='circle' then
love.graphics.setColor(0,0,0,alpha)
love.graphics.circle('fill',self.x,self.y,self.r-4)
-
+
love.graphics.setColor(1,1,1,self.pressed and .5 or 0)
love.graphics.circle('fill',self.x,self.y,self.r-4)
@@ -117,7 +117,7 @@ function control_type.button:draw(forceAlpha)
elseif self.shape=='square' then
love.graphics.setColor(0,0,0,alpha)
love.graphics.rectangle('fill',self.x-self.r-4,self.y-self.r-4,self.r*2+8,self.r*2+8)
-
+
love.graphics.setColor(1,1,1,self.pressed and .5 or 0)
love.graphics.rectangle('fill',self.x-self.r-4,self.y-self.r-4,self.r*2+8,self.r*2+8)
@@ -182,7 +182,7 @@ function VCTRL.clearAll()
local toggle = global_toggle
VCTRL.toggle(false)
global_toggle = toggle
-
+
for i=#VCTRL,1,-1 do VCTRL[i] = nil end
collectgarbage()
end
diff --git a/modules/scene.lua b/modules/scene.lua
deleted file mode 100644
index d3475ac..0000000
--- a/modules/scene.lua
+++ /dev/null
@@ -1,55 +0,0 @@
-local Object = require "libs.classic"
-
-SCENE = Object:extend()
-
-function SCENE:new() end
-function SCENE:update() end
-function SCENE:render() end
-
--- You can use the class SCENE_onInput to show suggestions for `e` table
-
----@class SCENE_onInput
----@field type "key"|"joystick"|"virtual"|"touch"|"mouse"|"wheel"
----
----@field input? string # Action triggered
Only visible via keyboard and gamepad
----@field key? love.KeyConstant Key pressed? Only visible via keyboard and gamepad
----@field scancode? love.Scancode Key pressed but on the US layout? Only visible via keyboard and gamepad
----
----@field x? number Only visible via touch and mouse
----@field y? number Only visible via touch and mouse
----@field dx? number # Delta X
Only visible via touch, mouse and wheel
----@field dy? number # Delta Y
Only visible via touch, mouse and wheel
----@field id? lightuserdata # Only visible via touch
----@field presses? number # Only visible via mouse
-
--- e in 4 below functions will contain different things based on it's type:
--- key - input, key, scancode
--- joystick - input, button, name
--- virtual - input
--- touch - x, y, dx, dy, id
--- mouse - x, y, dx, dy, presses
--- wheel - dx, dy
-
-function SCENE:onInputMove(e) end
-function SCENE:onInputPress(e) end
-function SCENE:onInputRelease(e) end
-
-GameScene = require "scene.game"
-TrainingScene = require "scene.training"
-NameEntryScene = require "scene.name_entry"
-
-KeyConfigScene = require "scene.key_config"
-StickConfigScene = require "scene.stick_config"
-TouchConfigScene = require "scene.touch_config"
-TouchConfigPreviewScene = require "scene.touch_config_preview"
-InputConfigScene = require "scene.input_config"
-
-ReplaySelectScene = require "scene.replay"
-ReplayTestScene = require"scene.replay_test"
-
-FullscreenScene = require "scene.fullscreen"
-MusicToggleScene = require "scene.music_toggle"
-LinesToggleScene = require "scene.lines_toggle"
-
-ExitScene = require "scene.exit"
-TitleScene = require "scene.title"
\ No newline at end of file