diff --git a/core/daynight/day_night_controller.gd b/core/daynight/day_night_controller.gd index aaa2e33..60a7e7c 100644 --- a/core/daynight/day_night_controller.gd +++ b/core/daynight/day_night_controller.gd @@ -20,6 +20,7 @@ var current_time: float = 0.0 func _ready() -> void: current_time = start_time update_time(current_time) + UIEvents.set_day_time.connect(_on_set_day_time) func _process(delta: float) -> void: if paused or day_duration <= 0.0: @@ -43,3 +44,6 @@ func set_time(t: float) -> void: func update_time(currtime: float) -> void: emit_signal("time_changed", currtime) + +func _on_set_day_time(value: float) -> void: + set_time(value) diff --git a/core/ui_events.gd b/core/ui_events.gd index 92ab88d..8ad1ef7 100644 --- a/core/ui_events.gd +++ b/core/ui_events.gd @@ -1,6 +1,5 @@ extends Node -#Weather signals @warning_ignore("unused_signal") signal toggle_rain(value: bool) @warning_ignore("unused_signal") @@ -11,3 +10,5 @@ signal toggle_wind(value: bool) signal toggle_fireflies(value: bool) @warning_ignore("unused_signal") signal toggle_storm(value: bool) +@warning_ignore("unused_signal") +signal set_day_time(value: float) diff --git a/docs/museums/daynight/control.gd b/docs/museums/daynight/control.gd index 8d2df7e..34151c5 100644 --- a/docs/museums/daynight/control.gd +++ b/docs/museums/daynight/control.gd @@ -14,3 +14,6 @@ func _on_fireflies_toggled(toggled_on: bool) -> void: func _on_storm_toggled(toggled_on: bool) -> void: UIEvents.toggle_storm.emit(toggled_on) + +func _on_day_time_slider_value_changed(value: float) -> void: + UIEvents.set_day_time.emit(value) diff --git a/docs/museums/daynight/museum_daynight.tscn b/docs/museums/daynight/museum_daynight.tscn index dacd2fe..89229d7 100644 --- a/docs/museums/daynight/museum_daynight.tscn +++ b/docs/museums/daynight/museum_daynight.tscn @@ -18,11 +18,11 @@ seamless = true [sub_resource type="ShaderMaterial" id="ShaderMaterial_abyor"] shader = ExtResource("3_jiovi") -shader_parameter/sky_top_color = Color(0.050000012, 0.050000012, 0.15, 1) -shader_parameter/sky_horizon_color = Color(0.15000004, 0.100000024, 0.25, 1) -shader_parameter/night_intensity = 1.0 +shader_parameter/sky_top_color = Color(0.48583698, 0.31820738, 0.18352592, 1) +shader_parameter/sky_horizon_color = Color(0.6864148, 0.46878514, 0.31705183, 1) +shader_parameter/night_intensity = 0.3294815555557111 shader_parameter/cloud_noise = SubResource("NoiseTexture2D_abyor") -shader_parameter/sun_color = Color(0.100000024, 0.100000024, 0.3, 1) +shader_parameter/sun_color = Color(0.70346665, 0.43525925, 0.23294815, 1) shader_parameter/cloud_center_color = Color(1, 1, 1, 1) shader_parameter/cloud_edge_color = Color(0.8, 0.85, 0.9, 1) shader_parameter/cloud_direction = Vector2(0.5, 0.2) @@ -48,8 +48,8 @@ sky_material = SubResource("ShaderMaterial_abyor") [sub_resource type="Environment" id="Environment_icuhg"] background_mode = 2 sky = SubResource("Sky_50i22") -ambient_light_color = Color(0.100000024, 0.100000024, 0.3, 1) -tonemap_exposure = 0.4 +ambient_light_color = Color(0.70346665, 0.43525925, 0.23294815, 1) +tonemap_exposure = 0.7687851 ssao_enabled = true ssao_radius = 0.5 ssao_intensity = 14.0 @@ -57,13 +57,13 @@ ssao_detail = 0.0 ssil_enabled = true glow_enabled = true glow_levels/4 = 1.0 -glow_intensity = 2.0 +glow_intensity = 1.1953778 glow_strength = 0.65 glow_bloom = 1.0 fog_enabled = true fog_mode = 1 -fog_light_color = Color(0.15000004, 0.100000024, 0.25, 1) -fog_density = 0.015 +fog_light_color = Color(0.6864148, 0.46878514, 0.31705183, 1) +fog_density = 0.0062832604 fog_sky_affect = 0.0 [sub_resource type="CompositorEffect" id="CompositorEffect_q52t1"] @@ -97,9 +97,9 @@ environment = SubResource("Environment_icuhg") compositor = SubResource("Compositor_jbfcc") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=565189502] -transform = Transform3D(-0.4999999, 0.49673164, -0.70940626, 0, 0.8191519, 0.5735763, 0.86602515, 0.2867882, -0.40957597, 0, 0, 0) -light_color = Color(0.100000024, 0.100000024, 0.3, 1) -light_energy = 0.3 +transform = Transform3D(0.84025806, 0.4779233, -0.25603753, 0, 0.47223163, 0.8814742, 0.54218626, -0.740666, 0.3967965, 0, 0, 0) +light_color = Color(0.70346665, 0.43525925, 0.23294815, 1) +light_energy = 0.7693629 light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 shadow_enabled = true @@ -190,8 +190,27 @@ theme_override_colors/font_hover_color = Color(0, 0, 0, 1) theme_override_colors/font_hover_pressed_color = Color(0, 0, 0, 1) text = "Storm" +[node name="DayTimeLabel" type="Label" parent="Control" unique_id=1673596218] +layout_mode = 0 +offset_left = 26.0 +offset_top = 142.0 +offset_right = 135.0 +offset_bottom = 165.0 +theme_override_colors/font_color = Color(0, 0, 0, 1) +text = "Day Time" + +[node name="DayTimeSlider" type="HSlider" parent="Control" unique_id=530788076] +layout_mode = 0 +offset_left = 26.0 +offset_top = 165.0 +offset_right = 205.0 +offset_bottom = 181.0 +max_value = 1.0 +step = 0.01 + [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="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"]