diff options
author | metamuffin <metamuffin@disroot.org> | 2024-06-30 00:36:24 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-06-30 00:36:24 +0200 |
commit | 3322a7d3ceb399868c5eeeeb081249faa82506cd (patch) | |
tree | ab9ded100ec8f48fd64ab5da5ac71c5056022cbf | |
parent | 3ea4e19d3ca7d1206408c113e1d2e0d27a6e6323 (diff) | |
parent | 88c61bdaeca10b17cd24053ebafbc15f73710034 (diff) | |
download | hurrycurry-3322a7d3ceb399868c5eeeeb081249faa82506cd.tar hurrycurry-3322a7d3ceb399868c5eeeeb081249faa82506cd.tar.bz2 hurrycurry-3322a7d3ceb399868c5eeeeb081249faa82506cd.tar.zst |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
-rw-r--r-- | client/global.gd | 5 | ||||
-rw-r--r-- | client/player/follow_camera.gd | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/client/global.gd b/client/global.gd index 10468645..d4ab1677 100644 --- a/client/global.gd +++ b/client/global.gd @@ -44,6 +44,11 @@ var default_settings := { "value": true, "description": tr("Interpolate the camera rotation") }, + "invert_camera": { + "type": "toggle", + "value": false, + "description": tr("Invert camera movement") + }, "server_binary": { "type": "line", "value": "", diff --git a/client/player/follow_camera.gd b/client/player/follow_camera.gd index e3ba5e92..36538e8d 100644 --- a/client/player/follow_camera.gd +++ b/client/player/follow_camera.gd @@ -57,10 +57,14 @@ func _input(event): camera_distance_target = 10 func follow(delta): - angle_target += Input.get_axis("rotate_left", "rotate_right") * ROTATE_SPEED * delta + angle_target += Input.get_axis("rotate_left", "rotate_right") * ( + ROTATE_SPEED * delta * (1 if Global.settings["invert_camera"]["value"] else -1) + ) angle = lerp_angle(angle, angle_target, delta * ROTATE_WEIGHT) - angle_up_target += Input.get_axis("rotate_down", "rotate_up") * ROTATE_UP_SPEED * delta + angle_up_target += Input.get_axis("rotate_down", "rotate_up") * ( + ROTATE_UP_SPEED * delta * (1 if Global.settings["invert_camera"]["value"] else -1) + ) angle_up_target = clamp(angle_up_target, ANGLE_UP_MIN, ANGLE_UP_MAX) angle_up = lerp_angle(angle_up, angle_up_target, delta * ROTATE_UP_WEIGHT) |