diff options
-rw-r--r-- | client/global.gd | 1 | ||||
-rw-r--r-- | client/map/auto_setup/environment_setup.gd | 3 | ||||
-rw-r--r-- | client/menu/menu.gd | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/client/global.gd b/client/global.gd index e3fe9000..8fd9e399 100644 --- a/client/global.gd +++ b/client/global.gd @@ -55,6 +55,7 @@ var default_settings := { "voxel_gi": ToggleSetting.new(tr("Use VoxelGI (Blocks the game on map update but is more accurate)"), false), "sdfgi": ToggleSetting.new(tr("Use SDFGI (Doesn't block the game but produces more artifacts)"), false), "shadows": ToggleSetting.new(tr("Enable shadows"), true), + "glow": ToggleSetting.new(tr("Enable glow"), true), "debug_info": ToggleSetting.new(tr("Display debug info (Framerate, etc.)"), false), "grass_amount": RangeSetting.new(tr("3D grass amount per grass tile"), 16, 0, 32), "setup_complete": ToggleSetting.new(tr("Initial setup complete. (Uncheck and restart to reenter)"), false), diff --git a/client/map/auto_setup/environment_setup.gd b/client/map/auto_setup/environment_setup.gd index 323a7f04..96feb86b 100644 --- a/client/map/auto_setup/environment_setup.gd +++ b/client/map/auto_setup/environment_setup.gd @@ -24,4 +24,5 @@ func _ready(): func apply_settings(): environment.ssao_enabled = Global.get_setting("ssao") - environment.sdfgi_enabled = Global.get_setting("sdfgi") if allow_sdfgi else false + environment.sdfgi_enabled = Global.get_setting("sdfgi") and allow_sdfgi + environment.glow_enabled = Global.get_setting("glow") diff --git a/client/menu/menu.gd b/client/menu/menu.gd index d2da3529..6dd48fca 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -51,13 +51,13 @@ func menu_anim_cover(_state: bool): pass var popup: Menu = null -func submenu(path: String, data = null): +func submenu(path: String, data_ = null): var prev_focus = Global.focused_node if popup != null: return _disable_recursive(self, true) await menu_anim_cover(true) popup = load(path).instantiate() - popup.data = data + popup.data = data_ add_child(popup) print("Submenu opened ", path) await submenu_close |