steven/Cozypaw-Hospital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(navigator): kill active tween before starting new navigation to prevent camera jitter

Browse Source
This commit is contained in:
Steven Wroblewski
2026-04-17 21:17:58 +02:00
parent 819f18b64c
commit e7d0036c61
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
scripts/systems/room_navigator.gd
View File

@@ -15,6 +15,7 @@ var _current_floor: int = 0
var _current_room: int = 0 var _current_room: int = 0
var _is_at_home: bool = false var _is_at_home: bool = false
var _camera: Camera2D var _camera: Camera2D
var _active_tween: Tween
func initialize(camera: Camera2D) -> void: func initialize(camera: Camera2D) -> void:
@@ -35,11 +36,13 @@ func go_to_room(floor_index: int, room_index: int) -> void:
_current_room = room_index _current_room = room_index
var target_x: float = room_index * ROOM_WIDTH + ROOM_WIDTH * 0.5 var target_x: float = room_index * ROOM_WIDTH + ROOM_WIDTH * 0.5
var target_y: float = floor_index * -FLOOR_HEIGHT + FLOOR_HEIGHT * 0.5 var target_y: float = floor_index * -FLOOR_HEIGHT + FLOOR_HEIGHT * 0.5
var tween: Tween = create_tween() if _active_tween != null:
tween.set_ease(Tween.EASE_IN_OUT) _active_tween.kill()
tween.set_trans(Tween.TRANS_SINE) _active_tween = create_tween()
tween.tween_property(_camera, "position", Vector2(target_x, target_y), CAMERA_TWEEN_DURATION) _active_tween.set_ease(Tween.EASE_IN_OUT)
tween.finished.connect(func() -> void: room_changed.emit(floor_index, room_index)) _active_tween.set_trans(Tween.TRANS_SINE)
_active_tween.tween_property(_camera, "position", Vector2(target_x, target_y), CAMERA_TWEEN_DURATION)
_active_tween.finished.connect(func() -> void: room_changed.emit(floor_index, room_index))
func go_to_home() -> void: func go_to_home() -> void:
@@ -48,11 +51,13 @@ func go_to_home() -> void:
if _is_at_home: if _is_at_home:
return return
_is_at_home = true _is_at_home = true
var tween: Tween = create_tween() if _active_tween != null:
tween.set_ease(Tween.EASE_IN_OUT) _active_tween.kill()
tween.set_trans(Tween.TRANS_SINE) _active_tween = create_tween()
tween.tween_property(_camera, "position", Vector2(HOME_CAMERA_X, HOME_CAMERA_Y), CAMERA_TWEEN_DURATION) _active_tween.set_ease(Tween.EASE_IN_OUT)
tween.finished.connect(func() -> void: home_entered.emit()) _active_tween.set_trans(Tween.TRANS_SINE)
_active_tween.tween_property(_camera, "position", Vector2(HOME_CAMERA_X, HOME_CAMERA_Y), CAMERA_TWEEN_DURATION)
_active_tween.finished.connect(func() -> void: home_entered.emit())
func go_to_hospital() -> void: func go_to_hospital() -> void:
@@ -63,11 +68,13 @@ func go_to_hospital() -> void:
_is_at_home = false _is_at_home = false
var target_x: float = _current_room * ROOM_WIDTH + ROOM_WIDTH * 0.5 var target_x: float = _current_room * ROOM_WIDTH + ROOM_WIDTH * 0.5
var target_y: float = _current_floor * -FLOOR_HEIGHT + FLOOR_HEIGHT * 0.5 var target_y: float = _current_floor * -FLOOR_HEIGHT + FLOOR_HEIGHT * 0.5
var tween: Tween = create_tween() if _active_tween != null:
tween.set_ease(Tween.EASE_IN_OUT) _active_tween.kill()
tween.set_trans(Tween.TRANS_SINE) _active_tween = create_tween()
tween.tween_property(_camera, "position", Vector2(target_x, target_y), CAMERA_TWEEN_DURATION) _active_tween.set_ease(Tween.EASE_IN_OUT)
tween.finished.connect(func() -> void: hospital_entered.emit()) _active_tween.set_trans(Tween.TRANS_SINE)
_active_tween.tween_property(_camera, "position", Vector2(target_x, target_y), CAMERA_TWEEN_DURATION)
_active_tween.finished.connect(func() -> void: hospital_entered.emit())
func get_current_floor() -> int: func get_current_floor() -> int: