jmp-games/tgcc
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add wind fade in/out + add wire movement when is windy

Browse Source
This commit is contained in:
Overside srl
2026-04-21 15:16:30 +02:00
parent 9a26a4114b
commit f5a38bd8a0
11 changed files with 130 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/biome_generator/wires.gdshader
View File

@@ -6,19 +6,24 @@ uniform vec4 albedo_color : source_color = vec4(0.1, 0.1, 0.1, 1.0);
global uniform float global_wind_strength;
global uniform float global_wind_speed;
global uniform float global_wind_fade;
void vertex() {
//COLOR.r is the drawing. 0 -> lampost (no move); 1.0 is the center of the wire
float movement = COLOR.r;
float wind_amount = global_wind_strength * global_wind_fade;
//Create a wave (based on position and time to be random)
float wind_wave = 0.0;
if (global_wind_speed > 0.0 && global_wind_strength > 0.0) {
wind_wave = sin(TIME * global_wind_speed + NODE_POSITION_WORLD.x * 0.5) * global_wind_strength;
float vertical_wave = 0.0;
if (global_wind_speed > 0.0 && wind_amount > 0.0) {
wind_wave = sin(TIME * global_wind_speed + NODE_POSITION_WORLD.x * 0.5 + NODE_POSITION_WORLD.z * 0.35) * wind_amount;
vertical_wave = sin(TIME * global_wind_speed * 0.7 + NODE_POSITION_WORLD.z * 0.35) * wind_amount;
}
VERTEX.x += wind_wave * 0.1 * movement;
VERTEX.z += wind_wave * 0.05 * movement;
VERTEX.x += wind_wave * 0.28 * movement;
VERTEX.y += vertical_wave * 0.125 * movement;
VERTEX.z += wind_wave * 0.24 * movement;
}
void fragment() {

3
core/daynight/environment_dust.gdshader
View File

@@ -2,6 +2,7 @@ shader_type canvas_item;
uniform sampler2D screen_texture : hint_screen_texture, filter_linear_mipmap;
global uniform float global_wind_speed;
global uniform float global_wind_fade;
uniform vec4 dust_color : source_color = vec4(1.0, 0.456, 0.125, 0.6);
@@ -30,7 +31,7 @@ void fragment() {
float base_time = TIME * dust_speed;
vec2 osc = vec2(sin(TIME * 0.5), cos(TIME * 0.3)) * wind_oscillation;
float wind_active = step(0.0001, abs(global_wind_speed));
float wind_active = global_wind_fade * step(0.0001, abs(global_wind_speed));
vec2 final_wind = ((wind_speed + osc) * dust_speed) * wind_active;
float final_particle_alpha = 0.0;

5
core/daynight/tree_leaves.gdshader
View File

@@ -5,6 +5,7 @@ global uniform float global_wind_speed;
global uniform vec2 global_wind_direction;
global uniform float global_wind_scale;
global uniform float global_wind_strength;
global uniform float global_wind_fade;
global uniform float global_snow_start_time;
global uniform float global_snow_accumulation_speed;
global uniform float global_snow_melt_time;
@@ -43,12 +44,12 @@ void vertex() {
vec3 instance_pos = MODEL_MATRIX[3].xyz;
float total_angle = radians(rotation_degrees);
if (wind_enabled && global_wind_speed > 0.0 && global_wind_strength > 0.0) {
if (wind_enabled && global_wind_speed > 0.0 && global_wind_strength > 0.0 && global_wind_fade > 0.0) {
float time = TIME * global_wind_speed;
vec2 noise_uv = (instance_pos.xz * global_wind_scale) + (time * global_wind_direction * 0.5);
float noise_val = textureLod(wind_noise, noise_uv, 2.0).r;
float sway = sin(time + (noise_val * 10.0));
total_angle += (sway * global_wind_strength);
total_angle += (sway * global_wind_strength * global_wind_fade);
}
float h_factor = clamp((instance_pos.y - height_min) / (height_max - height_min), 0.0, 1.0);

54
core/daynight/weather_controller.gd
View File

@@ -42,8 +42,12 @@ var actual_snow_amount: float = 0.0
var is_storm: bool = false
var cold_tween: Tween
var wind_tween: Tween
var is_windy: bool = false
var thereare_fireflies: bool = false
var current_wind_speed: float = 0.0
var current_wind_strength: float = 0.0
var current_wind_fade: float = 0.0
func _init(wind: GPUParticles3D, snow: GPUParticles3D,
fireflies: GPUParticles3D, rain: GPUParticles3D, ray: PackedScene,
@@ -91,6 +95,7 @@ func _ready() -> void:
UIEvents.toggle_rain.connect(toggle_rain)
UIEvents.toggle_snow.connect(toggle_snow)
UIEvents.toggle_wind.connect(toggle_wind)
UIEvents.wind_change.connect(change_wind_strength)
UIEvents.toggle_fireflies.connect(toggle_fireflies)
UIEvents.toggle_storm.connect(toggle_storm)
UIEvents.toggle_dust.connect(toggle_dust)
@@ -334,16 +339,57 @@ func _apply_wind_config() -> void:
proc_mat_wind.direction = wind_axis
particles_wind.global_transform = Transform3D(Basis(wind_cross, wind_axis, wind_up), particles_wind.global_position)
_apply_wind_state()
_apply_wind_state(true)
func _apply_wind_state() -> void:
func _apply_wind_state(immediate: bool = false) -> void:
if environment_config == null:
return
if wind_tween and wind_tween.is_valid():
wind_tween.kill()
var active_wind_speed := environment_config.wind_speed if is_windy else 0.0
var active_wind_strength := environment_config.wind_strength if is_windy else 0.0
RenderingServer.global_shader_parameter_set("global_wind_speed", active_wind_speed)
RenderingServer.global_shader_parameter_set("global_wind_strength", active_wind_strength)
var active_wind_fade := 1.0 if is_windy else 0.0
if immediate:
_set_current_wind_speed(active_wind_speed)
_set_current_wind_strength(active_wind_strength)
_set_current_wind_fade(active_wind_fade)
return
_set_current_wind_speed(environment_config.wind_speed)
_set_current_wind_strength(environment_config.wind_strength)
wind_tween = create_tween()
wind_tween.tween_method(_set_current_wind_fade, current_wind_fade, active_wind_fade, environment_config.wind_fade_in_out_time)
wind_tween.tween_callback(_finish_wind_fade_out)
func _set_current_wind_speed(value: float) -> void:
current_wind_speed = value
RenderingServer.global_shader_parameter_set("global_wind_speed", value)
func _set_current_wind_strength(value: float) -> void:
current_wind_strength = value
RenderingServer.global_shader_parameter_set("global_wind_strength", value)
func _set_current_wind_fade(value: float) -> void:
current_wind_fade = value
RenderingServer.global_shader_parameter_set("global_wind_fade", value)
func _finish_wind_fade_out() -> void:
if is_windy:
return
_set_current_wind_speed(0.0)
_set_current_wind_strength(0.0)
_set_current_wind_fade(0.0)
func change_wind_strength(value: float) -> void:
if environment_config == null:
return
environment_config.wind_strength = value
if is_windy or current_wind_fade > 0.0:
_set_current_wind_strength(value)
func _apply_cloud_config() -> void:
var dir = environment_config.wind_direction

1
core/environment_config.gd
View File

@@ -157,6 +157,7 @@ extends Resource
@export var cloud_speed: float = 0.05 #Cloud movement speed in sky shader
@export_range(0.01, 1.0) var cloud_scale_envshadows_rate: float = 0.01 #Cloud scale multiplier for environment shadows
@export_range(0.01, 1.0) var cloud_speed_envshadows_rate: float = 0.5 #Cloud speed multiplier for environment shadows
@export var wind_fade_in_out_time: float = 1.2 #fade out to time when wind is turned off or when is turned on
#Firefly settings (visible only at night)
@export_group("Fireflies")

2
core/ui_events.gd
View File

@@ -8,6 +8,8 @@ signal toggle_snow(value: bool)
@warning_ignore("unused_signal")
signal toggle_wind(value: bool)
@warning_ignore("unused_signal")
signal wind_change(value: float)
@warning_ignore("unused_signal")
signal toggle_fireflies(value: bool)
@warning_ignore("unused_signal")
signal toggle_storm(value: bool)

44
docs/museums/biome_generator/museum_biome_generator.tscn
View File

@@ -225,12 +225,21 @@ theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1)
theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
text = "Wind"
[node name="WindSlider" type="HSlider" parent="Control" unique_id=28050098]
layout_mode = 0
offset_left = 26.0
offset_top = 124.0
offset_right = 205.0
offset_bottom = 140.0
max_value = 1.0
step = 0.01
[node name="Fireflies" type="CheckButton" parent="Control" unique_id=1046228444]
layout_mode = 0
offset_left = 21.0
offset_top = 115.0
offset_top = 169.0
offset_right = 130.0
offset_bottom = 146.0
offset_bottom = 200.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -266,18 +275,18 @@ text = "Time 00:00"
[node name="DayTimeSlider" type="HSlider" parent="Control" unique_id=1865778345]
layout_mode = 0
offset_left = 26.0
offset_top = 174.0
offset_top = 228.0
offset_right = 205.0
offset_bottom = 190.0
offset_bottom = 244.0
max_value = 1.0
step = 0.01
[node name="Dust" type="CheckButton" parent="Control" unique_id=760281365]
layout_mode = 0
offset_left = 21.0
offset_top = 250.0
offset_top = 304.0
offset_right = 150.0
offset_bottom = 281.0
offset_bottom = 335.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -290,9 +299,9 @@ text = "Dust"
[node name="Blur" type="CheckButton" parent="Control" unique_id=1083708100]
layout_mode = 0
offset_left = 21.0
offset_top = 278.0
offset_top = 332.0
offset_right = 150.0
offset_bottom = 309.0
offset_bottom = 363.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -305,9 +314,9 @@ text = "Blur"
[node name="Pause" type="CheckButton" parent="Control" unique_id=1587043871]
layout_mode = 0
offset_left = 21.0
offset_top = 189.0
offset_top = 243.0
offset_right = 158.0
offset_bottom = 220.0
offset_bottom = 274.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -319,9 +328,9 @@ text = "Pause Time"
[node name="Shadows" type="CheckButton" parent="Control" unique_id=283354318]
layout_mode = 0
offset_left = 21.0
offset_top = 302.0
offset_top = 356.0
offset_right = 150.0
offset_bottom = 333.0
offset_bottom = 387.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -334,19 +343,22 @@ text = "Shadows"
[node name="Guide" type="Label" parent="Control" unique_id=2121474959]
layout_mode = 0
offset_left = 26.0
offset_top = 347.0
offset_right = 236.0
offset_bottom = 474.0
offset_top = 401.0
offset_right = 339.0
offset_bottom = 606.0
text = "R-> Reset isometric camera
C-> Toggle cinematic mode
Z-> soft zoom
Manual controls (1-5)
T -> go to next stop
F -> fireworks"
F -> fireworks
BACKSPACE -> stop train
ARROW UP/DOWN -> change train speed"
[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"]
[connection signal="value_changed" from="Control/WindSlider" to="Control" method="_on_wind_slider_value_changed"]
[connection signal="toggled" from="Control/Fireflies" to="Control" method="_on_fireflies_toggled"]
[connection signal="toggled" from="Control/Storm" to="Control" method="_on_storm_toggled"]
[connection signal="value_changed" from="Control/DayTimeSlider" to="Control" method="_on_day_time_slider_value_changed"]

2
docs/museums/biome_generator/rails.gd
View File

@@ -168,6 +168,8 @@ func input_controls_management(delta: float) -> void:
train_speed += manual_acceleration * delta
elif Input.is_action_pressed("ui_down"):
train_speed -= manual_acceleration * delta
elif Input.is_action_pressed("ui_text_backspace"):
train_speed = 0
train_speed = clamp(train_speed, speed_min, speed_max)
func train_move(delta: float) -> void:

6
docs/museums/daynight/control.gd
View File

@@ -3,10 +3,13 @@ extends Control
@onready var day_night: EnvironmentManagerRoot = get_node_or_null("../DayNight") as EnvironmentManagerRoot
@onready var day_time_label: Label = $DayTimeLabel
@onready var day_time_slider: HSlider = $DayTimeSlider
@onready var wind_slider: HSlider = get_node_or_null("WindSlider") as HSlider
func _ready() -> void:
UIEvents.day_time_changed.connect(_on_day_time_changed)
if day_night != null and day_night.environment_config != null and wind_slider != null:
wind_slider.set_value_no_signal(day_night.environment_config.wind_strength)
_sync_day_time_ui()
func _on_rain_toggled(toggled_on: bool) -> void:
@@ -18,6 +21,9 @@ func _on_snow_toggled(toggled_on: bool) -> void:
func _on_wind_toggled(toggled_on: bool) -> void:
UIEvents.toggle_wind.emit(toggled_on)
func _on_wind_slider_value_changed(value: float) -> void:
UIEvents.wind_change.emit(value)
func _on_fireflies_toggled(toggled_on: bool) -> void:
UIEvents.toggle_fireflies.emit(toggled_on)

36
docs/museums/daynight/museum_daynight.tscn
View File

@@ -220,9 +220,9 @@ text = "Storm"
[node name="DayTimeLabel" type="Label" parent="Control" unique_id=1673596218]
layout_mode = 0
offset_left = 26.0
offset_top = 150.0
offset_top = 172.0
offset_right = 360.0
offset_bottom = 173.0
offset_bottom = 195.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
text = "Time 00:00"
@@ -230,18 +230,18 @@ text = "Time 00:00"
[node name="DayTimeSlider" type="HSlider" parent="Control" unique_id=530788076]
layout_mode = 0
offset_left = 26.0
offset_top = 174.0
offset_top = 196.0
offset_right = 205.0
offset_bottom = 190.0
offset_bottom = 212.0
max_value = 1.0
step = 0.01
[node name="Dust" type="CheckButton" parent="Control" unique_id=2023312048]
layout_mode = 0
offset_left = 21.0
offset_top = 250.0
offset_top = 272.0
offset_right = 150.0
offset_bottom = 281.0
offset_bottom = 303.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -254,9 +254,9 @@ text = "Dust"
[node name="Blur" type="CheckButton" parent="Control" unique_id=1758807681]
layout_mode = 0
offset_left = 21.0
offset_top = 278.0
offset_top = 300.0
offset_right = 150.0
offset_bottom = 309.0
offset_bottom = 331.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -269,9 +269,9 @@ text = "Blur"
[node name="Pause" type="CheckButton" parent="Control" unique_id=156986934]
layout_mode = 0
offset_left = 21.0
offset_top = 189.0
offset_top = 211.0
offset_right = 158.0
offset_bottom = 220.0
offset_bottom = 242.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -283,9 +283,9 @@ text = "Pause Time"
[node name="Shadows" type="CheckButton" parent="Control" unique_id=1751516495]
layout_mode = 0
offset_left = 21.0
offset_top = 302.0
offset_top = 324.0
offset_right = 150.0
offset_bottom = 333.0
offset_bottom = 355.0
theme_override_colors/font_color = Color(1, 1, 1, 1)
theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
@@ -295,6 +295,15 @@ theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
button_pressed = true
text = "Shadows"
[node name="WindSlider" type="HSlider" parent="Control" unique_id=25258103]
layout_mode = 0
offset_left = 26.0
offset_top = 146.0
offset_right = 205.0
offset_bottom = 162.0
max_value = 1.0
step = 0.01
[node name="Scene" type="Node" parent="." unique_id=701973010]
[node name="Grass2" parent="Scene" unique_id=838519336 instance=ExtResource("7_pd1r3")]
@@ -315,7 +324,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.039560795, 0)
[node name="House_XL_4" parent="Scene" unique_id=1350238174 instance=ExtResource("15_28c1g")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.55439, 0.2020216, -14)
[node name="Chunck_M_N-O-E-S1" parent="Scene" unique_id=515911998 groups=["weather_node"] instance=ExtResource("18_iu8wf")]
[node name="Chunck_M_N-O-E-S1" parent="Scene" unique_id=515911998 instance=ExtResource("18_iu8wf")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.498665, 0, 11.197407)
[node name="Chunk_C_E_1" parent="Scene" unique_id=1874739368 instance=ExtResource("19_ftvlo")]
@@ -331,3 +340,4 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 23)
[connection signal="toggled" from="Control/Blur" to="Control" method="_on_blur_toggled"]
[connection signal="toggled" from="Control/Pause" to="Control" method="_on_pause_toggled"]
[connection signal="toggled" from="Control/Shadows" to="Control" method="_on_shadows_toggled"]
[connection signal="value_changed" from="Control/WindSlider" to="Control" method="_on_wind_slider_value_changed"]

4
project.godot
View File

@@ -109,3 +109,7 @@ global_rain_puddle_amount={
"type": "float",
"value": 0.0
}
global_wind_fade={
"type": "float",
"value": 1.2
}