diff --git a/docs/museums/biome_generator/rails.gd b/core/biome_generator/rails.gd similarity index 100% rename from docs/museums/biome_generator/rails.gd rename to core/biome_generator/rails.gd diff --git a/docs/museums/biome_generator/rails.gd.uid b/core/biome_generator/rails.gd.uid similarity index 100% rename from docs/museums/biome_generator/rails.gd.uid rename to core/biome_generator/rails.gd.uid diff --git a/core/daynight/water_ripple.gdshader b/core/daynight/water_ripple.gdshader index 709650e..55de5a0 100644 --- a/core/daynight/water_ripple.gdshader +++ b/core/daynight/water_ripple.gdshader @@ -1,6 +1,8 @@ shader_type spatial; render_mode blend_mix, depth_draw_always; +global uniform float global_rain_intensity; + //Water color uniform vec4 deep_water_color : source_color = vec4(0.0, 0.1, 0.2, 1.0); uniform vec4 shallow_water_color : source_color = vec4(0.0, 0.4, 0.7, 1.0); @@ -41,6 +43,7 @@ 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); vec2 pos = world_pos_xz * ripple_scale; vec2 cell = floor(pos); @@ -56,6 +59,7 @@ void fragment() { - smoothstep(local_time, local_time + ripple_thickness, dist); ring *= (1.0 - local_time); } + ring *= rain_intensity; vec2 ref_uv = SCREEN_UV; @@ -85,4 +89,4 @@ void fragment() { ROUGHNESS = 1.0; SPECULAR = 0.0; -} \ No newline at end of file +} diff --git a/docs/museums/biome_generator/museum_biome_generator.tscn b/docs/museums/biome_generator/museum_biome_generator.tscn index 6069bc0..d474d42 100644 --- a/docs/museums/biome_generator/museum_biome_generator.tscn +++ b/docs/museums/biome_generator/museum_biome_generator.tscn @@ -8,7 +8,7 @@ [ext_resource type="Script" uid="uid://wv6kcqkibium" path="res://core/biome_generator/biome.gd" id="5_2wjys"] [ext_resource type="PackedScene" uid="uid://cv5xmnow451kl" path="res://core/camera.tscn" id="5_8tojn"] [ext_resource type="PackedScene" uid="uid://crlk31ecl480n" path="res://tgcc/chunk/countryside/scene/chunk_country_corner_03.tscn" id="6_21usy"] -[ext_resource type="Script" uid="uid://dboerd4a6dwj7" path="res://docs/museums/biome_generator/rails.gd" id="6_pypsn"] +[ext_resource type="Script" uid="uid://dboerd4a6dwj7" path="res://core/biome_generator/rails.gd" id="6_pypsn"] [ext_resource type="PackedScene" uid="uid://dvk3bytqn3m5s" path="res://tgcc/train/main_train.tscn" id="6_wjpfq"] [ext_resource type="PackedScene" uid="uid://brpp7fe5noq8v" path="res://tgcc/chunk/countryside/scene/chunk_country_cross_3_01.tscn" id="7_qe84w"] [ext_resource type="PackedScene" uid="uid://0kgjaqijaqku" path="res://docs/museums/biome_generator/rails.tscn" id="8_mb5yv"]