diff --git a/src/base-environments/youth_room/import/materials/starlight_shader.material b/src/base-environments/youth_room/import/materials/starlight_shader.material index a108595..08845a6 100644 Binary files a/src/base-environments/youth_room/import/materials/starlight_shader.material and b/src/base-environments/youth_room/import/materials/starlight_shader.material differ diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 4737224..dcac19d 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=117 format=3 uid="uid://b3b0gyvklqn50"] +[gd_scene load_steps=125 format=3 uid="uid://b3b0gyvklqn50"] [ext_resource type="Script" path="res://base-environments/youth_room/room_handle.gd" id="1_aitp0"] [ext_resource type="PackedScene" uid="uid://c0i4ydmxtxfho" path="res://base-environments/youth_room/import/youth_room.glb" id="1_jf3oi"] @@ -33,8 +33,10 @@ [ext_resource type="PackedScene" uid="uid://bpjympn3ps3wo" path="res://logic-scenes/luna/luna_imported.tscn" id="27_pb1jl"] [ext_resource type="Material" uid="uid://ct7uc5i5yp5qf" path="res://base-environments/youth_room/import/materials/wall.tres" id="28_oiweb"] [ext_resource type="PackedScene" uid="uid://bwc2wp7tckm7t" path="res://base-environments/youth_room/outside.tscn" id="32_2vgep"] +[ext_resource type="Shader" path="res://base-environments/intro_scene/shaders/stars.gdshader" id="32_k5rvd"] [ext_resource type="Material" uid="uid://bmu72cnsr8c5e" path="res://base-environments/youth_room/shaders/window.material" id="32_pwbgf"] [ext_resource type="ArrayMesh" uid="uid://jjrvf8px2ut3" path="res://base-environments/youth_room/shaders/winfow_frames.res" id="32_w6oa5"] +[ext_resource type="Texture2D" uid="uid://dabnlcnuticww" path="res://base-environments/intro_scene/textures/sky_textures_2.png" id="33_mvrs2"] [sub_resource type="BoxShape3D" id="BoxShape3D_j3mqx"] size = Vector3(0.711297, 2.53136, 1.74815) @@ -1969,15 +1971,46 @@ func _process(delta): [sub_resource type="ViewportTexture" id="ViewportTexture_hwb6d"] viewport_path = NodePath("MeshInstance3D/SubViewport") -[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_et8yw"] +[sub_resource type="Gradient" id="Gradient_d5lk6"] +interpolation_mode = 2 +offsets = PackedFloat32Array(0, 0.175337, 0.414258, 0.593449, 0.700565, 0.770713, 0.798493, 0.809793, 0.954802) +colors = PackedColorArray(0, 0, 0, 0, 0.003, 0.0047, 0.02, 0.584314, 0.02385, 0.009, 0.09, 0, 0.06228, 0.0312, 0.12, 1, 0.22, 0.055, 0.1815, 0, 0.816757, 0.155467, 0.208686, 0.819608, 0.0136439, 0.0237636, 0.0955315, 1, 0.0120242, 0.0120251, 0.0360567, 0.356863, 0.00319355, 0.00476964, 0.0186391, 0.313726) -[sub_resource type="Sky" id="Sky_188qv"] -sky_material = SubResource("ProceduralSkyMaterial_et8yw") +[sub_resource type="GradientTexture1D" id="GradientTexture1D_apxml"] +gradient = SubResource("Gradient_d5lk6") +use_hdr = true + +[sub_resource type="Gradient" id="Gradient_liqu7"] +interpolation_mode = 2 +interpolation_color_space = 1 +offsets = PackedFloat32Array(0, 0.137476, 0.46516, 0.851224) +colors = PackedColorArray(0.127188, 0.325303, 0.352533, 1, 0.0512, 0.18112, 0.32, 1, 0.0406, 0.0530699, 0.29, 1, 0.106137, 0.0034, 0.17, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_vetqo"] +gradient = SubResource("Gradient_liqu7") +use_hdr = true + +[sub_resource type="Gradient" id="Gradient_87cdb"] +colors = PackedColorArray(0.85, 0.46325, 0.0765, 1, 0.825717, 0.47559, 0.983214, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_8fou6"] +gradient = SubResource("Gradient_87cdb") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_s2c5b"] +shader = ExtResource("32_k5rvd") +shader_parameter/star_size = 120.0 +shader_parameter/nebula_offset = 0.5 +shader_parameter/star_colors = SubResource("GradientTexture1D_8fou6") +shader_parameter/sky_gradient = SubResource("GradientTexture1D_vetqo") +shader_parameter/nebula_gradient = SubResource("GradientTexture1D_apxml") +shader_parameter/universe_background = ExtResource("33_mvrs2") + +[sub_resource type="Sky" id="Sky_85fpg"] +sky_material = SubResource("ShaderMaterial_s2c5b") [sub_resource type="Environment" id="Environment_pllnm"] background_mode = 2 -background_energy_multiplier = 0.2 -sky = SubResource("Sky_188qv") +sky = SubResource("Sky_85fpg") sky_rotation = Vector3(0, 0.352557, 0) ambient_light_source = 3 ambient_light_color = Color(1, 1, 1, 1) @@ -2593,7 +2626,7 @@ layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 2 -scroll_vertical = 638 +scroll_vertical = 315 horizontal_scroll_mode = 0 vertical_scroll_mode = 3 @@ -2726,7 +2759,6 @@ layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 0 -scroll_vertical = 150 horizontal_scroll_mode = 0 vertical_scroll_mode = 3 diff --git a/src/dev-util/sky prototyping.tscn b/src/dev-util/sky prototyping.tscn index 3a3cf7b..eda5465 100644 --- a/src/dev-util/sky prototyping.tscn +++ b/src/dev-util/sky prototyping.tscn @@ -6,7 +6,7 @@ [sub_resource type="Gradient" id="Gradient_d5lk6"] interpolation_mode = 2 offsets = PackedFloat32Array(0, 0.175337, 0.414258, 0.593449, 0.700565, 0.770713, 0.798493, 0.809793, 0.954802) -colors = PackedColorArray(0, 0, 0, 0, 0.0175207, 0.016833, 0.0606262, 0.584314, 0.0258333, 0.021, 0.05, 0, 0.06228, 0.0312, 0.12, 1, 0.22, 0.055, 0.1815, 0, 0.816757, 0.155467, 0.208686, 0.819608, 0.0136439, 0.0237636, 0.0955315, 1, 0.0120242, 0.0120251, 0.0360567, 0.356863, 0.00319355, 0.00476964, 0.0186391, 0.313726) +colors = PackedColorArray(0, 0, 0, 0, 0.003, 0.0047, 0.02, 0.584314, 0.02385, 0.009, 0.09, 0, 0.06228, 0.0312, 0.12, 1, 0.22, 0.055, 0.1815, 0, 0.816757, 0.155467, 0.208686, 0.819608, 0.0136439, 0.0237636, 0.0955315, 1, 0.0120242, 0.0120251, 0.0360567, 0.356863, 0.00319355, 0.00476964, 0.0186391, 0.313726) [sub_resource type="GradientTexture1D" id="GradientTexture1D_apxml"] gradient = SubResource("Gradient_d5lk6") @@ -16,7 +16,7 @@ use_hdr = true interpolation_mode = 2 interpolation_color_space = 1 offsets = PackedFloat32Array(0, 0.137476, 0.46516, 0.851224) -colors = PackedColorArray(0.127188, 0.325303, 0.352533, 1, 0.21, 0.2975, 0.42, 1, 0.1189, 0.127455, 0.29, 1, 0.106137, 0.0034, 0.17, 1) +colors = PackedColorArray(0.127188, 0.325303, 0.352533, 1, 0.0512, 0.18112, 0.32, 1, 0.0406, 0.0530699, 0.29, 1, 0.106137, 0.0034, 0.17, 1) [sub_resource type="GradientTexture1D" id="GradientTexture1D_vetqo"] gradient = SubResource("Gradient_liqu7")