aboutsummaryrefslogtreecommitdiff
path: root/game/src/Game/LoadingScreen.gd
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-07-09 02:14:54 +0200
committer GitHub <noreply@github.com>2023-07-09 02:14:54 +0200
commit1d8accc1ca6b30120732c56233e5d74e860de1bb (patch)
tree97c167b06a8b2f2b868107414b5676ccb5fcb53b /game/src/Game/LoadingScreen.gd
parentd05bff0c40a482a9bb44877fe76b1e0efb2e1a68 (diff)
parent86bee7b44c7cc7adaef8cdf441667a99223dd98a (diff)
Merge pull request #135 from Spartan322/generalize/loading-and-events
Diffstat (limited to 'game/src/Game/LoadingScreen.gd')
-rw-r--r--game/src/Game/LoadingScreen.gd44
1 files changed, 32 insertions, 12 deletions
diff --git a/game/src/Game/LoadingScreen.gd b/game/src/Game/LoadingScreen.gd
index 9d44b41..3cbf199 100644
--- a/game/src/Game/LoadingScreen.gd
+++ b/game/src/Game/LoadingScreen.gd
@@ -1,32 +1,52 @@
extends Control
-class_name LoadingScreen
+signal load_started()
+signal load_changed(percentage : float)
+signal load_ended()
+
+@export var quote_file_path : String = "res://common/quotes.txt"
+
+@export_subgroup("Nodes")
@export var progress_bar: ProgressBar
@export var quote_label: Label
-var loadthread: Thread
+var thread: Thread
var quotes: PackedStringArray = []
-func update_loading_screen(percent_complete: int, quote_should_change = false):
+func start_loading_screen(thread_safe_function : Callable) -> void:
+ if not is_node_ready():
+ await ready
+ # set first quote
+ progress_bar.value = 0
+ quote_label.text = quotes[randi() % quotes.size()]
+
+ if thread != null and thread.is_started():
+ thread.wait_to_finish()
+
+ thread.start(thread_safe_function)
+ load_started.emit()
+
+func try_update_loading_screen(percent_complete: float, quote_should_change = false):
# forces the function to behave as if deferred
await get_tree().process_frame
progress_bar.value = percent_complete
if quote_should_change:
quote_label.text = quotes[randi() % quotes.size()]
-
-func _on_splash_container_splash_end():
- show()
+ if is_equal_approx(percent_complete, 100):
+ thread.wait_to_finish()
+ load_ended.emit()
+ else:
+ load_changed.emit(percent_complete)
func _ready():
+ if Engine.is_editor_hint(): return
+ thread = Thread.new()
# FS-3, UI-30, UIFUN-35
- loadthread = Thread.new()
- loadthread.start(Events.load_events.bind(self))
- var quotes_file = FileAccess.open("res://common/quotes.txt", FileAccess.READ).get_as_text()
+ var quotes_file := FileAccess.open(quote_file_path, FileAccess.READ).get_as_text()
quotes = quotes_file.split("\n",false)
if quotes.is_empty():
quotes = [""]
- # set first quote
- quote_label.text = quotes[randi() % quotes.size()]
func _exit_tree():
- loadthread.wait_to_finish()
+ if thread != null and thread.is_started():
+ thread.wait_to_finish()