From abefcb6b5cf8c433e8055ea5e981c52fd3734ab7 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Tue, 12 Aug 2025 21:55:43 -0700 Subject: [PATCH] various fixes --- Scenes/GUI/MainMenu.tscn | 55 ++++++++++++++++++++-------------------- Scripts/OptionsPanel.gd | 3 ++- Scripts/Player/player.gd | 6 ++--- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Scenes/GUI/MainMenu.tscn b/Scenes/GUI/MainMenu.tscn index c3c25bc..1ec4ee0 100644 --- a/Scenes/GUI/MainMenu.tscn +++ b/Scenes/GUI/MainMenu.tscn @@ -656,6 +656,7 @@ Project Oversight: Persephone (KawaiiZenbo) Interface Design: Persephone Simulator Backend: Persephone +Graphics Options and Settings: Pizza Perpetrator Models: Persephone: Helen House, Cyberamics, 1-Stage, C-Stage, @@ -774,17 +775,18 @@ custom_minimum_size = Vector2(180, 0) layout_mode = 2 theme_override_constants/separation = 15 -[node name="antialiasing_msaa" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/labels"] +[node name="AntialiasingLabel" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/labels"] layout_mode = 2 text = "Antialiasing (MSAA):" horizontal_alignment = 2 +vertical_alignment = 1 -[node name="aa_screenspace" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/labels"] +[node name="SSAALabel" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/labels"] layout_mode = 2 text = "Screenspace AA:" horizontal_alignment = 2 -[node name="FOV" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/labels"] +[node name="FOVLabel" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/labels"] layout_mode = 2 text = "Field of View:" horizontal_alignment = 2 @@ -821,38 +823,37 @@ popup/item_1/id = 1 [node name="fov_slider" type="HSlider" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings"] custom_minimum_size = Vector2(215, 0) layout_mode = 2 -min_value = 60.0 -value = 60.0 +min_value = 30.0 +max_value = 120.0 +value = 80.0 ticks_on_borders = true -[node name="Label" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings/fov_slider"] +[node name="MinLabel" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings/fov_slider"] layout_mode = 0 -offset_left = -2.0 -offset_top = 9.0 -offset_right = 38.0 -offset_bottom = 32.0 -text = "60" +offset_top = 16.0 +offset_right = 40.0 +offset_bottom = 48.0 +text = "30" +vertical_alignment = 1 -[node name="Label2" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings/fov_slider"] +[node name="CurrentLabel" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings/fov_slider"] layout_mode = 0 -offset_left = 197.0 -offset_top = 8.0 -offset_right = 237.0 -offset_bottom = 31.0 -text = "100" - -[node name="Label3" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings/fov_slider"] -layout_mode = 0 -offset_left = 87.0 -offset_top = 12.0 -offset_right = 127.0 -offset_bottom = 35.0 +offset_top = 16.0 +offset_right = 215.0 +offset_bottom = 48.0 text = "FOV" horizontal_alignment = 1 +vertical_alignment = 1 -[node name="spacer" type="Container" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings"] -custom_minimum_size = Vector2(0, 18.18) -layout_mode = 2 +[node name="MaxLabel" type="Label" parent="SettingsScreen/DialogPanel/GraphicsPanel/HBoxContainer/settings/fov_slider"] +layout_mode = 0 +offset_left = 175.0 +offset_top = 16.0 +offset_right = 215.0 +offset_bottom = 48.0 +text = "120" +horizontal_alignment = 2 +vertical_alignment = 1 [node name="VersionLabel" type="Label" parent="."] layout_mode = 1 diff --git a/Scripts/OptionsPanel.gd b/Scripts/OptionsPanel.gd index 5b2f888..0751d2f 100644 --- a/Scripts/OptionsPanel.gd +++ b/Scripts/OptionsPanel.gd @@ -6,6 +6,7 @@ func _ready() -> void: $HBoxContainer/settings/option_aa_msaa.selected = get_viewport().msaa_3d $HBoxContainer/settings/option_aa_ss.selected = get_viewport().screen_space_aa $HBoxContainer/settings/fov_slider.value = Globalvariables.FOV + $HBoxContainer/settings/fov_slider/CurrentLabel.text = str(int(Globalvariables.FOV)) func _on_tab_bar_tab_changed(tab: int) -> void: if (thisTab == tab): @@ -18,7 +19,7 @@ func updateconfig(): func _on_fov_slider_value_changed(value: float) -> void: Globalvariables.FOV = value - $HBoxContainer/settings/fov_slider/Label3.text = str(int(value)) + $HBoxContainer/settings/fov_slider/CurrentLabel.text = str(int(value)) func _on_option_aa_ss_item_selected(index: int) -> void: diff --git a/Scripts/Player/player.gd b/Scripts/Player/player.gd index 3dd7e01..01f5040 100644 --- a/Scripts/Player/player.gd +++ b/Scripts/Player/player.gd @@ -38,6 +38,8 @@ var jump_vel: Vector3 # Jumping velocity func _ready() -> void: capture_mouse() + if ($Camera.fov != Globalvariables.FOV): + $Camera.fov = Globalvariables.FOV func _unhandled_input(event: InputEvent) -> void: if (interact): @@ -63,10 +65,6 @@ func _unhandled_input(event: InputEvent) -> void: elif event.is_action_pressed(&"freeroam_debug_menu"): $DebugMenu.visible = !$DebugMenu.visible -func _process(delta: float) -> void: - if ($Camera.fov != Globalvariables.FOV): - $Camera.fov = Globalvariables.FOV - func _physics_process(delta: float) -> void: if (interact): if Input.is_action_just_pressed(&"freeroam_jump"): jumping = true