AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 04:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

gui: input: special keys

Browse Source
This commit is contained in:
Bixilon 2022-01-24 10:58:15 +01:00
parent 99e32866da
commit 3c670d784b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
8 changed files with 222 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/button/ButtonElement.kt
View File

@ -21,13 +21,12 @@ import de.bixilon.minosoft.gui.rendering.gui.elements.VerticalAlignments
import de.bixilon.minosoft.gui.rendering.gui.elements.VerticalAlignments.Companion.getOffset
import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.AtlasImageElement
import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextElement
import de.bixilon.minosoft.gui.rendering.gui.input.MouseActions
import de.bixilon.minosoft.gui.rendering.gui.input.MouseButtons
import de.bixilon.minosoft.gui.rendering.gui.input.InputSpecialKey
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexOptions
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.EMPTY
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.isGreater
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.isSmaller
import de.bixilon.minosoft.gui.rendering.system.window.KeyChangeTypes
import glm_.vec2.Vec2i
class ButtonElement(
@ -114,9 +113,25 @@ class ButtonElement(
submit()
}
override fun onSpecialKey(key: InputSpecialKey, type: KeyChangeTypes) {
if (!hovered) {
return
}
if (key != InputSpecialKey.KEY_ENTER) {
return
}
if (type != KeyChangeTypes.PRESS) {
return
}
submit()
}
override fun onMouseMove(position: Vec2i) {
hovered = !(position isGreater size || position isSmaller Vec2i.EMPTY)
override fun onMouseEnter(position: Vec2i) {
hovered = true
}
override fun onMouseLeave() {
hovered = false
}
fun submit() {

4
src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/Menu.kt
View File

@ -17,8 +17,8 @@ import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
import de.bixilon.minosoft.gui.rendering.gui.elements.Element
import de.bixilon.minosoft.gui.rendering.gui.elements.button.ButtonElement
import de.bixilon.minosoft.gui.rendering.gui.gui.screen.Screen
import de.bixilon.minosoft.gui.rendering.gui.input.MouseActions
import de.bixilon.minosoft.gui.rendering.gui.input.MouseButtons
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexOptions
import glm_.vec2.Vec2i

6
src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt
View File

@ -18,9 +18,9 @@ import de.bixilon.minosoft.gui.rendering.gui.elements.button.ButtonElement
import de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.Menu
class PauseMenu(guiRenderer: GUIRenderer) : Menu(guiRenderer) {
init {
addButton(ButtonElement(guiRenderer, "Print message") {
println("Printed!")
})
addButton(ButtonElement(guiRenderer, "Print \"Hello\" message") { println("Hello") })
addButton(ButtonElement(guiRenderer, "Print \"World\" message") { println("World") })
}
}

26
src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/LayoutedGUIElement.kt
View File

@ -21,8 +21,9 @@ import de.bixilon.minosoft.gui.rendering.gui.elements.Element
import de.bixilon.minosoft.gui.rendering.gui.elements.LayoutedElement
import de.bixilon.minosoft.gui.rendering.gui.hud.HUDElement
import de.bixilon.minosoft.gui.rendering.gui.hud.Initializable
import de.bixilon.minosoft.gui.rendering.gui.input.MouseActions
import de.bixilon.minosoft.gui.rendering.gui.input.MouseButtons
import de.bixilon.minosoft.gui.rendering.gui.input.InputSpecialKey
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIMesh
import de.bixilon.minosoft.gui.rendering.renderer.Drawable
import de.bixilon.minosoft.gui.rendering.system.window.KeyChangeTypes
@ -122,8 +123,6 @@ class LayoutedGUIElement<T : LayoutedElement>(
}
override fun onKeyPress(type: KeyChangeTypes, key: KeyCodes) {
val mouseButton = MouseButtons[key] ?: return
val mouseAction = MouseActions[type] ?: return
val offset = layout.layoutOffset
val size = elementLayout.size
val position = lastPosition
@ -131,7 +130,24 @@ class LayoutedGUIElement<T : LayoutedElement>(
return
}
val delta = position - offset
elementLayout.onMouseAction(delta, mouseButton, mouseAction)
fun checkMouse(): Boolean {
val mouseButton = MouseButtons[key] ?: return false
val mouseAction = MouseActions[type] ?: return true
elementLayout.onMouseAction(delta, mouseButton, mouseAction)
return true
}
fun checkSpecial(): Boolean {
val specialKey = InputSpecialKey[key] ?: return false
elementLayout.onSpecialKey(specialKey, type)
return true
}
if (checkMouse()) {
return
}
checkSpecial()
}
override fun onScroll(scrollOffset: Vec2d) {

4
src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/InputElement.kt
View File

@ -13,6 +13,9 @@
package de.bixilon.minosoft.gui.rendering.gui.input
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseActions
import de.bixilon.minosoft.gui.rendering.gui.input.mouse.MouseButtons
import de.bixilon.minosoft.gui.rendering.system.window.KeyChangeTypes
import glm_.vec2.Vec2d
import glm_.vec2.Vec2i
@ -24,6 +27,7 @@ interface InputElement {
fun onMouseAction(position: Vec2i, button: MouseButtons, action: MouseActions) {}
fun onScroll(position: Vec2i, scrollOffset: Vec2d) {}
fun onSpecialKey(key: InputSpecialKey, type: KeyChangeTypes) {}
fun onCharPress(char: Int) {}
// ToDo: drag

168
src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/InputSpecialKey.kt Normal file
View File

@ -0,0 +1,168 @@
/*
* Minosoft
* Copyright (C) 2022 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.gui.rendering.gui.input
import de.bixilon.kutil.enums.EnumUtil
import de.bixilon.kutil.enums.ValuesEnum
import de.bixilon.minosoft.config.key.KeyCodes
enum class InputSpecialKey {
KEY_ESCAPE,
KEY_ENTER,
KEY_TAB,
KEY_BACKSPACE,
KEY_INSERT,
KEY_DELETE,
KEY_RIGHT,
KEY_LEFT,
KEY_DOWN,
KEY_UP,
KEY_PAGE_UP,
KEY_PAGE_DOWN,
KEY_HOME,
KEY_END,
KEY_CAPS_LOCK,
KEY_SCROLL_LOCK,
KEY_NUM_LOCK,
KEY_PRINT_SCREEN,
KEY_PAUSE,
KEY_F1,
KEY_F2,
KEY_F3,
KEY_F4,
KEY_F5,
KEY_F6,
KEY_F7,
KEY_F8,
KEY_F9,
KEY_F10,
KEY_F11,
KEY_F12,
KEY_F13,
KEY_F14,
KEY_F15,
KEY_F16,
KEY_F17,
KEY_F18,
KEY_F19,
KEY_F20,
KEY_F21,
KEY_F22,
KEY_F23,
KEY_F24,
KEY_F25,
KEY_KP_0,
KEY_KP_1,
KEY_KP_2,
KEY_KP_3,
KEY_KP_4,
KEY_KP_5,
KEY_KP_6,
KEY_KP_7,
KEY_KP_8,
KEY_KP_9,
KEY_LEFT_SHIFT,
KEY_LEFT_CONTROL,
KEY_LEFT_ALT,
KEY_LEFT_SUPER,
KEY_RIGHT_SHIFT,
KEY_RIGHT_CONTROL,
KEY_RIGHT_ALT,
KEY_RIGHT_SUPER,
KEY_MENU,
KEY_LAST,
;
companion object : ValuesEnum<InputSpecialKey> {
override val VALUES: Array<InputSpecialKey> = values()
override val NAME_MAP: Map<String, InputSpecialKey> = EnumUtil.getEnumValues(VALUES)
operator fun get(keyCode: KeyCodes): InputSpecialKey? {
return when (keyCode) {
KeyCodes.KEY_ESCAPE -> KEY_ESCAPE
KeyCodes.KEY_ENTER -> KEY_ENTER
KeyCodes.KEY_TAB -> KEY_TAB
KeyCodes.KEY_BACKSPACE -> KEY_BACKSPACE
KeyCodes.KEY_INSERT -> KEY_INSERT
KeyCodes.KEY_DELETE -> KEY_DELETE
KeyCodes.KEY_RIGHT -> KEY_RIGHT
KeyCodes.KEY_LEFT -> KEY_LEFT
KeyCodes.KEY_DOWN -> KEY_DOWN
KeyCodes.KEY_UP -> KEY_UP
KeyCodes.KEY_PAGE_UP -> KEY_PAGE_UP
KeyCodes.KEY_PAGE_DOWN -> KEY_PAGE_DOWN
KeyCodes.KEY_HOME -> KEY_HOME
KeyCodes.KEY_END -> KEY_END
KeyCodes.KEY_CAPS_LOCK -> KEY_CAPS_LOCK
KeyCodes.KEY_SCROLL_LOCK -> KEY_SCROLL_LOCK
KeyCodes.KEY_NUM_LOCK -> KEY_NUM_LOCK
KeyCodes.KEY_PRINT_SCREEN -> KEY_PRINT_SCREEN
KeyCodes.KEY_PAUSE -> KEY_PAUSE
KeyCodes.KEY_F1 -> KEY_F1
KeyCodes.KEY_F2 -> KEY_F2
KeyCodes.KEY_F3 -> KEY_F3
KeyCodes.KEY_F4 -> KEY_F4
KeyCodes.KEY_F5 -> KEY_F5
KeyCodes.KEY_F6 -> KEY_F6
KeyCodes.KEY_F7 -> KEY_F7
KeyCodes.KEY_F8 -> KEY_F8
KeyCodes.KEY_F9 -> KEY_F9
KeyCodes.KEY_F10 -> KEY_F10
KeyCodes.KEY_F11 -> KEY_F11
KeyCodes.KEY_F12 -> KEY_F12
KeyCodes.KEY_F13 -> KEY_F13
KeyCodes.KEY_F14 -> KEY_F14
KeyCodes.KEY_F15 -> KEY_F15
KeyCodes.KEY_F16 -> KEY_F16
KeyCodes.KEY_F17 -> KEY_F17
KeyCodes.KEY_F18 -> KEY_F18
KeyCodes.KEY_F19 -> KEY_F19
KeyCodes.KEY_F20 -> KEY_F20
KeyCodes.KEY_F21 -> KEY_F21
KeyCodes.KEY_F22 -> KEY_F22
KeyCodes.KEY_F23 -> KEY_F23
KeyCodes.KEY_F24 -> KEY_F24
KeyCodes.KEY_F25 -> KEY_F25
KeyCodes.KEY_KP_0 -> KEY_KP_0
KeyCodes.KEY_KP_1 -> KEY_KP_1
KeyCodes.KEY_KP_2 -> KEY_KP_2
KeyCodes.KEY_KP_3 -> KEY_KP_3
KeyCodes.KEY_KP_4 -> KEY_KP_4
KeyCodes.KEY_KP_5 -> KEY_KP_5
KeyCodes.KEY_KP_6 -> KEY_KP_6
KeyCodes.KEY_KP_7 -> KEY_KP_7
KeyCodes.KEY_KP_8 -> KEY_KP_8
KeyCodes.KEY_KP_9 -> KEY_KP_9
KeyCodes.KEY_LEFT_SHIFT -> KEY_LEFT_SHIFT
KeyCodes.KEY_LEFT_CONTROL -> KEY_LEFT_CONTROL
KeyCodes.KEY_LEFT_ALT -> KEY_LEFT_ALT
KeyCodes.KEY_LEFT_SUPER -> KEY_LEFT_SUPER
KeyCodes.KEY_RIGHT_SHIFT -> KEY_RIGHT_SHIFT
KeyCodes.KEY_RIGHT_CONTROL -> KEY_RIGHT_CONTROL
KeyCodes.KEY_RIGHT_ALT -> KEY_RIGHT_ALT
KeyCodes.KEY_RIGHT_SUPER -> KEY_RIGHT_SUPER
KeyCodes.KEY_MENU -> KEY_MENU
KeyCodes.KEY_LAST -> KEY_LAST
else -> null
}
}
}
}

2
src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/MouseActions.kt → src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/mouse/MouseActions.kt
View File

@ -11,7 +11,7 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.gui.rendering.gui.input
package de.bixilon.minosoft.gui.rendering.gui.input.mouse
import de.bixilon.kutil.enums.EnumUtil
import de.bixilon.kutil.enums.ValuesEnum

2
src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/MouseButtons.kt → src/main/java/de/bixilon/minosoft/gui/rendering/gui/input/mouse/MouseButtons.kt
View File

@ -11,7 +11,7 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.gui.rendering.gui.input
package de.bixilon.minosoft.gui.rendering.gui.input.mouse
import de.bixilon.kutil.enums.EnumUtil
import de.bixilon.kutil.enums.ValuesEnum