diff --git a/main_scenes/main.gd b/main_scenes/main.gd index 1ceb270..9bce2b8 100644 --- a/main_scenes/main.gd +++ b/main_scenes/main.gd @@ -53,7 +53,7 @@ signal emptiedCapture signal pressedKey var costumeKeys = ["1","2","3","4","5","6","7","8","9","0"] signal spriteVisToggles(keysPressed:Array) -signal fatfuckingballs +signal all_keys_released func _ready(): Global.main = self @@ -133,7 +133,9 @@ func _ready(): camera.position = origin.position func _process(delta): - process_key_presses($BackgroundInputCapture.get_keys()) + var keys = $BackgroundInputCapture.get_keys() + process_key_presses(keys) + bgInputSprite(keys) var hold = origin.get_parent().position.y origin.get_parent().position.y += yVel * 0.0166 @@ -617,18 +619,17 @@ func process_key_presses(keys_pressed): changeCostume(i+1) - -func bgInputSprite(node, keys_pressed): +# Handles background input for sprites +func bgInputSprite(keys_pressed: Array[Key]): if fileSystemOpen: return - var keyStrings = [] - for i in keys_pressed: - if keys_pressed[i]: - keyStrings.append(OS.get_keycode_string(i) if !OS.get_keycode_string(i).strip_edges().is_empty() else "Keycode" + str(i)) - - if keyStrings.size() <= 0: - emit_signal("fatfuckingballs") + if keys_pressed.size() <= 0: + emit_signal("all_keys_released") return - spriteVisToggles.emit(keyStrings) + spriteVisToggles.emit( + keys_pressed.map( + func(i) -> String: return OS.get_keycode_string(i) if !OS.get_keycode_string(i).strip_edges().is_empty() else "Keycode" + str(i) + ) + ) diff --git a/ui_scenes/spriteEditMenu/sprite_viewer.gd b/ui_scenes/spriteEditMenu/sprite_viewer.gd index dd9d1e1..1c3e4a7 100644 --- a/ui_scenes/spriteEditMenu/sprite_viewer.gd +++ b/ui_scenes/spriteEditMenu/sprite_viewer.gd @@ -348,7 +348,7 @@ func _on_delete_pressed(): func _on_set_toggle_pressed(): $VisToggle/setToggle/Label.text = "toggle: AWAITING INPUT" - await Global.main.fatfuckingballs + await Global.main.all_keys_released var keys = await Global.main.spriteVisToggles var key = keys[0]