Update to Godot 4.2.1 (#79)

project.godot

@@ -12,16 +12,15 @@ config_version=5
 
 config/name="Sponza"
 run/main_scene="res://scenes/sponza.scn"
-config/features=PackedStringArray("4.0")
+config/features=PackedStringArray("4.2")
 config/icon="res://icon.png"
 
 [display]
 
-window/vsync/vsync_mode=0
+window/size/mode=3
 window/stretch/mode="canvas_items"
 window/stretch/aspect="expand"
-window/size/height=576
-window/size/fullscreen=true
+window/vsync/vsync_mode=0
 
 [gdnative]
 
@@ -36,75 +35,73 @@ _global_script_class_icons={}
 
 move_forward={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"key_label":0,"unicode":119,"echo":false,"script":null)
 ]
 }
 move_backward={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"key_label":0,"unicode":115,"echo":false,"script":null)
 ]
 }
 move_left={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"key_label":0,"unicode":97,"echo":false,"script":null)
 ]
 }
 move_right={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"key_label":0,"unicode":100,"echo":false,"script":null)
 ]
 }
 move_up={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"echo":false,"script":null)
 ]
 }
 move_down={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194325,"physical_keycode":4194325,"key_label":4194325,"unicode":0,"echo":false,"script":null)
 ]
 }
 move_speed={
 "deadzone": 0.5,
-"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"pressed":false,"double_click":false,"script":null)
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
 ]
 }
 toggle_mouse_capture={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194341,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 toggle_hud={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194332,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 toggle_menu={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194305,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 toggle_fullscreen={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194342,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":true,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 movement_speed_increase={
 "deadzone": 0.5,
-"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"pressed":false,"double_click":false,"script":null)
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null)
 ]
 }
 movement_speed_decrease={
 "deadzone": 0.5,
-"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"pressed":false,"double_click":false,"script":null)
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null)
 ]
 }
 toggle_frame_time_graph={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194334,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 

scenes/settings_gui.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=10 format=3 uid="uid://dfjh4s01g77bl"]
 
 [ext_resource type="Script" path="res://scripts/settings_gui.gd" id="2"]
-[ext_resource type="Font" path="res://resources/fonts/title.tres" id="3"]
-[ext_resource type="Font" path="res://resources/fonts/text_strong.tres" id="4"]
-[ext_resource type="Font" path="res://resources/fonts/text.tres" id="5"]
-[ext_resource type="Font" path="res://resources/fonts/text_small.tres" id="6"]
+[ext_resource type="FontFile" path="res://resources/fonts/title.tres" id="3"]
+[ext_resource type="FontFile" path="res://resources/fonts/text_strong.tres" id="4"]
+[ext_resource type="FontFile" path="res://resources/fonts/text.tres" id="5"]
+[ext_resource type="FontFile" path="res://resources/fonts/text_small.tres" id="6"]
 
 [sub_resource type="StyleBoxFlat" id="1"]
 bg_color = Color(0.0627451, 0.0627451, 0.0627451, 0.501961)
@@ -19,8 +19,8 @@ anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id="2"]
 content_margin_left = 16.0
-content_margin_right = 16.0
 content_margin_top = 16.0
+content_margin_right = 16.0
 content_margin_bottom = 16.0
 bg_color = Color(0.0627451, 0.0627451, 0.0627451, 0.313726)
 border_width_left = 1
