oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

wip: moving camera setup closer to actual :setup event post-transition out to allow for more setup to be done 'under the hood'

Browse Source
This commit is contained in:
Duncan Brown
2022-04-13 15:56:18 -04:00
committed by Julian Murgia
parent b985c42e08
commit eac4385b81
2 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd
View File

@@ -182,41 +182,6 @@ func init_room(room: ESCRoom) -> void:
if escoria.main.current_scene == null:
escoria.main.set_scene(room)
if room.player_scene:
room.player = room.player_scene.instance()
room.add_child(room.player)
escoria.object_manager.register_object(
ESCObject.new(
room.player.global_id,
room.player
),
room,
true
)
if escoria.globals_manager.has(
escoria.room_manager.GLOBAL_ANIMATION_RESOURCES
):
var animations = escoria.globals_manager.get_global(
escoria.room_manager.GLOBAL_ANIMATION_RESOURCES
)
if room.player.global_id in animations and \
ResourceLoader.exists(animations[room.player.global_id]):
room.player.animations = ResourceLoader.load(
animations[room.player.global_id]
)
room.player.update_idle()
escoria.object_manager.get_object(escoria.object_manager.CAMERA).node.set_target(room.player)
if room.global_id.empty():
room.global_id = room.name
# Manage player location at room start
if room.player != null \
and escoria.object_manager.get_start_location() != null:
room.player.teleport(escoria.object_manager.get_start_location().node)
_perform_script_events(room)
@@ -266,6 +231,49 @@ func _perform_script_events(room: ESCRoom) -> void:
escoria.game_scene.hide_main_menu()
escoria.game_scene.unpause_game()
# With the room transitioned out, finish any room prep and run :setup if
# it exists.
# We must first et the camera limits, and then worry about subsequent
# player setup since it relies on this.
escoria.main.set_camera_limits(0, room)
if room.player_scene:
room.player = room.player_scene.instance()
room.add_child(room.player)
escoria.object_manager.register_object(
ESCObject.new(
room.player.global_id,
room.player
),
room,
true
)
if escoria.globals_manager.has(
escoria.room_manager.GLOBAL_ANIMATION_RESOURCES
):
var animations = escoria.globals_manager.get_global(
escoria.room_manager.GLOBAL_ANIMATION_RESOURCES
)
if room.player.global_id in animations and \
ResourceLoader.exists(animations[room.player.global_id]):
room.player.animations = ResourceLoader.load(
animations[room.player.global_id]
)
room.player.update_idle()
escoria.object_manager.get_object(escoria.object_manager.CAMERA).node.set_target(room.player)
if room.global_id.empty():
room.global_id = room.name
# Manage player location at room start
if room.player != null \
and escoria.object_manager.get_start_location() != null:
room.player.teleport(escoria.object_manager.get_start_location().node)
var setup_event_added: bool = false
# Run the setup event, if there is one.
setup_event_added = _run_script_event(escoria.event_manager.EVENT_SETUP, room)