From 82c9a229da98ed6e75b1fc5ffbc79e234c19771c Mon Sep 17 00:00:00 2001 From: teatov Date: Sun, 3 Aug 2025 16:18:03 +1000 Subject: [PATCH] rename key request to key query --- scripts/game_key.gd | 6 +++--- scripts/game_keyboard.gd | 40 ++++++++++++++++++++-------------------- scripts/player.gd | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/game_key.gd b/scripts/game_key.gd index cf90c3a..a6fc41e 100644 --- a/scripts/game_key.gd +++ b/scripts/game_key.gd @@ -416,9 +416,9 @@ func _on_keyboard_layout_size_changed(rect: Rect2) -> void: _reset_animations() -func _on_keyboard_keys_requested(filter_func: Callable) -> void: - if filter_func.call(self): - _keyboard.key_request_respond(self) +func _on_keyboard_keys_requested(query_func: Callable) -> void: + if query_func.call(self): + _keyboard.key_query_respond(self) func _on_keyboard_is_configuring_changed(value: bool) -> void: diff --git a/scripts/game_keyboard.gd b/scripts/game_keyboard.gd index c5e7582..bec92bd 100644 --- a/scripts/game_keyboard.gd +++ b/scripts/game_keyboard.gd @@ -5,7 +5,7 @@ class_name GameKeyboard extends Node3D signal key_press_changed(game_key: GameKey, event: InputEventKey) signal layout_size_changed(rect: Rect2) signal prompt_page_turned(page: int) -signal keys_requested(filter_func: Callable) +signal keys_requested(query_func: Callable) signal is_configuring_changed(value: bool) signal player_key_changed(game_key: GameKey) signal player_finished_move(game_key: GameKey) @@ -13,7 +13,7 @@ signal player_finished_move(game_key: GameKey) @export_tool_button("Generate keys") var generate_editor_keys_btn := _generate_editor_keys @export_tool_button("Delete keys") var delete_editor_keys_btn := _delete_editor_keys -@export_tool_button("Request keys") var request_keys_btn := _request_keys +@export_tool_button("Request keys") var query_keys_btn := _query_keys @export_group("References") @export var _keys_holder: Node3D @@ -44,8 +44,8 @@ var prompt_pages_total: int = 0 var _rot_sod: SecondOrderDynamics -var _requested_keys: Array[GameKey] = [] -var _requested_keys_limit: int = 0 +var _queried_keys: Array[GameKey] = [] +var _queried_keys_limit: int = 0 @onready var _gap_to_size_ratio: float @onready var _pressing_lean_rad := Vector2( @@ -129,9 +129,9 @@ func emit_player_finished_move(game_key: GameKey) -> void: player_finished_move.emit(game_key) -func request_key_by_keycode(keycode: Key) -> GameKey: +func query_key_by_keycode(keycode: Key) -> GameKey: var found_key: GameKey - var result := request_keys( + var result := query_keys( func(game_key: GameKey) -> bool: return game_key.props.keycode == keycode, 1 ) if result: @@ -139,23 +139,23 @@ func request_key_by_keycode(keycode: Key) -> GameKey: return found_key -func request_keys(filter_func: Callable, limit: int = 0) -> Array[GameKey]: - _requested_keys = [] - _requested_keys_limit = limit +func query_keys(query_func: Callable, limit: int = 0) -> Array[GameKey]: + _queried_keys = [] + _queried_keys_limit = limit - keys_requested.emit(filter_func) - var requested_keys := _requested_keys + keys_requested.emit(query_func) + var queried_keys := _queried_keys - _requested_keys = [] - _requested_keys_limit = 0 + _queried_keys = [] + _queried_keys_limit = 0 - requested_keys.sort_custom(KeyHelper.sort_func) - return requested_keys + queried_keys.sort_custom(KeyHelper.sort_func) + return queried_keys -func key_request_respond(game_key: GameKey) -> void: - if _requested_keys_limit == 0 or _requested_keys.size() < _requested_keys_limit: - _requested_keys.append(game_key) +func key_query_respond(game_key: GameKey) -> void: + if _queried_keys_limit == 0 or _queried_keys.size() < _queried_keys_limit: + _queried_keys.append(game_key) #endregion @@ -295,8 +295,8 @@ func _delete_editor_keys() -> void: node.queue_free() -func _request_keys() -> void: - print(request_key_by_keycode(KEY_SHIFT)) +func _query_keys() -> void: + print(query_key_by_keycode(KEY_SHIFT)) #endregion diff --git a/scripts/player.gd b/scripts/player.gd index 1363160..02eb945 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -23,7 +23,7 @@ var _prev_pos: Vector3 #region builtins func _ready() -> void: _keyboard.key_press_changed.connect(_on_keyboard_key_press_changed) - _current_key = _keyboard.request_key_by_keycode(_starting_keycode) + _current_key = _keyboard.query_key_by_keycode(_starting_keycode) if _current_key: global_transform = _current_key.player_pos_marker.global_transform _keyboard.emit_player_key_change(_current_key)