diff options
Diffstat (limited to 'client/player/follow_camera.gd')
| -rw-r--r-- | client/player/follow_camera.gd | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/client/player/follow_camera.gd b/client/player/follow_camera.gd index 88b6cad4..b080f76e 100644 --- a/client/player/follow_camera.gd +++ b/client/player/follow_camera.gd @@ -70,14 +70,21 @@ func reset(): camera_distance_target = 10 func follow(delta): - if not _disable_input: angle_target += Input.get_axis("rotate_left", "rotate_right") * ( - ROTATE_SPEED * delta * (-1 if Global.get_setting("gameplay.invert_camera") else 1) - ) + if Global.get_setting("gameplay.first_person"): + global_position = target.global_position + Vector3.UP * 1.5 + rotation = target.rotation + Vector3(0,PI,0) + if target.get_parent() is ControllablePlayer: + target.get_parent().input_rotation = -rotation.y + return + + var invert_factor = -1 if Global.get_setting("gameplay.invert_camera") else 1; + + if not _disable_input: + angle_target += Input.get_axis("rotate_left", "rotate_right") * ROTATE_SPEED * delta * invert_factor angle = G.interpolate_angle(angle, angle_target, delta * ROTATE_WEIGHT) - if not _disable_input: angle_up_target += Input.get_axis("rotate_down", "rotate_up") * ( - ROTATE_UP_SPEED * delta * (-1 if Global.get_setting("gameplay.invert_camera") else 1) - ) + if not _disable_input: + angle_up_target += Input.get_axis("rotate_down", "rotate_up") * ROTATE_UP_SPEED * delta * invert_factor angle_up_target = clamp(angle_up_target, ANGLE_UP_MIN, ANGLE_UP_MAX) angle_up = G.interpolate_angle(angle_up, angle_up_target, delta * ROTATE_UP_WEIGHT) @@ -109,6 +116,8 @@ func follow(delta): camera_distance = G.interpolate(camera_distance, camera_distance_target, delta * ZOOM_WEIGHT) position = ground + offset + if target.get_parent() is ControllablePlayer: + target.get_parent().input_rotation = -angle_target func set_ingame(state: bool, in_lobby: bool): # Disable input in lobby |