From 921178affdb93b018273875f6e2435d597cbb45e Mon Sep 17 00:00:00 2001 From: teatov Date: Thu, 31 Jul 2025 11:21:36 +1000 Subject: [PATCH] set `_gap_to_size_ratio` on every regeneration --- scenes/game_keyboard.tscn | 1 - scripts/game_keyboard.gd | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scenes/game_keyboard.tscn b/scenes/game_keyboard.tscn index e09778e..69391fb 100644 --- a/scenes/game_keyboard.tscn +++ b/scenes/game_keyboard.tscn @@ -14,7 +14,6 @@ stream_0/stream = ExtResource("2_j5t22") script = ExtResource("1_3k4ps") _keys_holder = NodePath("Keys") _sfx_player = NodePath("SFXPlayer") -key_size = 0.685 _layout_swap_sfx = SubResource("AudioStreamRandomizer_hylia") [node name="Keys" type="Node3D" parent="."] diff --git a/scripts/game_keyboard.gd b/scripts/game_keyboard.gd index 0aa28c7..d935197 100644 --- a/scripts/game_keyboard.gd +++ b/scripts/game_keyboard.gd @@ -23,7 +23,7 @@ var alt_visual_layout: bool var pressed_positions: Dictionary[Vector3, bool] var anim_time: float -@onready var _gap_to_size_ratio: float = key_gap / key_size +@onready var _gap_to_size_ratio: float @onready var _pressing_lean_rad := Vector2( deg_to_rad(_pressing_lean_deg.x), deg_to_rad(_pressing_lean_deg.y) ) @@ -93,6 +93,7 @@ func emit_key_press(game_key: GameKey, event: InputEventKey) -> void: func _generate_keys(layout_rows: Array[Array]) -> void: print("generating keys... ", LayoutConfig.current_layout.name()) + _set_gap_to_size_ratio() for row: Array[KeyProps] in layout_rows: _set_row_key_scales_with_gaps(row) @@ -177,6 +178,10 @@ func _get_row_key_step(key_props: KeyProps) -> Vector3: return Vector3(step_x, 0, step_z) +func _set_gap_to_size_ratio() -> void: + _gap_to_size_ratio = key_gap / key_size + + #endregion @@ -217,6 +222,7 @@ func _regenerate_keys(layout_rows: Array[Array]) -> void: else: current_keys[dict_key] = [game_key] as Array[GameKey] + _set_gap_to_size_ratio() for row: Array[KeyProps] in layout_rows: _set_row_key_scales_with_gaps(row)