diff --git a/src/base-environments/youth_room/youth_room.VoxelGI_data.res b/src/base-environments/youth_room/youth_room.VoxelGI_data.res index cdca1c4..ea4f1cc 100644 Binary files a/src/base-environments/youth_room/youth_room.VoxelGI_data.res and b/src/base-environments/youth_room/youth_room.VoxelGI_data.res differ diff --git a/src/base-environments/youth_room/youth_room.lmbake b/src/base-environments/youth_room/youth_room.lmbake new file mode 100644 index 0000000..1f55be5 Binary files /dev/null and b/src/base-environments/youth_room/youth_room.lmbake differ diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index b772fbe..05b870b 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -368,6 +368,18 @@ tracks/17/keys = { "update": 0, "values": [0.0] } +tracks/18/type = "value" +tracks/18/imported = false +tracks/18/enabled = true +tracks/18/path = NodePath("%ScenePlayer/OmniLight3D:visible") +tracks/18/interp = 1 +tracks/18/loop_wrap = true +tracks/18/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_ea6x8"] resource_name = "childhood_music" @@ -534,6 +546,18 @@ tracks/10/keys = { "method": &"start_soundtrack" }] } +tracks/11/type = "value" +tracks/11/imported = false +tracks/11/enabled = true +tracks/11/path = NodePath("%ScenePlayer/OmniLight3D:visible") +tracks/11/interp = 1 +tracks/11/loop_wrap = true +tracks/11/keys = { +"times": PackedFloat32Array(24.2, 27.9, 131.345, 132.673), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [false, true, true, false] +} [sub_resource type="Animation" id="Animation_1pmhi"] resource_name = "intro" @@ -1437,10 +1461,11 @@ ssil_enabled = true ssil_radius = 2.0 ssil_intensity = 0.5 ssil_normal_rejection = 0.8 -sdfgi_enabled = true sdfgi_use_occlusion = true sdfgi_read_sky_light = false sdfgi_min_cell_size = 0.00976562 +sdfgi_cascade0_distance = 0.625 +sdfgi_max_distance = 10.0 glow_enabled = true glow_levels/2 = 0.3 glow_levels/7 = 2.0 @@ -1454,7 +1479,6 @@ fog_light_color = Color(0.141176, 0.133333, 0.301961, 1) fog_sky_affect = 0.0 fog_height = 1.0 fog_height_density = 0.1 -adjustment_enabled = true [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_26mp0"] auto_exposure_enabled = true @@ -1473,6 +1497,7 @@ func _ready(): State.environment_settings_changed.connect(_on_environment_settings_update) Scenes.scene_starting.connect(scene_starting) Scenes.scene_finished.connect(scene_finished) + _on_environment_settings_update() func focus_env(): var dof_strength_tween: Tween = create_tween() @@ -1825,11 +1850,12 @@ mesh = ExtResource("6_gy6jv") skeleton = NodePath("../../..") [node name="starlight_ambient" type="SpotLight3D" parent="logic/ScenePlayer/starlight_mesh"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.644969, 2.60833, -0.247641) +transform = Transform3D(1.001, 0, 0, 0, -4.37552e-08, 1.001, 0, -1.001, -4.37552e-08, 0.644969, 2.70318, -0.247641) light_color = Color(0.0313726, 0, 1, 1) light_energy = 0.2 light_volumetric_fog_energy = 0.0 light_specular = 0.0 +light_bake_mode = 1 light_cull_mask = 4294967293 shadow_blur = 1.277 spot_angle = 85.9425 @@ -1854,6 +1880,7 @@ material = ExtResource("28_oiweb") [node name="OmniLight3D" type="OmniLight3D" parent="logic/ScenePlayer"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.12436, -0.521364) +visible = false light_color = Color(0.741176, 0.211765, 0.698039, 1) light_energy = 0.0 light_size = 1.0 @@ -2225,33 +2252,25 @@ light_energy = 0.5 omni_range = 0.147682 [node name="OmniLight3D2" type="OmniLight3D" parent="visuals/lights"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.77406, 0.63822, -0.383553) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.10614, 0.582081, 0.161548) light_color = Color(0.894118, 0.87451, 0.686275, 1) light_size = 0.2 light_specular = 0.1 +light_bake_mode = 1 shadow_enabled = true -omni_range = 2.77016 -omni_attenuation = 0.450626 - -[node name="OmniLight3D3" type="OmniLight3D" parent="visuals/lights"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.71696, 0.532118, 0.541634) -visible = false -light_color = Color(0.929412, 0.866667, 0.639216, 1) -light_energy = 0.3 -light_size = 0.1 -shadow_enabled = true -omni_range = 2.17653 +omni_range = 2.0 omni_attenuation = 0.450626 [node name="OmniLight3D4" type="OmniLight3D" parent="visuals/lights"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.47143, 1.6968, -0.554695) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.47143, 1.6968, -0.548992) layers = 32769 light_color = Color(0.894118, 0.87451, 0.686275, 1) light_energy = 0.1 light_size = 0.3 light_specular = 0.0 +light_bake_mode = 1 shadow_enabled = true -omni_range = 2.17653 +omni_range = 1.3534 omni_attenuation = 1.41421 [node name="LightAnimation" type="AnimationPlayer" parent="visuals/lights" groups=["scene_actors"]] @@ -2286,6 +2305,7 @@ ambient_mode = 0 [node name="lower_bunkbed_probe" type="ReflectionProbe" parent="visuals/lighting aids"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.58996, 0.192757, -0.633191) +visible = false max_distance = 5.0 size = Vector3(2.58293, 1.36611, 3.1946) origin_offset = Vector3(-0.718262, 0, 0.460938) @@ -2305,6 +2325,7 @@ ambient_mode = 0 [node name="desk_probe" type="ReflectionProbe" parent="visuals/lighting aids"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539355, 1.28256, 1.24151) +visible = false max_distance = 5.0 size = Vector3(1.22007, 1.24704, 2) origin_offset = Vector3(0, -0.438, 0) @@ -2330,6 +2351,7 @@ light_color = Color(0.282353, 0.45098, 0.258824, 1) light_energy = 1.5 light_size = 0.2 light_specular = 0.1 +light_bake_mode = 1 spot_range = 1.5 spot_attenuation = 1.1487 spot_angle = 126.18 @@ -2399,14 +2421,6 @@ transform = Transform3D(-0.51156, -0.746323, -0.425804, 0.144568, -0.563249, 0.8 mesh = ExtResource("19_jr2bb") skeleton = NodePath("") -[node name="OmniLight3D" type="OmniLight3D" parent="old-mask/old_mask"] -transform = Transform3D(1, -3.8743e-07, 5.96046e-08, 3.57628e-07, 1, 8.9407e-08, -5.96046e-08, -8.9407e-08, 1, 0.083235, -0.219628, 0.176047) -light_color = Color(0.972549, 0.752941, 0.592157, 1) -light_energy = 0.1 -light_specular = 0.0 -omni_range = 0.457129 -omni_attenuation = 0.659754 - [node name="fairylights" parent="." instance=ExtResource("39_q6rov")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.89212, 5.96046e-08, -0.143107) light_array = Array[Vector3]([Vector3(-0.545, 0.915, 1.035), Vector3(-0.47, 0.855, 0.905), Vector3(-0.44, 0.871, 0.78), Vector3(-0.385, 0.91, 0.69), Vector3(-0.38, 0.995, 0.595), Vector3(-0.39, 0.925, 0.465), Vector3(-0.364, 0.86, 0.211), Vector3(-0.295, 0.82, 0.06), Vector3(-0.255, 0.805, -0.15), Vector3(-0.175, 0.83, -0.355), Vector3(-0.135, 0.955, -0.515), Vector3(-0.025, 0.78, -0.615), Vector3(0.115, 0.63, -0.695), Vector3(0.245, 0.555, -0.745), Vector3(0.37, 0.595, -0.805), Vector3(0.455, 0.745, -0.84), Vector3(0.505, 0.89, -0.87), Vector3(0.445, 1.175, -0.87), Vector3(0.26, 1.28, -0.815), Vector3(0.125, 1.35, -0.8), Vector3(-0.037, 1.479, -0.834), Vector3(-0.2, 1.601, -0.851), Vector3(-0.359, 1.769, -0.85), Vector3(-0.5, 1.949, -0.85), Vector3(-0.594, 2.126, -0.85), Vector3(-0.634, 2.238, -0.85), Vector3(-0.634, 2.035, -0.85), Vector3(-0.614, 1.875, -0.85), Vector3(-0.65, 1.655, -0.85), Vector3(-0.65, 1.475, -0.87)]) diff --git a/src/demo-main.tscn b/src/demo-main.tscn index 5032773..429eed2 100644 --- a/src/demo-main.tscn +++ b/src/demo-main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=3 uid="uid://cd63barv73rfx"] +[gd_scene load_steps=38 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"] @@ -37,6 +37,7 @@ func _ready() -> void: Scenes.sign_up_for_sequence(transition, Scenes.id.TRANSITION, 2) if OS.get_locale_language() == \"de\": $Menu/VBoxContainer/SpeechButton.select(1) + $Menu/VBoxContainer/SpeechButton.item_selected.emit(1) func prepare_transition(_id): await get_tree().process_frame @@ -113,7 +114,9 @@ func _on_text_button_item_selected(index: int) -> void: func _on_speech_button_item_selected(index: int) -> void: State.speech_language = index + 1 - if index == 1: %TextButton.select(1) + if index == 1: + %TextButton.select(1) + %TextButton.item_selected.emit(1) func _unhandled_input(event: InputEvent) -> void: if event is InputEvent and in_game: @@ -121,10 +124,10 @@ func _unhandled_input(event: InputEvent) -> void: toggle_pause_menu() func show_accessibility_settings(): - %AccessibilityPanel.show() - State.pass_stage_to(%Accessibility.has_stage) + %AccessibilityContainer.show() + %Accessibility.is_active = true await %Accessibility.leave_stage - %AccessibilityPanel.hide() + %AccessibilityContainer.hide() func toggle_pause_menu(): if not get_tree().paused: @@ -343,6 +346,13 @@ _data = { &"ending": SubResource("Animation_kt5p7") } +[sub_resource type="GDScript" id="GDScript_kt5p7"] +script/source = "extends Label + +func _process(_delta): + text = \"%d/%d\" % [Engine.get_frames_per_second(), Engine.max_fps] +" + [node name="DemoMain" type="Node3D"] process_mode = 3 script = SubResource("GDScript_t34p3") @@ -601,28 +611,6 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") [node name="PrivacyAndDataProtection" parent="Menu/PrivacyPanel" instance=ExtResource("10_jirkf")] layout_mode = 2 -[node name="CenterContainer" type="CenterContainer" parent="Menu"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="AccessibilityPanel" type="PanelContainer" parent="Menu/CenterContainer"] -unique_name_in_owner = true -visible = false -layout_mode = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") - -[node name="Accessibility" parent="Menu/CenterContainer/AccessibilityPanel" instance=ExtResource("11_kt5p7")] -unique_name_in_owner = true -layout_mode = 2 - -[node name="Accessibility2" parent="Menu/CenterContainer/AccessibilityPanel" instance=ExtResource("11_kt5p7")] -unique_name_in_owner = true -layout_mode = 2 - [node name="TextureRect" type="TextureRect" parent="."] visible = false anchors_preset = 15 @@ -717,6 +705,27 @@ text = "Skip this Story" visible = false mouse_filter = 2 +[node name="AccessibilityContainer" type="CenterContainer" parent="."] +unique_name_in_owner = true +visible = false +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="AccessibilityPanel" type="PanelContainer" parent="AccessibilityContainer"] +layout_mode = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_kt5p7") + +[node name="Accessibility" parent="AccessibilityContainer/AccessibilityPanel" instance=ExtResource("11_kt5p7")] +unique_name_in_owner = true +layout_mode = 2 + +[node name="Accessibility2" parent="AccessibilityContainer/AccessibilityPanel" instance=ExtResource("11_kt5p7")] +unique_name_in_owner = true +layout_mode = 2 + [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="AudioStreamPlayer"] @@ -724,6 +733,11 @@ libraries = { &"": SubResource("AnimationLibrary_mivr6") } +[node name="FPSLabel" type="Label" parent="."] +offset_right = 40.0 +offset_bottom = 35.0 +script = SubResource("GDScript_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"] diff --git a/src/main.tscn b/src/main.tscn index 1fde4f2..d3392b9 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -1094,7 +1094,7 @@ mouse_filter = 2 [node name="Main Menu" parent="." instance=ExtResource("3_ik73t")] unique_name_in_owner = true -[node name="Label" type="Label" parent="."] +[node name="FPSLabel" type="Label" parent="."] visible = false offset_right = 40.0 offset_bottom = 35.0 diff --git a/src/project.godot b/src/project.godot index ffb22a2..096505b 100644 --- a/src/project.godot +++ b/src/project.godot @@ -191,6 +191,7 @@ locale/test="de" [rendering] textures/vram_compression/import_etc2_astc=true +lights_and_shadows/directional_shadow/size=2048 viewport/hdr_2d=true anti_aliasing/quality/msaa_3d=2 environment/screen_space_reflection/roughness_quality=2