add rain sound + add time to screen

core/daynight/day_night_controller.gd

@@ -1,8 +1,6 @@
 class_name DayNightController
 extends Node
 
-#starting time
-@export_range(0.0, 1.0) var start_time: float = 0.0
 var environment_config: EnvironmentConfig
 
 #Multiply for debug
@@ -22,7 +20,7 @@ func _ready() -> void:
 	UIEvents.set_day_time.connect(_on_set_day_time)
 	UIEvents.toggle_pause_daytime.connect(_on_toggle_pause_daytime)
 
-	current_time = start_time
+	current_time = environment_config.start_time
 	update_time(current_time)
 
 func _process(delta: float) -> void:
@@ -35,7 +33,7 @@ func _process(delta: float) -> void:
 	update_time(current_time)
 
 func get_time_string() -> String:
-	var total_minutes: int = int(current_time * 1440.0)  # 1440 = 24*60
+	var total_minutes: int = int(current_time * 1440.0)
 	@warning_ignore("integer_division")
 	var hours: int   = int(total_minutes / 60)
 	var minutes: int = total_minutes % 60
@@ -47,6 +45,7 @@ func set_time(t: float) -> void:
 
 func update_time(currtime: float) -> void:
 	emit_signal("time_changed", currtime)
+	UIEvents.day_time_changed.emit(currtime, get_time_string())
 
 func _on_set_day_time(value: float) -> void:
 	set_time(value)

core/daynight/edge_detection_compositor.gd

@@ -10,8 +10,11 @@ var parameter_storage_buffer := RID()
 func _init() -> void:
 	effect_callback_type = CompositorEffect.EFFECT_CALLBACK_TYPE_POST_OPAQUE
 	rd = RenderingServer.get_rendering_device()
+	if rd == null:
+		return
+
 	RenderingServer.call_on_render_thread(_initialize_compute)
-	
+
 	var data := PackedFloat32Array()
 	data.resize(20)
 	data.fill(0)
@@ -24,7 +27,7 @@ func _init() -> void:
 # alerts us we are about to be destroyed.
 func _notification(what: int) -> void:
 	if what == NOTIFICATION_PREDELETE:
-		if shader.is_valid():
+		if rd != null and shader.is_valid():
 			# Freeing our shader will also free any dependents such as the pipeline!
 			rd.free_rid(shader)
 

core/daynight/environment_management.tscn

@@ -227,6 +227,8 @@ godray = ExtResource("5_411rw")
 environment_dust = NodePath("EnvironmentDust")
 blur = NodePath("Blur")
 environment_shadows = NodePath("EnvironmentCloudsShadows")
+thunder_sounds = null
+rain_sounds = null
 
 [node name="Particles_Fireflies" type="GPUParticles3D" parent="." unique_id=947538133]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
@@ -286,5 +288,3 @@ mouse_filter = 2
 extra_cull_margin = 16384.0
 mesh = SubResource("QuadMesh_sxgg7")
 surface_material_override/0 = SubResource("ShaderMaterial_oqt1s")
-
-[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="." unique_id=902982869]

core/daynight/environment_manager.gd

@@ -18,11 +18,11 @@ extends Node3D
 
 @export_group("Sound")
 @export var thunder_sounds: Array[AudioStream]
+@export var rain_sounds: Array[AudioStream]
 
 #environment nodes
 @onready var sun: DirectionalLight3D = $"../DirectionalLight3D"
 @onready var environment: WorldEnvironment = $"../WorldEnvironment"
-@onready var audio_player: AudioStreamPlayer3D = $AudioStreamPlayer3D
 
 var day_night_controller: DayNightController 
 var weather_controller: WeatherController
@@ -51,16 +51,16 @@ func _ready() -> void:
 			particles_snow,
 			particles_fireflies,
 			particles_rain,
-			godray,			
+			godray,
 			environment_dust,
 			blur,
 			environment_shadows,
-			sun,		
+			sun,
 			environment,
 			environment_config,
 			camera,
-			audio_player,
-			thunder_sounds
+			thunder_sounds,
+			rain_sounds
 		)
 		weather_controller.name = "WeatherController"
 		add_child(weather_controller)
