diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-09-07 03:31:36 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-09-07 03:31:36 +0200 |
| commit | 78b7ec6ef9e343731cc496f11c76a0a3e5f37220 (patch) | |
| tree | 1bef1af129d3b1ff1e5ccd36dff7cc9c8bd302d9 /client/map | |
| parent | 239619be774855b372eea82213b4d8da2d906f52 (diff) | |
| parent | fd737a6399cd201f5f3a22df5db27fac095e63bf (diff) | |
| download | hurrycurry-78b7ec6ef9e343731cc496f11c76a0a3e5f37220.tar hurrycurry-78b7ec6ef9e343731cc496f11c76a0a3e5f37220.tar.bz2 hurrycurry-78b7ec6ef9e343731cc496f11c76a0a3e5f37220.tar.zst | |
Merge branch 'new-settings' of codeberg.org:hurrycurry/hurrycurry into new-settings
Diffstat (limited to 'client/map')
| -rw-r--r-- | client/map/auto_setup/environment_setup.gd | 16 | ||||
| -rw-r--r-- | client/map/auto_setup/light_setup.gd | 9 |
2 files changed, 10 insertions, 15 deletions
diff --git a/client/map/auto_setup/environment_setup.gd b/client/map/auto_setup/environment_setup.gd index 49f93ccb..73c3ee32 100644 --- a/client/map/auto_setup/environment_setup.gd +++ b/client/map/auto_setup/environment_setup.gd @@ -22,13 +22,9 @@ func set_sky(sky_name: String): environment.sky.sky_material = load("res://map/environment/presets/%s_sky.tres" % sky_name) func _ready(): - pass - #Global.settings_changed.connect(apply_settings) - -# TODO -#func apply_settings(): - #environment.ssao_enabled = Global.get_setting("graphics.ssao") - #environment.sdfgi_enabled = Global.get_setting("graphics.gi") == "sdfgi" and allow_sdfgi - #environment.glow_enabled = Global.get_setting("graphics.glow") - #if !Global.on_vulkan(): - #environment.environment.tonemap_exposure = 0.5 + Settings.hook_changed_init("graphics.ssao", func (x): environment.ssao_enabled = x) + Settings.hook_changed_init("graphics.gi", func (x): environment.sdfgi_enabled = x == "sdfgi" and allow_sdfgi) + Settings.hook_changed_init("graphics.glow", func (x): environment.glow_enabled = x) + + if !Global.on_vulkan(): + environment.environment.tonemap_exposure = 0.5 diff --git a/client/map/auto_setup/light_setup.gd b/client/map/auto_setup/light_setup.gd index b42b3662..4da2886e 100644 --- a/client/map/auto_setup/light_setup.gd +++ b/client/map/auto_setup/light_setup.gd @@ -19,13 +19,12 @@ class_name LightSetup @export var completely_disable_light_if_shadows_disabled := false func _ready(): - apply_settings() - Global.settings_changed.connect(apply_settings) + Settings.hook_changed_init("graphics.shadows", apply_settings) -func apply_settings(): +func apply_settings(setting: bool): if completely_disable_light_if_shadows_disabled: - visible = Global.get_setting("graphics.shadows") - shadow_enabled = Global.get_setting("graphics.shadows") + visible = setting + shadow_enabled = setting func set_sky(sky_name: String): match sky_name: |