From ff400d1e2f8b422f1698a132eb500c552ed88275 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Fri, 28 Jan 2022 10:49:02 +0900 Subject: [PATCH] key config menu working on ingame --- .../modulebasegame/ui/UIInventoryEscMenu.kt | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt index eb02e73c6..915cad573 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt @@ -198,6 +198,26 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() { }, ) + private val screenTouchDowns = arrayOf( + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> + keyConfigUI.touchDown(screenX, screenY, pointer, button) + } + ) + + private val screenTouchUps = arrayOf( + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> }, + { screenX: Int, screenY: Int, pointer: Int, button: Int -> + keyConfigUI.touchUp(screenX, screenY, pointer, button) + } + ) + override fun show() { INGAME.setTooltipMessage(null) } @@ -234,6 +254,18 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() { screenRenders[screen](batch, camera) } + override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { + super.touchDown(screenX, screenY, pointer, button) + screenTouchDowns[screen](screenX, screenY, pointer, button) + return true + } + + override fun touchUp(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { + super.touchUp(screenX, screenY, pointer, button) + screenTouchUps[screen](screenX, screenY, pointer, button) + return true + } + override fun doOpening(delta: Float) { }