@@ -68,7 +68,7 @@ func _ready() -> void:
 func ApplyWindNoiseToMaterials():
 	var noise_tex = preload("res://core/daynight/noise.tres")
 	for node in get_tree().get_nodes_in_group("wind_node"):
-		if node is GeometryInstance3D:
+		if node is GeometryInstance3D and node.material_override != null:
 			node.material_override.set_shader_parameter("wind_noise", noise_tex)
 			
 func ApplyWeatherShaderToMaterials():
@@ -83,26 +83,36 @@ func ApplyWeatherShaderToMaterials():
 					child.material_overlay = weather_shader
 
 func select_day_time(normalized_time: float) -> void:
-	# 0.0→0.25  = sunrise:    day_time 1.0→2.0 (night colors → morning colors)
-	# 0.25→0.5  = day:        day_time 2.0→2.0 (stays morning/afternoon)
-	# 0.5→0.75  = sunset:     day_time 2.0→3.0 (afternoon colors → night colors)
-	# 0.75→1.0  = night:      day_time 3.0→3.0 (stays night)
-	# At wrap 1.0→0.0:        day_time stays 3.0, then fades back via sunrise
+	#set show_day_time_debug = true to show debug on screen
+	#normalized_time is a value between 0 and 1; the time of the day is calculate as "normalized_time" * 1440; day_time is the step to pass from sunrise, to day, to sunset, to night
+	#e.g.
+	#Time		normalized_time		day_time
+	#00:00		0.0000				3.0
+	#06:00		0.2500				1.0
+	#09:36		0.4000				1.75
+	#10:48		0.4500				2.0
+	#12:00		0.5000				2.0
+	#19:12		0.8000				2.0
+	#21:36		0.9000				2.5
+	#24:00		1.0000				3.0
 	
-	if normalized_time < 0.25:
+	if normalized_time < environment_config.sunrise:
 		#Sunrise: night → morning
-		day_time = 3.0 - (normalized_time / 0.25) * 2.0  # 3.0 → 1.0
-	elif normalized_time < 0.5:
-		#Broad daylight
-		var t: float = (normalized_time - 0.25) / 0.25
+		day_time = 3.0 - (normalized_time / environment_config.sunrise) * 2.0  # 3.0 → 1.0
+	elif normalized_time < environment_config.day:
+		#Morning: morning → afternoon
+		var t: float =  (normalized_time - environment_config.sunrise) / (environment_config.day - environment_config.sunrise)
 		day_time = 1.0 + t  # 1.0 → 2.0
-	elif normalized_time < 0.75:
+	elif normalized_time < environment_config.sunset:
+		#Broad daylight
+		day_time = 2.0
+	elif normalized_time < environment_config.night:
 		#Sunset: afternoon → night
-		var t: float = (normalized_time - 0.5) / 0.25
+		var t: float = (normalized_time - environment_config.sunset) / (environment_config.night - environment_config.sunset)
 		day_time = 2.0 + t  # 2.0 → 3.0
 	else:
 		#Night
 		day_time = 3.0
-	
+
 	if weather_controller:
 		weather_controller.day_time = day_time

