diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-06-27 17:53:35 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-27 17:53:35 +0200 |
| commit | 5011f5cb98020c7ddcabe2507b76c7656a1cee8b (patch) | |
| tree | 0adcf109a5dd2426506e5450a6b5ab9eebcea705 | |
| parent | b6713492c6f571ba9897532f129924f438909a07 (diff) | |
| parent | b284e05536ea0f7dcfc294c02f803386f373a3cf (diff) | |
| download | hurrycurry-5011f5cb98020c7ddcabe2507b76c7656a1cee8b.tar hurrycurry-5011f5cb98020c7ddcabe2507b76c7656a1cee8b.tar.bz2 hurrycurry-5011f5cb98020c7ddcabe2507b76c7656a1cee8b.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
| -rw-r--r-- | client/game.gd | 4 | ||||
| -rw-r--r-- | client/global.gd | 12 | ||||
| -rw-r--r-- | client/map/map.gd | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/client/game.gd b/client/game.gd index 756ff978..abb04bc6 100644 --- a/client/game.gd +++ b/client/game.gd @@ -38,7 +38,9 @@ var players := {} func _ready(): if !Global.on_vulkan(): environment.environment.tonemap_exposure = 0.5 - + + environment.environment.sdfgi_enabled = Global.settings["sdfgi"]["value"] + mp.connection_closed.connect(func(reason: String): Global.error_message = reason; $SceneTransition.instant_to("res://menu/error_menu.tscn") diff --git a/client/global.gd b/client/global.gd index 49b5f72e..f25845a6 100644 --- a/client/global.gd +++ b/client/global.gd @@ -30,11 +30,19 @@ var default_settings := { }, "server_binary": { "value": "", - "description": tr("The path of the server binary (leave empty to search PATH)") + "description": tr("Server binary (leave empty to search PATH)") }, "server_data": { "value": "", - "description": tr("The path of the server data directory (leave empty to auto-detect)") + "description": tr("Server data directory (leave empty to auto-detect)") + }, + "voxel_gi": { + "value": false, + "description": tr("Use VoxelGI (Blocks the game on map update)") + }, + "sdfgi": { + "value": false, + "description": tr("Use SDFGI (Doesn't block the game but is more resource-hungry)") }, } diff --git a/client/map/map.gd b/client/map/map.gd index 7e09e969..b693ab9b 100644 --- a/client/map/map.gd +++ b/client/map/map.gd @@ -33,7 +33,8 @@ func clear_tile(pos: Vector2i): @onready var voxelgi: VoxelGI = $VoxelGI func _ready(): - voxelgi_timer.connect("timeout", gi_bake) + if Global.settings["voxel_gi"]["value"]: + voxelgi_timer.connect("timeout", gi_bake) func gi_bake(): print("Map: Rebaking VoxelGI") |