From 7ce725638625c58d017c9da9f4896c5724a4639a Mon Sep 17 00:00:00 2001 From: kayomn Date: Wed, 1 Feb 2023 18:26:41 +0000 Subject: [PATCH] Improve map editor initialization time --- interior/tiles/dungeon_01_pipehole_tile.res | 4 ++-- interior/tiles/dungeon_01_tiling_tile.res | 2 +- .../tiles/limestone_dungeon/hole_material.res | 4 ++-- .../tiles/limestone_dungeon/piping_material.res | 4 ++-- .../tiles/limestone_dungeon/tiling_material.res | 4 ++-- map_editor.scn | 4 ++-- map_editor/edit_action_button_group.res | 4 ++-- user_interface/worker_prompt.gd | 15 ++++++--------- 8 files changed, 19 insertions(+), 22 deletions(-) diff --git a/interior/tiles/dungeon_01_pipehole_tile.res b/interior/tiles/dungeon_01_pipehole_tile.res index f684c7c..d1614cc 100644 --- a/interior/tiles/dungeon_01_pipehole_tile.res +++ b/interior/tiles/dungeon_01_pipehole_tile.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50d1e57c78aa55883394de1f91ff5aa507a2e3a68c4289dd9c3c4294dd0aa6dc -size 131987 +oid sha256:4fb7fb7cdf138b9a7842d505894dbc1ece8f08a287fae299e98ebf261a25ed98 +size 131992 diff --git a/interior/tiles/dungeon_01_tiling_tile.res b/interior/tiles/dungeon_01_tiling_tile.res index 2cafb06..6452a4e 100644 --- a/interior/tiles/dungeon_01_tiling_tile.res +++ b/interior/tiles/dungeon_01_tiling_tile.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:935de0b7ca77b8e921044bda3ad3db0de8eaee338719927a39a782e0579bc16c +oid sha256:30078a1a1dd8083722061342076196eb1c7fa1f0c4a41bb1d62de5dde04d9911 size 479 diff --git a/interior/tiles/limestone_dungeon/hole_material.res b/interior/tiles/limestone_dungeon/hole_material.res index 3f994c5..0463553 100644 --- a/interior/tiles/limestone_dungeon/hole_material.res +++ b/interior/tiles/limestone_dungeon/hole_material.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac4a618b5ae0291a16ed9b957943e273ed841076bc48cb3df7d2f206de528b25 -size 1098 +oid sha256:d5d7e372525851ba0b666b73ad301c6a14f0bc29d10c00d32cfd1c72cd2bc341 +size 1090 diff --git a/interior/tiles/limestone_dungeon/piping_material.res b/interior/tiles/limestone_dungeon/piping_material.res index e6bc1cc..658cab4 100644 --- a/interior/tiles/limestone_dungeon/piping_material.res +++ b/interior/tiles/limestone_dungeon/piping_material.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67ef7e571aa11cd7b9e57a14977af2fcc656aefb5ed8c0f2de3fb7969565be16 -size 1097 +oid sha256:12cbd5f995e4a52d7ba01c0803f04a280d92a0176d8a7d3c56b1187d55127ebe +size 1088 diff --git a/interior/tiles/limestone_dungeon/tiling_material.res b/interior/tiles/limestone_dungeon/tiling_material.res index 49762db..70261a9 100644 --- a/interior/tiles/limestone_dungeon/tiling_material.res +++ b/interior/tiles/limestone_dungeon/tiling_material.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e917b37d179fb8c78deaf4a2003fa07e8d023aab38fa84119e9af9bcab09422c -size 1096 +oid sha256:814338830ebfb3d2216711b698cf8881083dd47e57afa18243161f7ca636cdbe +size 1090 diff --git a/map_editor.scn b/map_editor.scn index 75269bf..3dca50c 100644 --- a/map_editor.scn +++ b/map_editor.scn @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d40ab3a5c636b299cab66b325eebee44880a13467cd078577f39a72a9a7f05ab -size 13276 +oid sha256:70aea98588b8d976ba54f77d871032f852cc99d293fe970fb027d32da883078b +size 13469 diff --git a/map_editor/edit_action_button_group.res b/map_editor/edit_action_button_group.res index eb99a58..a5d7915 100644 --- a/map_editor/edit_action_button_group.res +++ b/map_editor/edit_action_button_group.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa858f41def84ccb776a1cfdf2ae3f9517ca2f75b042998c5118e88ff6c591a0 -size 205 +oid sha256:14fdd85318c9adc1be8c0700589f8e90a07eccc25f36760d150172537bf19959 +size 206 diff --git a/user_interface/worker_prompt.gd b/user_interface/worker_prompt.gd index 112ffa0..bb8bad2 100644 --- a/user_interface/worker_prompt.gd +++ b/user_interface/worker_prompt.gd @@ -12,12 +12,6 @@ signal prompted() var _worker_thread := Thread.new() -## -## Used to display a message from the prompt or [code]null[/code] to not display anything. -## -@export -var label: Label = null - ## ## Used to display the progress of the prompt or [code]null[/code] to not display anything. ## @@ -29,13 +23,16 @@ var progress: Range = null ## ## [signal prompt_completed] is emitted when the work being performed by the prompt has ended. ## -func prompt(display_message: String, steps: Array) -> void: +## Either this function or [signal prompt_completed] can be awaited upon to handle asynchronous +## scheduling of tasks to execute after completion. +## +func prompt(steps: Array) -> void: LocalPlayer.override_controls(hidden) show() prompted.emit() - if label != null: - label.text = display_message + while _worker_thread.is_alive(): + await get_tree().process_frame _worker_thread.start(func () -> void: var count := steps.size() -- 2.34.1