generated from krampus/template-godot4
Compare commits
No commits in common. "be7b0d43353e348cdbf2915d9de6eba2013bd233" and "98b46c2fc39ebe56eb84235367c6e6ea08318a13" have entirely different histories.
be7b0d4335
...
98b46c2fc3
Binary file not shown.
BIN
assets/ui/title.png
(Stored with Git LFS)
BIN
assets/ui/title.png
(Stored with Git LFS)
Binary file not shown.
@ -1854,6 +1854,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -1.5)
|
||||
|
||||
[node name="TarpCrateLogo" parent="BeastNav/Corridor1/Hallway2" instance=ExtResource("32_sogkw")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.8, -11.4)
|
||||
skeleton = NodePath("")
|
||||
surface_material_override/0 = null
|
||||
|
||||
[node name="Hallway3" type="MeshInstance3D" parent="BeastNav/Corridor1"]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -19.5, 0, -7.5)
|
||||
|
@ -60,26 +60,18 @@ func _initial_load() -> void:
|
||||
## The loading screen will be shown until the scene is loaded.
|
||||
func queue_scene(path: String) -> Promise:
|
||||
_unload_content()
|
||||
return (
|
||||
queue_load(path, ResourceLoader.CACHE_MODE_REUSE, ScenePromise.new(), "PackedScene")
|
||||
. finally(_finish_scene_load)
|
||||
)
|
||||
return queue_load(path, ScenePromise.new(), "PackedScene").finally(_finish_scene_load)
|
||||
|
||||
|
||||
## Queue a resource to be loaded in the background.
|
||||
##
|
||||
## Returns a `Promise` which can be used to attach callbacks
|
||||
## which will be called with the resource after it is loaded.
|
||||
func queue_load(
|
||||
path: String,
|
||||
cache_mode: ResourceLoader.CacheMode = ResourceLoader.CACHE_MODE_REUSE,
|
||||
promise: Promise = null,
|
||||
type_hint: String = ""
|
||||
) -> Promise:
|
||||
func queue_load(path: String, promise: Promise = null, type_hint: String = "") -> Promise:
|
||||
if not promise:
|
||||
promise = Promise.new()
|
||||
_loading_resources[path] = promise
|
||||
ResourceLoader.load_threaded_request(path, type_hint, false, cache_mode)
|
||||
ResourceLoader.load_threaded_request(path, type_hint)
|
||||
return promise
|
||||
|
||||
|
||||
|
@ -6,6 +6,7 @@ const VELOCITY_FACTOR := 2.0
|
||||
|
||||
var _on_right_foot := false
|
||||
|
||||
|
||||
@onready var left_foot: FootController = %LeftFoot
|
||||
@onready var right_foot: FootController = %RightFoot
|
||||
|
||||
|
@ -19,4 +19,4 @@ static func load_level(level_path: String, save: SaveState = null) -> void:
|
||||
|
||||
static func load_save(save_path: String) -> void:
|
||||
var chain_load := func(save: SaveState) -> void: load_level(save.level_path, save)
|
||||
Game.instance.queue_load(save_path, ResourceLoader.CACHE_MODE_REPLACE_DEEP).then(chain_load)
|
||||
Game.instance.queue_load(save_path).then(chain_load)
|
||||
|
@ -79,9 +79,7 @@ func on_game_over() -> void:
|
||||
# reload the level from the last save
|
||||
var save_path := current_level.get_save_path()
|
||||
if FileAccess.file_exists(save_path):
|
||||
Game.instance.queue_load(save_path, ResourceLoader.CACHE_MODE_REPLACE_DEEP).finally(
|
||||
_reload_saved
|
||||
)
|
||||
Game.instance.queue_load(save_path).finally(_reload_saved)
|
||||
else:
|
||||
load_level(current_level_scene)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user