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

fix key bindings toggle when inputHandler is set

Browse Source
This commit is contained in:
Bixilon 2022-01-26 08:42:17 +01:00
parent ce0ad2eedf
commit b7a8e570a2
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/bixilon/minosoft/gui/rendering/input/key/KeyBindingCallbackPair.kt
View File

@ -18,6 +18,7 @@ import de.bixilon.minosoft.config.key.KeyBinding
data class KeyBindingCallbackPair(
var keyBinding: KeyBinding,
val default: KeyBinding,
val defaultPressed: Boolean = false,
val callback: MutableSet<(keyDown: Boolean) -> Unit> = mutableSetOf(),
) {
var lastChange = 0L

40
src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt
View File

@ -56,19 +56,7 @@ class RenderWindowInputHandler(
set(value) {
field = value
keysDown.clear()
val toRemove: MutableSet<ResourceLocation> = mutableSetOf()
for (name in keyBindingsDown) {
val pair = keyBindingCallbacks[name] ?: continue
if (pair.keyBinding.action[KeyAction.STICKY] != null) {
continue
}
for (callback in pair.callback) {
callback(false)
}
toRemove += name
}
keyBindingsDown -= toRemove
deactivateAll()
renderWindow.window.cursorMode = if (value == null) {
CursorModes.DISABLED
@ -132,6 +120,29 @@ class RenderWindowInputHandler(
cameraInput.init()
}
private fun deactivateAll() {
keysDown.clear()
keysLastDownTime.clear()
val toRemove: MutableSet<ResourceLocation> = mutableSetOf()
for ((name, pair) in keyBindingCallbacks) {
val down = keyBindingsDown.contains(name)
if (!down || pair.defaultPressed) {
continue
}
// ToDo
if (pair.keyBinding.action[KeyAction.DOUBLE_PRESS] != null) {
continue
}
for (callback in pair.callback) {
callback(false)
}
toRemove += name
}
keyBindingsDown -= toRemove
}
private fun keyInput(keyCode: KeyCodes, keyChangeType: KeyChangeTypes) {
val inputHandler = inputHandler
@ -236,7 +247,6 @@ class RenderWindowInputHandler(
continue
}
// Log.debug("Changing $resourceLocation because of $keyCode -> $thisKeyBindingDown")
pair.lastChange = TimeUtil.time
for (callback in pair.callback) {
callback(thisKeyBindingDown)
@ -275,7 +285,7 @@ class RenderWindowInputHandler(
fun registerKeyCallback(resourceLocation: ResourceLocation, defaultKeyBinding: KeyBinding, defaultPressed: Boolean = false, callback: ((keyDown: Boolean) -> Unit)) {
val keyBinding = profile.keyBindings.getOrPut(resourceLocation) { defaultKeyBinding }
val callbackPair = keyBindingCallbacks.getOrPut(resourceLocation) { KeyBindingCallbackPair(keyBinding, defaultKeyBinding) }
val callbackPair = keyBindingCallbacks.getOrPut(resourceLocation) { KeyBindingCallbackPair(keyBinding, defaultKeyBinding, defaultPressed) }
callbackPair.callback += callback
if (keyBinding.action.containsKey(KeyAction.STICKY) && defaultPressed) {