From a0e541d82fc1589e5b3579fc4e170d2455085e7c Mon Sep 17 00:00:00 2001 From: betalars Date: Fri, 5 Sep 2025 02:05:02 +0200 Subject: [PATCH] include video settings in demo main to test steamdeck performance changes --- src/demo-main.tscn | 47 +++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src/demo-main.tscn b/src/demo-main.tscn index 4e0e231..522e351 100644 --- a/src/demo-main.tscn +++ b/src/demo-main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=3 uid="uid://cd63barv73rfx"] +[gd_scene load_steps=40 format=3 uid="uid://cd63barv73rfx"] [ext_resource type="Texture2D" uid="uid://d3ewjumh0b0g6" path="res://logic-scenes/main menu/logo.png" id="1_61qpo"] [ext_resource type="Texture2D" uid="uid://ds1n0xhxqlp4b" path="res://base-environments/youth_room/shaders/universe_noise.png" id="1_t34p3"] @@ -14,6 +14,7 @@ [ext_resource type="PackedScene" uid="uid://g2a27jwdapai" path="res://logic-scenes/card_burner/card_burner.tscn" id="10_kj67n"] [ext_resource type="Script" uid="uid://sa15wakvpj2e" path="res://dev-util/bug_button.gd" id="11_kj67n"] [ext_resource type="PackedScene" uid="uid://b3wlecqvelh22" path="res://logic-scenes/main menu/acessability_settings.tscn" id="11_kt5p7"] +[ext_resource type="PackedScene" uid="uid://gmxenhavh1lp" path="res://logic-scenes/main menu/video_settings.tscn" id="11_mivr6"] [ext_resource type="PackedScene" uid="uid://citwb7f4dl3l1" path="res://thank-you.tscn" id="13_xo70c"] [ext_resource type="AudioStream" uid="uid://cho5neuxkvpyh" path="res://base-environments/youth_room/audio/Voice Loop.wav" id="14_k41g6"] @@ -50,6 +51,8 @@ func prepare_transition(_id): func transition(_id, _repeat): #$TextureRect.texture = get_tree().root.get_texture() #$TextureRect.visible = true + while ResourceLoader.load_threaded_get_status(\"res://base-environments/transition/first_platform.tscn\") != ResourceLoader.THREAD_LOAD_IN_PROGRESS: + await get_tree().process_frame loaded_room.unload() var packed_second_room:PackedScene = ResourceLoader.load_threaded_get(\"res://base-environments/transition/first_platform.tscn\") loaded_room.queue_free() @@ -212,40 +215,40 @@ fill = 1 fill_from = Vector2(0.538462, 0.491453) fill_to = Vector2(1.3, -0.3) -[sub_resource type="InputEventKey" id="InputEventKey_kt5p7"] +[sub_resource type="InputEventKey" id="InputEventKey_mivr6"] device = -1 physical_keycode = 87 unicode = 119 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_mivr6"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_52c3j"] device = -1 axis = 1 axis_value = -1.0 -[sub_resource type="InputEventKey" id="InputEventKey_52c3j"] +[sub_resource type="InputEventKey" id="InputEventKey_b7q2n"] device = -1 physical_keycode = 65 unicode = 97 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_b7q2n"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_qhf78"] device = -1 axis_value = -1.0 -[sub_resource type="InputEventKey" id="InputEventKey_qhf78"] +[sub_resource type="InputEventKey" id="InputEventKey_gatj6"] device = -1 physical_keycode = 68 unicode = 100 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_gatj6"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_ol51q"] device = -1 axis_value = 1.0 -[sub_resource type="InputEventKey" id="InputEventKey_ol51q"] +[sub_resource type="InputEventKey" id="InputEventKey_2rqk2"] device = -1 physical_keycode = 83 unicode = 115 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_2rqk2"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_w8m28"] device = -1 axis = 1 axis_value = 1.0 @@ -363,6 +366,8 @@ func _process(_delta): text = \"%d/%d\" % [Engine.get_frames_per_second(), Engine.max_fps] " +[sub_resource type="VideoStreamTheora" id="VideoStreamTheora_kt5p7"] + [node name="DemoMain" type="Node3D"] process_mode = 3 script = SubResource("GDScript_t34p3") @@ -432,6 +437,10 @@ text = "*Als Messe-Demo geprüft. Entspricht angestrebtem finalen Rating." horizontal_alignment = 1 autowrap_mode = 2 +[node name="Usk12" type="Sprite2D" parent="Menu"] +position = Vector2(229, 224) +texture = ExtResource("2_ncfee") + [node name="VBoxContainer2" type="VBoxContainer" parent="Menu"] layout_mode = 1 anchors_preset = 8 @@ -545,7 +554,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_forwards" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_kt5p7"), SubResource("InputEventJoypadMotion_mivr6")]) +events = Array[InputEvent]([SubResource("InputEventKey_mivr6"), SubResource("InputEventJoypadMotion_52c3j")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="ActionPrompt2" type="TextureRect" parent="Menu/Control"] @@ -560,7 +569,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_left" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_52c3j"), SubResource("InputEventJoypadMotion_b7q2n")]) +events = Array[InputEvent]([SubResource("InputEventKey_b7q2n"), SubResource("InputEventJoypadMotion_qhf78")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="ActionPrompt4" type="TextureRect" parent="Menu/Control"] @@ -575,7 +584,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_right" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_qhf78"), SubResource("InputEventJoypadMotion_gatj6")]) +events = Array[InputEvent]([SubResource("InputEventKey_gatj6"), SubResource("InputEventJoypadMotion_ol51q")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="ActionPrompt3" type="TextureRect" parent="Menu/Control"] @@ -590,7 +599,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_backwards" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_ol51q"), SubResource("InputEventJoypadMotion_2rqk2")]) +events = Array[InputEvent]([SubResource("InputEventKey_2rqk2"), SubResource("InputEventJoypadMotion_w8m28")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="Label" type="Label" parent="Menu/Control"] @@ -621,6 +630,13 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") [node name="PrivacyAndDataProtection" parent="Menu/PrivacyPanel" instance=ExtResource("10_jirkf")] layout_mode = 2 +[node name="Video Settings" parent="Menu" instance=ExtResource("11_mivr6")] +layout_mode = 1 +offset_left = 2330.0 +offset_top = 96.0 +offset_right = 2330.0 +offset_bottom = 96.0 + [node name="TextureRect" type="TextureRect" parent="."] visible = false anchors_preset = 15 @@ -744,6 +760,11 @@ offset_right = 40.0 offset_bottom = 35.0 script = SubResource("GDScript_kt5p7") +[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="."] +offset_right = 40.0 +offset_bottom = 40.0 +stream = SubResource("VideoStreamTheora_kt5p7") + [connection signal="pressed" from="Menu/VBoxContainer2/PressStart" to="." method="_on_start_button_pressed"] [connection signal="toggled" from="Menu/VBoxContainer/CNBox" to="." method="_on_cn_box_toggled"] [connection signal="toggled" from="Menu/VBoxContainer/MotionBox" to="." method="_on_motion_box_toggled"]