@@ -36,124 +36,122 @@ anti_aliasing = false
 [sub_resource type="StyleBoxEmpty" id="4"]
 
 [node name="SettingsGUI" type="Control"]
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-script = ExtResource( "2" )
-__meta__ = {
-"_edit_use_anchors_": false
-}
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("2")
 
 [node name="Panel" type="Panel" parent="."]
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
-theme_override_styles/panel = SubResource( "1" )
-
-[node name="WelcomeTitle" type="Label" parent="Panel"]
-theme_override_fonts/font = ExtResource( "3" )
+offset_left = 176.0
+offset_top = 74.0
+offset_right = -176.0
+offset_bottom = -74.0
+theme_override_styles/panel = SubResource("1")
+
+[node name="MainContainer" type="VBoxContainer" parent="Panel"]
+layout_mode = 0
+offset_left = 50.0
+offset_top = 50.0
+offset_right = 750.0
+offset_bottom = 458.0
+
+[node name="WelcomeTitle" type="Label" parent="Panel/MainContainer"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("3")
 theme_override_font_sizes/font_size = 16
 text = "Welcome"
 
-[node name="WelcomeText" type="Label" parent="Panel"]
+[node name="WelcomeText" type="Label" parent="Panel/MainContainer"]
+layout_mode = 2
 text = "This Sponza demo showcases the capabilities of the Godot 4 renderer.
-Please choose a preset suited to your hardware below:
-
-
-
-
-
-
-
-
+Please choose a preset suited to your hardware below:"
 
-For more reproducible benchmarks, choose a display resolution:"
-
-[node name="GraphicsQuality" type="HBoxContainer" parent="Panel"]
+[node name="GraphicsQuality" type="HBoxContainer" parent="Panel/MainContainer"]
+layout_mode = 2
 theme_override_constants/separation = 24
-__meta__ = {
-"_edit_group_": true,
-"_edit_use_anchors_": false
-}
-
-[node name="Label" type="Label" parent="Panel/GraphicsQuality"]
-offset_top = 5.0
-offset_right = 128.0
-offset_bottom = 23.0
-theme_override_fonts/font = ExtResource( "4" )
-text = "Graphics quality"
 
-[node name="OptionButton" type="OptionButton" parent="Panel/GraphicsQuality"]
-offset_left = 152.0
-offset_right = 213.0
-offset_bottom = 29.0
-text = "Low"
-items = ["Low", null, false, 0, null, "Medium", null, false, 1, null, "High", null, false, 2, null, "Ultra", null, false, 3, null]
-selected = 0
+[node name="Label" type="Label" parent="Panel/MainContainer/GraphicsQuality"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("4")
+text = "Graphics quality"
 
-[node name="GraphicsBlurb" type="RichTextLabel" parent="Panel"]
-theme_override_constants/table_hseparation = 16
+[node name="OptionButton" type="OptionButton" parent="Panel/MainContainer/GraphicsQuality"]
+layout_mode = 2
+item_count = 4
+popup/item_0/text = "Low"
+popup/item_0/id = 0
+popup/item_1/text = "Medium"
+popup/item_1/id = 1
+popup/item_2/text = "High"
+popup/item_2/id = 2
+popup/item_3/text = "Ultra"
+popup/item_3/id = 3
+
+[node name="GraphicsBlurb" type="RichTextLabel" parent="Panel/MainContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(700, 50)
+layout_mode = 2
 theme_override_constants/line_separation = 2
-theme_override_fonts/bold_font = ExtResource( "4" )
-theme_override_fonts/normal_font = ExtResource( "5" )
-theme_override_styles/focus = SubResource( "2" )
-theme_override_styles/normal = SubResource( "2" )
+theme_override_fonts/normal_font = ExtResource("5")
+theme_override_fonts/bold_font = ExtResource("4")
+theme_override_styles/focus = SubResource("2")
+theme_override_styles/normal = SubResource("2")
 bbcode_enabled = true
 
-[node name="GraphicsInfo" type="RichTextLabel" parent="Panel"]
-theme_override_constants/table_hseparation = 16
+[node name="GraphicsInfo" type="RichTextLabel" parent="Panel/MainContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 150)
+layout_mode = 2
 theme_override_constants/line_separation = 2
-theme_override_fonts/bold_font = ExtResource( "4" )
-theme_override_fonts/normal_font = ExtResource( "5" )
-theme_override_styles/focus = SubResource( "2" )
-theme_override_styles/normal = SubResource( "2" )
+theme_override_fonts/normal_font = ExtResource("5")
+theme_override_fonts/bold_font = ExtResource("4")
+theme_override_styles/focus = SubResource("2")
+theme_override_styles/normal = SubResource("2")
 bbcode_enabled = true
 
-[node name="DisplayResolution" type="HBoxContainer" parent="Panel"]
+[node name="DisplayText" type="Label" parent="Panel/MainContainer"]
+layout_mode = 2
+text = "For more reproducible benchmarks, choose a display resolution:"
+
+[node name="DisplayResolution" type="HBoxContainer" parent="Panel/MainContainer"]
+layout_mode = 2
 theme_override_constants/separation = 24
-__meta__ = {
-"_edit_group_": true
-}
-
-[node name="Label" type="Label" parent="Panel/DisplayResolution"]
-offset_top = 5.0
-offset_right = 144.0
-offset_bottom = 23.0
-theme_override_fonts/font = ExtResource( "4" )
+
+[node name="Label" type="Label" parent="Panel/MainContainer/DisplayResolution"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("4")
 text = "Display resolution"
 
-[node name="OptionButton" type="OptionButton" parent="Panel/DisplayResolution"]
-offset_left = 168.0
-offset_right = 197.0
-offset_bottom = 29.0
+[node name="OptionButton" type="OptionButton" parent="Panel/MainContainer/DisplayResolution"]
+layout_mode = 2
 
-[node name="ConfirmButton" type="Button" parent="Panel"]
-anchor_left = 0.5
-anchor_top = 1.0
-anchor_right = 0.5
-anchor_bottom = 1.0
-offset_left = -16.0
-offset_top = -48.0
-offset_right = 47.0
-offset_bottom = -19.0
+[node name="HBoxContainer" type="HBoxContainer" parent="Panel/MainContainer"]
+layout_mode = 2
+alignment = 1
+
+[node name="ConfirmButton" type="Button" parent="Panel/MainContainer/HBoxContainer"]
+layout_mode = 2
 text = "OK"
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="QuitButton" type="Button" parent="Panel"]
-offset_left = 928.0
-offset_top = 527.0
-offset_right = 996.0
-offset_bottom = 556.0
+
+[node name="QuitButton" type="Button" parent="Panel/MainContainer/HBoxContainer"]
+layout_mode = 2
 text = "Quit"
 
 [node name="MenuTip" type="RichTextLabel" parent="Panel"]
-theme_override_fonts/normal_font = ExtResource( "6" )
-theme_override_styles/focus = SubResource( "3" )
-theme_override_styles/normal = SubResource( "4" )
-text = "Press [Escape] to toggle this menu."
+layout_mode = 0
+theme_override_fonts/normal_font = ExtResource("6")
+theme_override_styles/focus = SubResource("3")
+theme_override_styles/normal = SubResource("4")
 bbcode_enabled = true
+text = "Press [Escape] to toggle this menu."
 
-[connection signal="item_selected" from="Panel/GraphicsQuality/OptionButton" to="." method="_on_graphics_preset_change"]
-[connection signal="item_selected" from="Panel/DisplayResolution/OptionButton" to="." method="_on_display_resolution_change"]
-[connection signal="pressed" from="Panel/ConfirmButton" to="." method="_on_ConfirmButton_pressed"]
-[connection signal="pressed" from="Panel/QuitButton" to="." method="_on_QuitButton_pressed"]
+[connection signal="item_selected" from="Panel/MainContainer/GraphicsQuality/OptionButton" to="." method="_on_graphics_preset_change"]
+[connection signal="item_selected" from="Panel/MainContainer/DisplayResolution/OptionButton" to="." method="_on_display_resolution_change"]
+[connection signal="pressed" from="Panel/MainContainer/HBoxContainer/ConfirmButton" to="." method="_on_ConfirmButton_pressed"]
+[connection signal="pressed" from="Panel/MainContainer/HBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]