diff --git a/client/project.godot b/client/project.godot index 49506e9..8227305 100644 --- a/client/project.godot +++ b/client/project.godot @@ -153,6 +153,7 @@ skill_4={ 3d_render/layer_3="Trees" 3d_render/layer_4="Structures" 3d_render/layer_5="Water" +3d_render/layer_6="Clouds" 3d_render/layer_7="Loot" 3d_render/layer_9="Enemies" 3d_render/layer_10="Players" diff --git a/client/world/Environment.tres b/client/world/Environment.tres index ae5a00b..b2589e0 100644 --- a/client/world/Environment.tres +++ b/client/world/Environment.tres @@ -1,6 +1,6 @@ [gd_resource type="Environment" load_steps=2 format=3 uid="uid://dixa0yso2s1u3"] -[ext_resource type="Sky" uid="uid://chqkkvnsudiww" path="res://world/Sky.tres" id="1_akiwh"] +[ext_resource type="Sky" uid="uid://chqkkvnsudiww" path="res://world/sky/Sky.tres" id="1_akiwh"] [resource] background_mode = 2 @@ -20,7 +20,8 @@ glow_bloom = 0.2 glow_blend_mode = 1 glow_hdr_threshold = 0.7 volumetric_fog_density = 0.005 -volumetric_fog_emission = Color(0.45098, 0.690196, 1, 1) +volumetric_fog_albedo = Color(0.654902, 0.811765, 0.996078, 1) +volumetric_fog_emission = Color(0.654902, 0.811765, 0.996078, 1) adjustment_enabled = true adjustment_contrast = 1.1 adjustment_saturation = 1.1 diff --git a/client/world/Sky.tres b/client/world/Sky.tres deleted file mode 100644 index 3b6cb3b..0000000 --- a/client/world/Sky.tres +++ /dev/null @@ -1,6 +0,0 @@ -[gd_resource type="Sky" load_steps=2 format=3 uid="uid://chqkkvnsudiww"] - -[ext_resource type="Material" uid="uid://chtgn5pdoof5e" path="res://world/sky/PanoramaSkyMaterial.tres" id="1_e3kjt"] - -[resource] -sky_material = ExtResource("1_e3kjt") diff --git a/client/world/clouds/Cloud.gd b/client/world/clouds/Cloud.gd new file mode 100644 index 0000000..270166a --- /dev/null +++ b/client/world/clouds/Cloud.gd @@ -0,0 +1,6 @@ +extends FogVolume + +var speed: float = 0.1 + +func _process(delta): + position.z += speed * delta diff --git a/client/world/clouds/Cloud.tscn b/client/world/clouds/Cloud.tscn new file mode 100644 index 0000000..e83e6fc --- /dev/null +++ b/client/world/clouds/Cloud.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=3 format=3 uid="uid://citib8t72camt"] + +[ext_resource type="Material" uid="uid://hopugp3kkyfg" path="res://world/clouds/CloudFogMaterial.tres" id="1_h6r4i"] +[ext_resource type="Script" path="res://world/clouds/Cloud.gd" id="2_2qw84"] + +[node name="Cloud" type="FogVolume"] +layers = 32 +size = Vector3(30, 3, 30) +shape = 0 +material = ExtResource("1_h6r4i") +script = ExtResource("2_2qw84") diff --git a/client/world/clouds/CloudFogMaterial.tres b/client/world/clouds/CloudFogMaterial.tres new file mode 100644 index 0000000..7fe996a --- /dev/null +++ b/client/world/clouds/CloudFogMaterial.tres @@ -0,0 +1,7 @@ +[gd_resource type="FogMaterial" load_steps=2 format=3 uid="uid://hopugp3kkyfg"] + +[ext_resource type="NoiseTexture3D" uid="uid://b855oq1adebh7" path="res://world/clouds/CloudNoise.tres" id="1_0yfk1"] + +[resource] +density = 0.85 +density_texture = ExtResource("1_0yfk1") diff --git a/client/world/clouds/CloudNoise.tres b/client/world/clouds/CloudNoise.tres new file mode 100644 index 0000000..e270a35 --- /dev/null +++ b/client/world/clouds/CloudNoise.tres @@ -0,0 +1,10 @@ +[gd_resource type="NoiseTexture3D" load_steps=3 format=3 uid="uid://b855oq1adebh7"] + +[sub_resource type="Gradient" id="Gradient_m1jro"] +colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 0) + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_raby5"] + +[resource] +color_ramp = SubResource("Gradient_m1jro") +noise = SubResource("FastNoiseLite_raby5") diff --git a/client/world/sky/ClearSkyMaterial.tres b/client/world/sky/ClearSkyMaterial.tres new file mode 100644 index 0000000..f493a60 --- /dev/null +++ b/client/world/sky/ClearSkyMaterial.tres @@ -0,0 +1,8 @@ +[gd_resource type="ProceduralSkyMaterial" format=3 uid="uid://bjebmdqcr2a1e"] + +[resource] +sky_top_color = Color(0.192157, 0.576471, 0.976471, 1) +sky_horizon_color = Color(0.360784, 0.654902, 0.992157, 1) +ground_bottom_color = Color(0.360784, 0.654902, 0.992157, 1) +ground_horizon_color = Color(0.360784, 0.654902, 0.992157, 1) +sun_curve = 0.2 diff --git a/client/world/sky/ProceduralSkyMaterial.tres b/client/world/sky/CloudySkyMaterial.tres similarity index 52% rename from client/world/sky/ProceduralSkyMaterial.tres rename to client/world/sky/CloudySkyMaterial.tres index 96d3e6c..f8bf777 100644 --- a/client/world/sky/ProceduralSkyMaterial.tres +++ b/client/world/sky/CloudySkyMaterial.tres @@ -7,7 +7,10 @@ seamless = true noise = SubResource("FastNoiseLite_v2kyf") [resource] -sky_horizon_color = Color(0.647059, 0.654902, 0.670588, 1) +sky_top_color = Color(0.192157, 0.576471, 0.976471, 1) +sky_horizon_color = Color(0.858824, 0.964706, 0.996078, 1) sky_cover = SubResource("NoiseTexture2D_aa80t") -sky_cover_modulate = Color(0.584314, 0.584314, 0.584314, 1) -ground_bottom_color = Color(0.647059, 0.654902, 0.670588, 1) +sky_cover_modulate = Color(1, 1, 0.498039, 1) +ground_bottom_color = Color(0.858824, 0.964706, 0.996078, 1) +ground_horizon_color = Color(0.858824, 0.964706, 0.996078, 1) +sun_curve = 0.2 diff --git a/client/world/sky/Sky.tres b/client/world/sky/Sky.tres new file mode 100644 index 0000000..146f317 --- /dev/null +++ b/client/world/sky/Sky.tres @@ -0,0 +1,6 @@ +[gd_resource type="Sky" load_steps=2 format=3 uid="uid://chqkkvnsudiww"] + +[ext_resource type="Material" uid="uid://bjebmdqcr2a1e" path="res://world/sky/ClearSkyMaterial.tres" id="1_3u6cj"] + +[resource] +sky_material = ExtResource("1_3u6cj")