diff options
| author | metamuffin <metamuffin@noreply.codeberg.org> | 2024-09-07 13:37:23 +0000 |
|---|---|---|
| committer | metamuffin <metamuffin@noreply.codeberg.org> | 2024-09-07 13:37:23 +0000 |
| commit | 091f8ff9acf04cedf14765e9db5540c876fd7375 (patch) | |
| tree | 4c115d6cb14df5d68bc72785f1020ed4ad2fb8e2 /client/map/auto_setup | |
| parent | af108805c8fd87a9d20a8df02072f224d2cd3417 (diff) | |
| parent | 3ef379fb07df126ea09cb112801a0bef371f8811 (diff) | |
| download | hurrycurry-091f8ff9acf04cedf14765e9db5540c876fd7375.tar hurrycurry-091f8ff9acf04cedf14765e9db5540c876fd7375.tar.bz2 hurrycurry-091f8ff9acf04cedf14765e9db5540c876fd7375.tar.zst | |
Merge pull request 'Refactor settings system and localization' (#123) from new-settings into master
Reviewed-on: https://codeberg.org/hurrycurry/hurrycurry/pulls/123
Diffstat (limited to 'client/map/auto_setup')
| -rw-r--r-- | client/map/auto_setup/environment_setup.gd | 11 | ||||
| -rw-r--r-- | client/map/auto_setup/light_setup.gd | 9 |
2 files changed, 8 insertions, 12 deletions
diff --git a/client/map/auto_setup/environment_setup.gd b/client/map/auto_setup/environment_setup.gd index 3ce8add3..c484ca1d 100644 --- a/client/map/auto_setup/environment_setup.gd +++ b/client/map/auto_setup/environment_setup.gd @@ -22,12 +22,9 @@ func set_sky(sky_name: String): environment.sky.sky_material = load("res://map/environment/presets/%s_sky.tres" % sky_name) func _ready(): - apply_settings() - Global.settings_changed.connect(apply_settings) - -func apply_settings(): - environment.ssao_enabled = Global.get_setting("ssao") - environment.sdfgi_enabled = Global.get_setting("gi") == 1 and allow_sdfgi - environment.glow_enabled = Global.get_setting("glow") + Settings.hook_changed_init("graphics.ssao", false, func (x): environment.ssao_enabled = x) + Settings.hook_changed_init("graphics.gi", false, func (x): environment.sdfgi_enabled = x == "sdfgi" and allow_sdfgi) + Settings.hook_changed_init("graphics.glow", false, 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 1e256dae..7d1b0b7a 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", false, apply_settings) -func apply_settings(): +func apply_settings(setting: bool): if completely_disable_light_if_shadows_disabled: - visible = Global.get_setting("shadows") - shadow_enabled = Global.get_setting("shadows") + visible = setting + shadow_enabled = setting func set_sky(sky_name: String): match sky_name: |