Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for packed scene #30

Merged
merged 2 commits into from
May 3, 2024
Merged

add support for packed scene #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8be627e
add support for packed scene
myin142 Sep 7, 2023
091b5c4
fix parameter name
myin142 Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions addons/scene_manager/SceneManager.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func _process(_delta: float) -> void:
_previous_scene = _tree.current_scene

func change_scene(path: Variant, setted_options: Dictionary = {}) -> void:
assert(path == null or path is String, 'Path must be a string')
assert(path == null or path is String or path is PackedScene, 'Path must be a string or a PackedScene')
var options = _get_final_options(setted_options)
if not options["skip_fade_out"]:
await fade_out(setted_options)
Expand All @@ -123,17 +123,22 @@ func fade_in_place(setted_options: Dictionary = {}) -> void:
setted_options["no_scene_change"] = true
await change_scene(null, setted_options)

func _replace_scene(path: String, options: Dictionary) -> void:
func _replace_scene(path: Variant, options: Dictionary) -> void:
_current_scene.queue_free()
scene_unloaded.emit()
var following_scene: PackedScene = ResourceLoader.load(path, "PackedScene", 0)
var following_scene: PackedScene = _load_scene_resource(path)
_current_scene = following_scene.instantiate()
_current_scene.tree_entered.connect(options["on_tree_enter"].bind(_current_scene))
_current_scene.ready.connect(options["on_ready"].bind(_current_scene))
await _tree.create_timer(0.0).timeout
_root.add_child(_current_scene)
_tree.set_current_scene(_current_scene)

func _load_scene_resource(path: Variant) -> Resource:
if path is PackedScene:
return path
return ResourceLoader.load(path, "PackedScene", 0)

func fade_out(setted_options: Dictionary= {}) -> void:
var options = _get_final_options(setted_options)
is_transitioning = true
Expand Down