Merge branch 'main' into fix-day-nigh-cycle

core/daynight/day_night_controller.gd

@@ -30,6 +30,7 @@ func _ready() -> void:
 	UIEvents.toggle_pause_daytime.connect(_on_toggle_pause_daytime)
 	UIEvents.time_option_item_changed.connect(_time_option_changed)
 
+	paused = environment_config.start_day_time_paused
 	current_time = environment_config.start_time
 	update_time(current_time)
 

core/daynight/environment_manager.gd

@@ -7,6 +7,14 @@ const DYNAMIC_ENVIRONMENT_UPDATES_PER_FRAME: int = 32 #how many update of the en
 
 @export var environment_config: EnvironmentConfig
 
+@export_group("Input")
+@export var block_keyboard_input: bool = false:
+	set(value):
+		if block_keyboard_input == value:
+			return
+		block_keyboard_input = value
+		_apply_keyboard_input_block()
+
 @export_group("Camera")
 @export var camera: Camera3D
 @export var camera_pivot: Node3D
@@ -40,8 +48,24 @@ var day_tween: Tween
 var day_time: float = 0.0
 var pending_environment_nodes: Dictionary = {}
 var weather_shader_no_noise: Material
+var _blocked_keyboard_events_by_action: Dictionary = {}
+
+static func is_keyboard_input_blocked(tree: SceneTree) -> bool:
+	if tree == null:
+		return false
+
+	for node in tree.get_nodes_in_group("keyboard_input_blocker"):
+		var environment_manager := node as EnvironmentManagerRoot
+		if environment_manager != null and environment_manager.block_keyboard_input:
+			return true
+
+	return false
+
+func _enter_tree() -> void:
+	add_to_group("keyboard_input_blocker")
 
 func _ready() -> void:
+	_apply_keyboard_input_block()
 	
 	#connect shader when new node is added
 	get_tree().node_added.connect(_on_tree_node_added)
@@ -87,9 +111,51 @@ func _ready() -> void:
 func _process(_delta: float) -> void:
 	_process_pending_environment_nodes()
 
+func _input(event: InputEvent) -> void:
+	if block_keyboard_input and event is InputEventKey:
+		get_viewport().set_input_as_handled()
+
+func _exit_tree() -> void:
+	_restore_keyboard_action_events()
+	remove_from_group("keyboard_input_blocker")
+
 func flush_pending_environment_nodes() -> void:
 	_process_pending_environment_nodes(-1)
 
+func _apply_keyboard_input_block() -> void:
+	if block_keyboard_input:
+		_remove_keyboard_action_events()
+	else:
+		_restore_keyboard_action_events()
+
+func _remove_keyboard_action_events() -> void:
+	if not _blocked_keyboard_events_by_action.is_empty():
+		return
+
+	for action in InputMap.get_actions():
+		var keyboard_events: Array[InputEvent] = []
+		for event in InputMap.action_get_events(action):
+			if event is InputEventKey:
+				keyboard_events.append(event)
+
+		if keyboard_events.is_empty():
+			continue
+
+		_blocked_keyboard_events_by_action[action] = keyboard_events
+		Input.action_release(action)
+		for keyboard_event in keyboard_events:
+			InputMap.action_erase_event(action, keyboard_event)
+
+func _restore_keyboard_action_events() -> void:
+	for action in _blocked_keyboard_events_by_action.keys():
+		if not InputMap.has_action(action):
+			continue
+
+		for keyboard_event in _blocked_keyboard_events_by_action[action]:
+			InputMap.action_add_event(action, keyboard_event)
+
+	_blocked_keyboard_events_by_action.clear()
+
 func _on_tree_node_added(node: Node) -> void:
 	if node.is_in_group("wind_node") or node.is_in_group("weather_node") or node.is_in_group("weather_vegetables_node"):
 		_queue_dynamic_environment_node(node)

core/daynight/grass_leaves.gdshader

@@ -13,6 +13,7 @@ global uniform float global_snow_accumulation_speed = 0.005;
 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 vec4 global_snow_color = vec4(0.92, 0.96, 1.0, 1.0);
 global uniform float global_rain_intensity;
 
 // --- PARAMETRI ESTETICI ---
@@ -133,7 +134,7 @@ void fragment() {
 	// Applichiamo la variazione al colore finale dell'erba
 	vec3 varied_grass_color = mix(v_final_color, variance_color.rgb, noise_sample * variance_intensity);
 
-	float snow_amount = smoothstep(0.0, 1.0, get_snow_progress());
+	float snow_amount = pow(get_snow_progress(), 0.55);
 	
 	float top_mask = 1.0 - shifted_uv.y; 
 	float snow_start = 1.0 - clamp(snow_coverage, 0.05, 1.0);
@@ -141,8 +142,9 @@ void fragment() {
 	snow_mask *= step(0.01, snow_amount);
 	snow_mask = clamp(snow_mask, 0.0, 1.0);
 	
-	vec3 dark_snow = snow_color.rgb * (1.0 - shadow_intensity);
-	vec3 shaded_snow = mix(dark_snow, snow_color.rgb, v_shade_factor);
+	vec3 snow_base_color = max(snow_color.rgb, global_snow_color.rgb);
+	float snow_light = mix(0.82, 1.0, max(v_shade_factor, 0.35));
+	vec3 shaded_snow = clamp(snow_base_color * snow_light, 0.0, 1.0);
 	
 	// Mescoliamo il colore variato con la neve
 	vec3 final_albedo = mix(varied_grass_color, shaded_snow, snow_mask);

core/daynight/tree_leaves.gdshader

@@ -111,8 +111,8 @@ void fragment() {
     float snow_mask = smoothstep(1.0 - snow_amount * 1.35, 1.08 - snow_amount * 1.35, top_mask) * snow_visibility;
     snow_mask *= step(0.01, snow_amount);
 
-    vec3 dark_snow = global_snow_color.rgb * (1.0 - shadow_intensity);
-    vec3 shaded_snow = mix(dark_snow, global_snow_color.rgb, v_shade_factor);
+    float snow_light = mix(0.82, 1.0, max(v_shade_factor, 0.35));
+    vec3 shaded_snow = clamp(global_snow_color.rgb * snow_light, 0.0, 1.0);
     vec3 final_albedo = mix(v_final_color, shaded_snow, snow_mask);
 	
     // Rain wetness: darken and make shinier