diff --git a/core/daynight/water_ripple.gdshader b/core/daynight/water_ripple.gdshader index 55de5a0..2e36364 100644 --- a/core/daynight/water_ripple.gdshader +++ b/core/daynight/water_ripple.gdshader @@ -2,6 +2,7 @@ shader_type spatial; render_mode blend_mix, depth_draw_always; global uniform float global_rain_intensity; +global uniform vec4 global_water_color = vec4(0.285, 0.534, 0.487, 1.0); //Water color uniform vec4 deep_water_color : source_color = vec4(0.0, 0.1, 0.2, 1.0); @@ -44,12 +45,14 @@ void fragment() { float water_depth_gradient = exp(-depth_difference * beer_law_factor); vec4 base_water = mix(deep_water_color, shallow_water_color, water_depth_gradient); float rain_intensity = clamp(global_rain_intensity, 0.0, 1.0); + base_water.rgb = mix(base_water.rgb, global_water_color.rgb, 0.7); vec2 pos = world_pos_xz * ripple_scale; vec2 cell = floor(pos); vec2 local_pos = fract(pos) - 0.5; float random_val = fract(sin(dot(cell, vec2(12.9898, 78.233))) * 43758.5453); - float is_active_cell = step(1.0 - ripple_density, random_val); + float active_ripple_density = ripple_density * rain_intensity; + float is_active_cell = step(1.0 - active_ripple_density, random_val); float ring = 0.0; if (is_active_cell > 0.0) { diff --git a/core/daynight/weather_controller.gd b/core/daynight/weather_controller.gd index 583e526..c0635e5 100644 --- a/core/daynight/weather_controller.gd +++ b/core/daynight/weather_controller.gd @@ -125,6 +125,7 @@ func _process(delta: float) -> void: var base_grad_top: Color var base_grad_bot: Color var base_grad_intensity: float + var base_water_color: Color var base_rotation_sun: Vector3 if is_raining: @@ -152,6 +153,7 @@ func _process(delta: float) -> void: base_grad_top = environment_config.grad_top_morning.lerp(environment_config.grad_top_afternoon, t) base_grad_bot = environment_config.grad_top_morning.lerp(environment_config.grad_bot_afternoon, t) base_grad_intensity = lerp(environment_config.grad_intensity_morning, environment_config.grad_intensity_afternoon, t) + base_water_color = environment_config.water_color_morning.lerp(environment_config.water_color_afternoon, t) base_rotation_sun = environment_config.sun_rotation_morning.lerp(environment_config.sun_rotation_afternoon, t) else: var t = day_time - 2.0 @@ -165,6 +167,7 @@ func _process(delta: float) -> void: base_grad_top = environment_config.grad_top_afternoon.lerp(environment_config.grad_top_night, t) base_grad_bot = environment_config.grad_bot_afternoon.lerp(environment_config.grad_bot_night, t) base_grad_intensity = lerp(environment_config.grad_intensity_afternoon, environment_config.grad_intensity_night, t) + base_water_color = environment_config.water_color_afternoon.lerp(environment_config.water_color_night, t) base_rotation_sun = environment_config.sun_rotation_afternoon.lerp(environment_config.sun_rotation_night, t) var weather_color = environment_config.rain_mode_color @@ -176,6 +179,7 @@ func _process(delta: float) -> void: var final_sky_horizon = base_sky_horizon.lerp(base_sky_horizon * weather_color, clamp(rain_intensity, 0.0, 1.0)) var final_fog_color = base_fog_color.lerp(base_fog_color * weather_color, clamp(rain_intensity, 0.0, 1.0)) var final_fog_density = lerp(base_fog_density, base_fog_density * 4.0, clamp(rain_intensity, 0.0, 1.0)) + var final_water_color = base_water_color.darkened(clamp(environment_config.water_darkening_rain, 0.0, 1.0) * clamp(rain_intensity, 0.0, 1.0)) final_tint = final_tint.lerp(final_tint * environment_config.snow_mode_color, actual_snow_amount) final_sky_top = final_sky_top.lerp(final_sky_top * environment_config.snow_mode_color, actual_snow_amount) @@ -189,6 +193,7 @@ func _process(delta: float) -> void: RenderingServer.global_shader_parameter_set("global_gradient_color_top", final_grad_top) RenderingServer.global_shader_parameter_set("global_gradient_color_bot", final_grad_bot) RenderingServer.global_shader_parameter_set("global_gradient_intensity", base_grad_intensity) + RenderingServer.global_shader_parameter_set("global_water_color", final_water_color) var night_val = clamp(day_time - 2.0, 0.0, 1.0) @@ -769,7 +774,7 @@ func init_snow(value: float = 0.0): RenderingServer.global_shader_parameter_set("global_snow_accumulation_speed", environment_config.snow_accumulation_speed) RenderingServer.global_shader_parameter_set("global_snow_melt_speed", environment_config.snow_melt_speed) RenderingServer.global_shader_parameter_set("global_snow_max_accumulation", environment_config.snow_max_accumulation) - RenderingServer.global_shader_parameter_set("global_snow_cap_enabled", 1.0 if environment_config.show_snow_accumulation_volume else 0.0) + RenderingServer.global_shader_parameter_set("global_snow_cap_enabled", environment_config.show_snow_accumulation_volume) RenderingServer.global_shader_parameter_set("global_snow_cap_height", environment_config.snow_cap_height) RenderingServer.global_shader_parameter_set("global_snow_cap_flatness_start", environment_config.snow_cap_flatness_start) RenderingServer.global_shader_parameter_set("global_snow_cap_flatness_end", environment_config.snow_cap_flatness_end) diff --git a/core/daynight/weather_overlay.gdshader b/core/daynight/weather_overlay.gdshader index 5afa822..aa52bcc 100644 --- a/core/daynight/weather_overlay.gdshader +++ b/core/daynight/weather_overlay.gdshader @@ -6,10 +6,11 @@ global uniform float global_snow_start_time = -1.0; global uniform float global_snow_accumulation_speed = 0.1; global uniform float global_snow_melt_time = -1.0; global uniform float global_snow_melt_speed = 0.1; +global uniform float global_snow_amount = 0.0; global uniform float global_snow_threshold = 0.5; global uniform vec4 global_snow_color = vec4(0.92, 0.96, 1.0, 1.0); global uniform float global_snow_max_accumulation = 0.72; -global uniform float global_snow_cap_enabled = 1.0; +global uniform bool global_snow_cap_enabled = true; global uniform float global_snow_cap_height = 0.06; global uniform float global_snow_cap_flatness_start = 0.72; global uniform float global_snow_cap_flatness_end = 0.96; @@ -70,16 +71,22 @@ float fbm(vec2 p) { return clamp(value, 0.0, 1.0); } -float get_snow_amount() { - float snow_amount = 0.0; - if (global_snow_start_time >= 0.0) { - snow_amount = clamp((TIME - global_snow_start_time) * global_snow_accumulation_speed, 0.0, 1.0); +float get_snow_progress() { + bool has_snow_timeline = global_snow_start_time >= 0.0 || global_snow_melt_time >= 0.0; + float snow_progress = clamp(global_snow_amount, 0.0, 1.0); + + if (has_snow_timeline) { + snow_progress = 0.0; + if (global_snow_start_time >= 0.0) { + snow_progress = clamp((TIME - global_snow_start_time) * global_snow_accumulation_speed, 0.0, 1.0); + } + if (global_snow_melt_time >= 0.0) { + float melt = clamp((TIME - global_snow_melt_time) * global_snow_melt_speed, 0.0, 1.0); + snow_progress *= (1.0 - melt); + } } - if (global_snow_melt_time >= 0.0) { - float melt = clamp((TIME - global_snow_melt_time) * global_snow_melt_speed, 0.0, 1.0); - snow_amount *= (1.0 - melt); - } - return snow_amount * global_snow_max_accumulation; + + return snow_progress; } float ripple_ring(vec2 uv, float time_offset) { @@ -90,24 +97,24 @@ float ripple_ring(vec2 uv, float time_offset) { } void vertex() { - float snow_amount = get_snow_amount(); + float snow_progress = get_snow_progress(); + float snow_accumulation = snow_progress * global_snow_max_accumulation; vec3 world_pos = (MODEL_MATRIX * vec4(VERTEX, 1.0)).xyz; vec3 world_normal = normalize((MODEL_MATRIX * vec4(NORMAL, 0.0)).xyz); - float snow_cap_enabled = step(0.5, global_snow_cap_enabled); float flat_surface = smoothstep( max(global_snow_threshold, global_snow_cap_flatness_start), global_snow_cap_flatness_end, world_normal.y ); - float accumulation_growth = smoothstep(0.08, 0.65, snow_amount); + float accumulation_growth = smoothstep(0.08, 0.65, snow_progress); float cap_noise = fbm(world_pos.xz * global_snow_cap_noise_scale + vec2(11.3, 4.7)); float cap_variation = mix(1.0 - global_snow_cap_noise_strength, 1.0 + global_snow_cap_noise_strength, cap_noise); - v_snow_amount = snow_amount; - v_snow_cap_mask = flat_surface * accumulation_growth * cap_variation * snow_cap_enabled; + v_snow_amount = snow_progress; + v_snow_cap_mask = flat_surface * accumulation_growth * cap_variation * (global_snow_cap_enabled ? 1.0 : 0.0); - VERTEX += NORMAL * (global_snow_cap_height * snow_amount * v_snow_cap_mask); + VERTEX += NORMAL * (global_snow_cap_height * snow_accumulation * v_snow_cap_mask); } void fragment() { @@ -117,16 +124,17 @@ void fragment() { float noise_val = texture(noise_texture, world_pos.xz * snow_noise_scale).r; //Snow - float snow_amount = v_snow_amount; + float snow_progress = v_snow_amount; + float snow_accumulation = snow_progress * global_snow_max_accumulation; float snow_edge = smoothstep( global_snow_threshold - snow_edge_softness, global_snow_threshold + snow_edge_softness, facing_up + (noise_val - 0.5) * 0.4 ); - float flat_accumulation = smoothstep(0.0, 0.35, v_snow_cap_mask) * snow_amount; - float snow_coverage = smoothstep(0.0, 0.6, noise_val + snow_amount - 0.4 + flat_accumulation * 0.25); - float snow_factor = max(snow_edge * snow_coverage * snow_amount, flat_accumulation); + float flat_accumulation = smoothstep(0.0, 0.35, v_snow_cap_mask) * snow_accumulation; + float snow_coverage = smoothstep(0.0, 0.6, noise_val + snow_progress - 0.4 + flat_accumulation * 0.25); + float snow_factor = max(snow_edge * snow_coverage * snow_progress, flat_accumulation); float snow_opacity = smoothstep(0.04, 0.28, snow_factor); snow_opacity = max(snow_opacity, flat_accumulation * 0.9); diff --git a/core/daynight/weather_overlay.tres b/core/daynight/weather_overlay.tres index 8d78446..66f2509 100644 --- a/core/daynight/weather_overlay.tres +++ b/core/daynight/weather_overlay.tres @@ -1,7 +1,23 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://cn5vw7unbqgve"] [ext_resource type="Shader" uid="uid://dh3j2jp6defuk" path="res://core/daynight/weather_overlay.gdshader" id="1_weather"] +[ext_resource type="Texture2D" uid="uid://bpswbjh4jj1ou" path="res://core/daynight/noise.tres" id="2_noise"] [resource] render_priority = 0 shader = ExtResource("1_weather") +shader_parameter/snow_noise_scale = 0.15 +shader_parameter/snow_edge_softness = 0.2 +shader_parameter/snow_roughness_variation = 0.15 +shader_parameter/snow_color_variation = 0.05 +shader_parameter/ripple_scale = 1.5 +shader_parameter/ripple_speed = 2.0 +shader_parameter/ripple_layers = 3.0 +shader_parameter/streak_scale = 2.0 +shader_parameter/streak_speed = 0.8 +shader_parameter/wetness_darkening = 0.25 +shader_parameter/wet_roughness = 0.05 +shader_parameter/rain_normal_strength = 0.4 +shader_parameter/puddle_noise_scale = 0.08 +shader_parameter/puddle_threshold = 0.45 +shader_parameter/noise_texture = ExtResource("2_noise") diff --git a/core/daynight/weather_plain_shader.tres b/core/daynight/weather_plain_shader.tres index 55c00aa..4706dc1 100644 --- a/core/daynight/weather_plain_shader.tres +++ b/core/daynight/weather_plain_shader.tres @@ -1,7 +1,21 @@ -[gd_resource type="ShaderMaterial" format=3] +[gd_resource type="ShaderMaterial" format=3 uid="uid://b34bnqbrtxktw"] -[ext_resource type="Shader" path="res://core/daynight/weather_plain_shader.gdshader" id="1_weather_plain"] +[ext_resource type="Shader" uid="uid://do8puw7u8dvry" path="res://core/daynight/weather_plain_shader.gdshader" id="1_weather_plain"] +[ext_resource type="Texture2D" uid="uid://bpswbjh4jj1ou" path="res://core/daynight/noise.tres" id="2_noise"] [resource] render_priority = 0 shader = ExtResource("1_weather_plain") +shader_parameter/snow_edge_softness = 0.15 +shader_parameter/snow_color_variation = 0.05 +shader_parameter/ripple_scale = 1.5 +shader_parameter/ripple_speed = 2.0 +shader_parameter/ripple_layers = 3.0 +shader_parameter/streak_scale = 2.0 +shader_parameter/streak_speed = 0.8 +shader_parameter/wetness_darkening = 0.25 +shader_parameter/wet_roughness = 0.05 +shader_parameter/rain_normal_strength = 0.4 +shader_parameter/puddle_noise_scale = 0.08 +shader_parameter/puddle_threshold = 0.45 +shader_parameter/noise_texture = ExtResource("2_noise") diff --git a/core/environment_config.gd b/core/environment_config.gd index 8a7c045..9ea48d2 100644 --- a/core/environment_config.gd +++ b/core/environment_config.gd @@ -81,7 +81,7 @@ extends Resource #Post-process effect toggles (initial values) @export_group("Post Process") @export var enable_dust: bool = false #Floating dust particles overlay -@export var enable_blur: bool = false #Screen blur effect +@export var enable_blur: bool = true #Screen blur effect @export var enable_environment_shadows: bool = true #Cloud shadow projection on terrain @export var blur_amount: float = 0.6 @@ -176,3 +176,10 @@ extends Resource @export var fireflies_amount: int = 60 #Number of firefly particles @export var fireflies_spawn_ray: float = 20.0 #Horizontal spawn radius @export var fireflies_spawn_height: float = 3.0 #Vertical spawn range + +#Water settings +@export_group("Water") +@export var water_color_morning: Color = Color(0.285, 0.534, 0.487, 1.0) #Tint for morning +@export var water_color_afternoon: Color = Color(0.889, 0.733, 0.205, 1.0) #Tint for afternoon (sunset) +@export var water_color_night: Color = Color(0.728, 0.54, 0.986, 1.0); #Tint for night +@export var water_darkening_rain: float = 0.7 #Percentage of darkening when is rainy diff --git a/docs/museums/biome_generator/museum_map.tscn b/docs/museums/biome_generator/museum_map.tscn index 755a933..78bff73 100644 --- a/docs/museums/biome_generator/museum_map.tscn +++ b/docs/museums/biome_generator/museum_map.tscn @@ -171,6 +171,30 @@ shadow_blur = 0.5 directional_shadow_mode = 0 directional_shadow_max_distance = 200.0 +[node name="MainMap" parent="." unique_id=1895741703 instance=ExtResource("20_xkcqp")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 280, 0, 0) + +[node name="rail" type="Path3D" parent="." unique_id=1795138464 node_paths=PackedStringArray("cameras")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 270, 2, -0.101) +curve = SubResource("Curve3D_ndco5") +script = ExtResource("12_4is5r") +train_model = ExtResource("13_5rdtm") +cameras = NodePath("../cameras") +sleepers_model = ExtResource("14_ahang") +fireworks_scene = ExtResource("15_atdal") + +[node name="Marker3D" type="Marker3D" parent="rail" unique_id=1460318018] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.7581053, -1.6046681, 59.658325) + +[node name="Marker3D2" type="Marker3D" parent="rail" unique_id=131965864] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 127.14737, 0, 169.44846) + +[node name="Marker3D3" type="Marker3D" parent="rail" unique_id=492991547] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -91.191925, 0, 539.03174) + +[node name="Marker3D4" type="Marker3D" parent="rail" unique_id=1550097358] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -312.19193, 0, 349.03174) + [node name="Control" type="Control" parent="." unique_id=630650980] layout_mode = 3 anchors_preset = 0 @@ -374,30 +398,6 @@ theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_colors/font_outline_color = Color(1, 1, 1, 1) text = "Weather: Clear" -[node name="MainMap" parent="." unique_id=1895741703 instance=ExtResource("20_xkcqp")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 280, 0, 0) - -[node name="rail" type="Path3D" parent="." unique_id=1795138464 node_paths=PackedStringArray("cameras")] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 270, 2, -0.101) -curve = SubResource("Curve3D_ndco5") -script = ExtResource("12_4is5r") -train_model = ExtResource("13_5rdtm") -cameras = NodePath("../cameras") -sleepers_model = ExtResource("14_ahang") -fireworks_scene = ExtResource("15_atdal") - -[node name="Marker3D" type="Marker3D" parent="rail" unique_id=1460318018] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.7581053, -1.6046681, 59.658325) - -[node name="Marker3D2" type="Marker3D" parent="rail" unique_id=131965864] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 127.14737, 0, 169.44846) - -[node name="Marker3D3" type="Marker3D" parent="rail" unique_id=492991547] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -91.191925, 0, 539.03174) - -[node name="Marker3D4" type="Marker3D" parent="rail" unique_id=1550097358] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -312.19193, 0, 349.03174) - [connection signal="toggled" from="Control/Snow" to="Control" method="_on_snow_toggled"] [connection signal="toggled" from="Control/Rain" to="Control" method="_on_rain_toggled"] [connection signal="toggled" from="Control/Wind" to="Control" method="_on_wind_toggled"] diff --git a/tgcc/chunk/countryside/scene/chunk_country_corner_03.tscn b/tgcc/chunk/countryside/scene/chunk_country_corner_03.tscn index 7e27c9d..ad16efe 100644 --- a/tgcc/chunk/countryside/scene/chunk_country_corner_03.tscn +++ b/tgcc/chunk/countryside/scene/chunk_country_corner_03.tscn @@ -110,7 +110,7 @@ surface_material_override/1 = ExtResource("4_w66q1") surface_material_override/0 = ExtResource("4_w66q1") surface_material_override/1 = ExtResource("6_333a0") -[node name="MSH_Staccioanta_1_001" parent="." index="8" unique_id=2137478487] +[node name="MSH_Staccioanta_1_001" parent="." index="8" unique_id=2137478487 groups=["weather_node"]] surface_material_override/0 = ExtResource("7_333a0") [node name="Palo_001" parent="." index="9" unique_id=1395117968] diff --git a/tgcc/chunk/countryside/scene/chunk_country_cross_3_01.tscn b/tgcc/chunk/countryside/scene/chunk_country_cross_3_01.tscn index 571f030..f71b045 100644 --- a/tgcc/chunk/countryside/scene/chunk_country_cross_3_01.tscn +++ b/tgcc/chunk/countryside/scene/chunk_country_cross_3_01.tscn @@ -60,7 +60,7 @@ surface_material_override/1 = ExtResource("2_6ig2p") [node name="Grass_009" parent="." index="1" unique_id=629886419] surface_material_override/0 = ExtResource("2_6ig2p") -[node name="MSH_Staccioanta_1_009" parent="." index="2" unique_id=802806256] +[node name="MSH_Staccioanta_1_009" parent="." index="2" unique_id=802806256 groups=["weather_node"]] surface_material_override/0 = ExtResource("3_wjrum") [node name="Strada_007" parent="." index="3" unique_id=1200357449 groups=["weather_node"]] diff --git a/tgcc/chunk/countryside/scene/chunk_country_end_01.tscn b/tgcc/chunk/countryside/scene/chunk_country_end_01.tscn index b018675..e7bbca5 100644 --- a/tgcc/chunk/countryside/scene/chunk_country_end_01.tscn +++ b/tgcc/chunk/countryside/scene/chunk_country_end_01.tscn @@ -104,7 +104,7 @@ surface_material_override/1 = ExtResource("7_0r8cm") surface_material_override/0 = ExtResource("7_0r8cm") surface_material_override/1 = ExtResource("6_pjysl") -[node name="MSH_Staccioanta_1_005" parent="." index="9" unique_id=1042751383] +[node name="MSH_Staccioanta_1_005" parent="." index="9" unique_id=1042751383 groups=["weather_node"]] surface_material_override/0 = ExtResource("8_hmdr4") [node name="PaliLuci_002" parent="." index="10" unique_id=1504995410] diff --git a/tgcc/chunk/railway/scene/chunk_railway_straight.tscn b/tgcc/chunk/railway/scene/chunk_railway_straight.tscn index 4b259d5..3a01c51 100644 --- a/tgcc/chunk/railway/scene/chunk_railway_straight.tscn +++ b/tgcc/chunk/railway/scene/chunk_railway_straight.tscn @@ -35,13 +35,13 @@ size = Vector3(20, 10, 20) [node name="chunk_railway_straight" unique_id=1509029322 instance=ExtResource("1_koika")] -[node name="Chunk_001" parent="." index="0" unique_id=1122765659] +[node name="Chunk_001" parent="." index="0" unique_id=1290410887 groups=["weather_node", "wind_node"]] surface_material_override/0 = ExtResource("1_bdsfm") -[node name="Chunk_020" parent="." index="1" unique_id=467050080] +[node name="Chunk_020" parent="." index="1" unique_id=107670766] surface_material_override/0 = ExtResource("2_1yd65") -[node name="Cube_159" parent="." index="2" unique_id=1552861257] +[node name="Cube_159" parent="." index="2" unique_id=334311805 groups=["weather_node"]] surface_material_override/0 = ExtResource("3_dldiy") surface_material_override/1 = ExtResource("4_5cqaj")