From b3486df3b4efcdd4e0a4e342a2f0448f497ee4b7 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 28 Sep 2025 15:52:13 +0200 Subject: Fix multiple background in setup menu (close #426) --- client/gui/menus/setup/setup.gd | 4 +++- client/gui/menus/setup/setup.tscn | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'client') diff --git a/client/gui/menus/setup/setup.gd b/client/gui/menus/setup/setup.gd index 915bfcc2..c17602ef 100644 --- a/client/gui/menus/setup/setup.gd +++ b/client/gui/menus/setup/setup.gd @@ -40,7 +40,9 @@ func _ready(): spacer.size_flags_vertical = Control.SIZE_EXPAND spacer.custom_minimum_size.x = 50 select_uniform.add_child(spacer) - + + $Background.visible = get_parent() is Entry + # Enable msaa 2D for this scene Global.get_viewport().msaa_2d = Viewport.MSAA_4X diff --git a/client/gui/menus/setup/setup.tscn b/client/gui/menus/setup/setup.tscn index 657322a0..763a6676 100644 --- a/client/gui/menus/setup/setup.tscn +++ b/client/gui/menus/setup/setup.tscn @@ -385,18 +385,18 @@ autoplay = true stream = ExtResource("6_wf0gh") volume_db = -16.0 -[node name="Node3D" type="Node3D" parent="."] +[node name="Background" type="Node3D" parent="."] -[node name="Camera3D" type="Camera3D" parent="Node3D"] +[node name="Camera3D" type="Camera3D" parent="Background"] transform = Transform3D(1, 0, 0, 0, 0.9781476, 0.2079117, 0, -0.2079117, 0.9781476, 0, 1.125, 2.75) fov = 40.0 -[node name="OmniLight3D" type="OmniLight3D" parent="Node3D"] +[node name="OmniLight3D" type="OmniLight3D" parent="Background"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.9320438, 1.5322332, 4.4919252) light_color = Color(0.91730624, 0.87936515, 0.8454916, 1) omni_range = 16.873302 -[node name="KitchenBackground" parent="Node3D" instance=ExtResource("7_k81bu")] +[node name="KitchenBackground" parent="Background" instance=ExtResource("7_k81bu")] transform = Transform3D(0.8660254, 0, 0.5, 0, 1, 0, -0.5, 0, 0.8660254, 0, 0, 0) [connection signal="pressed" from="ScrollContainer/Control/TextureRect/PaperMargin/Contents/Signatures/EmployeeMargin/Sign/Signature" to="." method="_on_sign_pressed"] -- cgit v1.2.3-70-g09d2