core/daynight/sound/thunder_1.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://bfn6kxtpb8b7a"
-path="res://.godot/imported/thunder_1.mp3-5dfac75637d4484715fa2c52227bbb39.mp3str"
-
-[deps]
-
-source_file="res://core/daynight/sound/thunder_1.mp3"
-dest_files=["res://.godot/imported/thunder_1.mp3-5dfac75637d4484715fa2c52227bbb39.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

core/daynight/sound/thunder_2.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://br2ye0dto487h"
-path="res://.godot/imported/thunder_2.mp3-e0bc5cdbb7a7380e5c0e7af073c47559.mp3str"
-
-[deps]
-
-source_file="res://core/daynight/sound/thunder_2.mp3"
-dest_files=["res://.godot/imported/thunder_2.mp3-e0bc5cdbb7a7380e5c0e7af073c47559.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

core/daynight/sound/thunder_3.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://dvabvoqyya0g5"
-path="res://.godot/imported/thunder_3.mp3-2057b93f6a6b1db545b448579512d302.mp3str"
-
-[deps]
-
-source_file="res://core/daynight/sound/thunder_3.mp3"
-dest_files=["res://.godot/imported/thunder_3.mp3-2057b93f6a6b1db545b448579512d302.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

core/daynight/sound/thunder_4.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://creenugno7hm"
-path="res://.godot/imported/thunder_4.mp3-ab350a8d3ed7b106a20bdb2005be826d.mp3str"
-
-[deps]
-
-source_file="res://core/daynight/sound/thunder_4.mp3"
-dest_files=["res://.godot/imported/thunder_4.mp3-ab350a8d3ed7b106a20bdb2005be826d.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

core/daynight/sound/thunder_5.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://bm6dq4jwsbxf6"
-path="res://.godot/imported/thunder_5.mp3-bac65d0a703be3ab04d2144b8eef2bce.mp3str"
-
-[deps]
-
-source_file="res://core/daynight/sound/thunder_5.mp3"
-dest_files=["res://.godot/imported/thunder_5.mp3-bac65d0a703be3ab04d2144b8eef2bce.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

core/daynight/sounds/rain_1.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://byuxpukhy72n8"
+path="res://.godot/imported/rain_1.mp3-b38c5c2051e16525931f27bf63462ca9.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/rain_1.mp3"
+dest_files=["res://.godot/imported/rain_1.mp3-b38c5c2051e16525931f27bf63462ca9.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/sounds/rain_2.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://h5yhjn1x3f4j"
+path="res://.godot/imported/rain_2.mp3-bcb3e8cb8ab98e668d60ed670be6de0f.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/rain_2.mp3"
+dest_files=["res://.godot/imported/rain_2.mp3-bcb3e8cb8ab98e668d60ed670be6de0f.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/sounds/rain_3.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://elrjw0smm0cj"
+path="res://.godot/imported/rain_3.mp3-b39c461eabf9a5f3502ac452c08310c1.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/rain_3.mp3"
+dest_files=["res://.godot/imported/rain_3.mp3-b39c461eabf9a5f3502ac452c08310c1.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/sounds/thunder_1.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://bfn6kxtpb8b7a"
+path="res://.godot/imported/thunder_1.mp3-a69332dc48adeec56bf6cc67c3bb4ceb.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/thunder_1.mp3"
+dest_files=["res://.godot/imported/thunder_1.mp3-a69332dc48adeec56bf6cc67c3bb4ceb.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/sounds/thunder_2.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://br2ye0dto487h"
+path="res://.godot/imported/thunder_2.mp3-928b4a280c9174e8f9ec4888d6e47d04.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/thunder_2.mp3"
+dest_files=["res://.godot/imported/thunder_2.mp3-928b4a280c9174e8f9ec4888d6e47d04.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/sounds/thunder_3.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dvabvoqyya0g5"
+path="res://.godot/imported/thunder_3.mp3-af1ebec5599ef6a58950c7f353a6f8dd.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/thunder_3.mp3"
+dest_files=["res://.godot/imported/thunder_3.mp3-af1ebec5599ef6a58950c7f353a6f8dd.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/sounds/thunder_4.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://creenugno7hm"
+path="res://.godot/imported/thunder_4.mp3-3b7e59285fedb20a25988d2987168f33.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/thunder_4.mp3"
+dest_files=["res://.godot/imported/thunder_4.mp3-3b7e59285fedb20a25988d2987168f33.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/sounds/thunder_5.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://bm6dq4jwsbxf6"
+path="res://.godot/imported/thunder_5.mp3-2dadd721b078f5baaa97664ed875a6b4.mp3str"
+
+[deps]
+
+source_file="res://core/daynight/sounds/thunder_5.mp3"
+dest_files=["res://.godot/imported/thunder_5.mp3-2dadd721b078f5baaa97664ed875a6b4.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

core/daynight/weather_controller.gd

@@ -1,8 +1,10 @@
 class_name WeatherController
 extends Node
 
-var audio_player: AudioStreamPlayer3D
+var thunder_audio_player: AudioStreamPlayer
 var thunder_sounds: Array[AudioStream]
+var rain_sounds: Array[AudioStream]
+var rain_audio_player: AudioStreamPlayer
 
 var particles_wind: GPUParticles3D
 var particles_snow: GPUParticles3D
@@ -27,6 +29,7 @@ var timer_next_lightning: float = 0.0
 var is_raining: bool = false
 var rain_intensity: float = 0.0 
 var rain_tween: Tween
+var rain_audio_tween: Tween
 var puddle_tween: Tween
 var puddle_amount: float = 0.0
 
@@ -45,7 +48,7 @@ func _init(wind: GPUParticles3D, snow: GPUParticles3D,
 	fireflies: GPUParticles3D, rain: GPUParticles3D, ray: PackedScene,
 	dust: ColorRect, blurr: ColorRect, envshadows: MeshInstance3D,
 	thesun: DirectionalLight3D, theenvironment: WorldEnvironment, environmentconfig: EnvironmentConfig,
-	thecamera: Camera3D, audiostreamplayer: AudioStreamPlayer3D, thundersounds: Array[AudioStream]) -> void:
+	thecamera: Camera3D, thundersounds: Array[AudioStream], rainsounds: Array[AudioStream]) -> void:
 	particles_wind = wind
 	particles_snow = snow
 	particles_fireflies = fireflies
@@ -59,7 +62,7 @@ func _init(wind: GPUParticles3D, snow: GPUParticles3D,
 	environment_config = environmentconfig
 	camera = thecamera
 	thunder_sounds = thundersounds
-	audio_player = audiostreamplayer
+	rain_sounds = rainsounds
 	
 	set_rain()
 
@@ -70,15 +73,17 @@ func _init(wind: GPUParticles3D, snow: GPUParticles3D,
 	set_snow()
 	
 	set_lightning()
+	
+	create_sound_players()
 
 func _ready() -> void:
+	
 	#connect events
 	UIEvents.toggle_rain.connect(toggle_rain)
 	UIEvents.toggle_snow.connect(toggle_snow)
 	UIEvents.toggle_wind.connect(toggle_wind)
 	UIEvents.toggle_fireflies.connect(toggle_fireflies)
 	UIEvents.toggle_storm.connect(toggle_storm)
-	#UIEvents.toggle_fog_overlay.connect(toggle_fog_overlay)
 	UIEvents.toggle_dust.connect(toggle_dust)
 	UIEvents.toggle_blur.connect(toggle_blur)
 	UIEvents.toggle_shadows.connect(toggle_shadows)
@@ -171,11 +176,10 @@ func _process(delta: float) -> void:
 	#Snow exposure compensation
 	var snow_light_attenuation = lerp(1.0, 0.55, actual_snow_amount * (1.0 - night_val))
 	var snow_glow_attenuation = lerp(1.0, 0.5, actual_snow_amount)
-	
 	var final_bloom = lerp(base_bloom, base_bloom * 0.5, rain_intensity) * snow_glow_attenuation
 	
 	# We calculate the final exposure by applying snow damping directly to the camera exposure
-	var final_esposizione = base_exposure * snow_light_attenuation
+	var final_exposure = base_exposure * snow_light_attenuation
 		
 	var reflected_color = Color(0.4, 0.5, 0.6, 1.0)
 	var drops_color = final_sky_horizon.lerp(reflected_color, 0.15)
@@ -203,9 +207,7 @@ func _process(delta: float) -> void:
 		# Apply glow
 		environment.environment.glow_enabled = true
 		environment.environment.glow_intensity = final_bloom
-		
-		# Make sure the Tonemap Mode in the Environment is set to ACES or Filmic for best results!
-		environment.environment.tonemap_exposure = final_esposizione
+		environment.environment.tonemap_exposure = final_exposure
 		
 		var sky_mat = environment.environment.sky.sky_material as ShaderMaterial
 		if sky_mat:
@@ -238,6 +240,18 @@ func _follow_camera() -> void:
 	if particles_fireflies:
 		particles_fireflies.global_position = Vector3(cam_pos.x, particles_fireflies.position.y, cam_pos.z)
 
+func create_sound_players():
+	rain_audio_player = AudioStreamPlayer.new()
+	rain_audio_player.name = "RainAudioPlayer"
+	rain_audio_player.volume_db = environment_config.rain_audio_volume_db
+	rain_audio_player.finished.connect(_on_rain_audio_player_finished)
+	add_child(rain_audio_player)
+
+	thunder_audio_player = AudioStreamPlayer.new()
+	thunder_audio_player.name = "ThunderAudioPlayer"
+	thunder_audio_player.volume_db = environment_config.thunder_audio_volume_db
+	add_child(thunder_audio_player)
+
 #region Fireflies
 
 func toggle_fireflies(value: bool):
@@ -400,13 +414,13 @@ func start_lightning():
 func _play_thunder_delayed(delay: float):
 	await get_tree().create_timer(delay).timeout
 
-	if thunder_sounds.is_empty() or not audio_player:
+	if thunder_sounds.is_empty() or not thunder_audio_player:
 		return
-	#choose a random track
-	audio_player.stream = thunder_sounds[randi() % thunder_sounds.size()]
-	audio_player.pitch_scale = randf_range(0.9, 1.1)
-	audio_player.play()			
-		
+
+	thunder_audio_player.stream = thunder_sounds[randi() % thunder_sounds.size()]
+	thunder_audio_player.pitch_scale = randf_range(0.9, 1.1)
+	thunder_audio_player.play()
+
 #endregion
 
 #region Rain
@@ -416,6 +430,9 @@ func set_rain():
 	if particles_rain:
 		particles_rain.visible = true
 		particles_rain.emitting = false
+	if rain_audio_player:
+		rain_audio_player.volume_db = environment_config.rain_audio_volume_db
+		rain_audio_player.stop()
 	RenderingServer.global_shader_parameter_set("global_rain_puddle_amount", 0.0)
 
 func set_puddle_amount(value: float):
@@ -440,11 +457,18 @@ func toggle_rain(value: bool):
 	if is_raining:
 		particles_rain.amount_ratio = 0.0
 		particles_rain.emitting = true
+		if rain_audio_player:
+			if not rain_audio_player.playing:
+				rain_audio_player.volume_db = -80.0
+				_play_random_rain_sound()
+			_fade_rain_audio(environment_config.rain_audio_volume_db, false)
 		rain_tween = create_tween()
 		rain_tween.tween_property(particles_rain, "amount_ratio", 1.0, environment_config.rain_fade_time)
 		puddle_tween = create_tween()
 		puddle_tween.tween_method(set_puddle_amount, puddle_amount, 1.0, environment_config.puddle_form_time)
 	else:
+		if rain_audio_player:
+			_fade_rain_audio(-80.0, true)
 		rain_tween = create_tween()
 		rain_tween.tween_property(particles_rain, "amount_ratio", 0.0, environment_config.rain_fade_time)
 		rain_tween.tween_callback(func():
@@ -481,6 +505,36 @@ func spawn_single_godray() -> void:
 	godray_tween.tween_property(ray, "scale", Vector3.ZERO, 2.0).set_ease(Tween.EASE_IN).set_trans(Tween.TRANS_SINE)
 	godray_tween.tween_callback(ray.queue_free)
 	
+func _play_random_rain_sound() -> void:
+	if rain_sounds.is_empty() or rain_audio_player == null:
+		return
+
+	rain_audio_player.stream = rain_sounds[randi() % rain_sounds.size()]
+	rain_audio_player.pitch_scale = 1.0
+	rain_audio_player.volume_db = minf(rain_audio_player.volume_db, environment_config.rain_audio_volume_db)
+	rain_audio_player.play()
+
+func _on_rain_audio_player_finished() -> void:
+	if is_raining:
+		_play_random_rain_sound()
+
+func _fade_rain_audio(target_volume_db: float, stop_after_fade: bool) -> void:
+	if rain_audio_player == null:
+		return
+
+	if rain_audio_tween and rain_audio_tween.is_valid():
+		rain_audio_tween.kill()
+
+	rain_audio_tween = create_tween()
+	rain_audio_tween.tween_property(
+		rain_audio_player,
+		"volume_db",
+		target_volume_db,
+		environment_config.rain_fade_time	#same value of the rain particles
+	)
+	if stop_after_fade:
+		rain_audio_tween.tween_callback(func(): rain_audio_player.stop())
+
 #endregion
 
 #region Snow