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

fix: yield a frame for any tweening period in case camera commands are back-to-back, resulting in a potential race condition.

Browse Source
This commit is contained in:
Duncan Brown
2022-11-09 11:20:12 -05:00
committed by Julian Murgia
parent 20f1aee6c2
commit 9f2cfd0dd0
7 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
addons/escoria-core/game/scenes/camera_player/esc_camera.gd
View File

@@ -93,20 +93,20 @@ func set_target(p_target, p_time : float = 0.0):
if p_time == 0.0:
self.global_position = _target
else:
# Need to wait a frame in order to ensure the screen centre position is
# recalculated. Also to allow any close-calls with the tween to finish.
yield(get_tree(), "idle_frame")
if _tween.is_active():
escoria.logger.debug(
self,
"Tween is still active: %f seconds of %f completed." % [
"set_target tween is still active: %f seconds of %f completed." % [
_tween.tell(),
_tween.get_runtime()
]
)
_tween.stop_all()
# Need to wait a frame in order to ensure the screen centre position is
# recalculated.
yield(get_tree(), "idle_frame")
set_drag_margin_enabled(false, false)
_convert_current_global_pos_for_disabled_drag_margin()
@@ -141,20 +141,20 @@ func set_camera_zoom(p_zoom_level: float, p_time: float):
if p_time == 0:
self.zoom = _zoom_target
else:
# Need to wait a frame in order to ensure the screen centre position is
# recalculated. Also to allow any close-calls with the tween to finish.
yield(get_tree(), "idle_frame")
if _tween.is_active():
escoria.logger.debug(
self,
"Tween is still active: %f seconds of %f completed." % [
"set_camera_zoom tween is still active: %f seconds of %f completed." % [
_tween.tell(),
_tween.get_runtime()
]
)
_tween.stop_all()
# Need to wait a frame in order to ensure the screen centre position is
# recalculated.
yield(get_tree(), "idle_frame")
set_drag_margin_enabled(false, false)
_convert_current_global_pos_for_disabled_drag_margin()
@@ -196,10 +196,14 @@ func push(p_target, p_time: float = 0.0, p_type: int = 0):
if _zoom_target != Vector2():
self.zoom = _zoom_target
else:
# Need to wait a frame in order to ensure the screen centre position is
# recalculated. Also to allow any close-calls with the tween to finish.
yield(get_tree(), "idle_frame")
if _tween.is_active():
escoria.logger.debug(
self,
"Tween is still active: %f seconds of %f completed." % [
"camera push tween is still active: %f seconds of %f completed." % [
_tween.tell(),
_tween.get_runtime()
]
@@ -217,10 +221,6 @@ func push(p_target, p_time: float = 0.0, p_type: int = 0):
Tween.EASE_IN_OUT
)
# Need to wait a frame in order to ensure the screen centre position is
# recalculated.
yield(get_tree(), "idle_frame")
set_drag_margin_enabled(false, false)
_convert_current_global_pos_for_disabled_drag_margin()
@@ -255,19 +255,19 @@ func shift(p_target: Vector2, p_time: float, p_type: int):
_target = new_pos
if _tween.is_active():
# Need to wait a frame in order to ensure the screen centre position is
# recalculated. Also to allow any close-calls with the tween to finish.
yield(get_tree(), "idle_frame")
escoria.logger.debug(
self,
"Tween is still active: %f seconds of %f completed." % [
"camera shift tween is still active: %f seconds of %f completed." % [
_tween.tell(),
_tween.get_runtime()
]
)
_tween.stop_all()
# Need to wait a frame in order to ensure the screen centre position is
# recalculated.
yield(get_tree(), "idle_frame")
set_drag_margin_enabled(false, false)
_convert_current_global_pos_for_disabled_drag_margin()