Move shader material loading to world

Lila-Kuhlt · Apr 16, 2024 · 5833270 · 5833270
1 parent a5add4c
commit 5833270
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/scripts/title-screen.gd b/src/scripts/title-screen.gd
@@ -1,12 +1,5 @@
 extends Control
 
-func _ready() -> void:
-	# preload shader materials
-	ResourceLoader.load_threaded_request("res://shaders/hit-indicator.tres")
-	ResourceLoader.load_threaded_request("res://shaders/hp-bar.tres")
-	ResourceLoader.load_threaded_request("res://shaders/pentagram.tres")
-	ResourceLoader.load_threaded_request("res://shaders/shield.tres")
-
 func on_start_game_button_pressed() -> void:
 	get_tree().change_scene_to_file('res://scenes/world.tscn')
 

diff --git a/src/scripts/world.gd b/src/scripts/world.gd
@@ -67,6 +67,12 @@ func load_room(scene: PackedScene):
 	$Player.position = room.find_child("PlayerMarker").position
 
 func _ready():
+	# preload shader materials
+	ResourceLoader.load_threaded_request("res://shaders/hit-indicator.tres")
+	ResourceLoader.load_threaded_request("res://shaders/hp-bar.tres")
+	ResourceLoader.load_threaded_request("res://shaders/pentagram.tres")
+	ResourceLoader.load_threaded_request("res://shaders/shield.tres")
+
 	var common := []
 	var rare := []
 	var ultra := []