From d00cee752e9ae90c4837aa65fca0ec93080e4e6d Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Tue, 27 Jan 2026 11:39:22 +1300
Subject: [PATCH] camera: lint

---
 player/camera.gd | 48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/player/camera.gd b/player/camera.gd
index 14cad50..f98b431 100644
--- a/player/camera.gd
+++ b/player/camera.gd
@@ -2,74 +2,68 @@ class_name CameraGimbal extends Node3D
 
 @export var rotation_speed = (PI / 180) * 120
 @export var shift_lock = false
+@export var default_zoom = 8
 
-var locked_mouse_positon = Vector2(0,0)
 var mouse_locked = false
-var mouse_x_velocity = 0
-var mouse_y_velocity = 0
+var mouse_velocity = Vector2.ZERO
+var locked_mouse_position = Vector2.ZERO
 
+var current_zoom = default_zoom
 var zoom_min = 4
 var zoom_max = 80
 var zoom_speed = 20
-var current_zoom = 8
 
 func reset():
 	basis = Basis()
 	$InnerGimbal.basis = Basis()
+	current_zoom = default_zoom
 
 func rotate_camera_y(y, delta):
 	rotate_object_local(Vector3.UP, y * rotation_speed * delta)
 func rotate_camera_x(x, delta):
 	$InnerGimbal.rotate_object_local(
 		Vector3.RIGHT, x * rotation_speed * delta)
-	$InnerGimbal.rotation.x = clamp($InnerGimbal.rotation.x,-0.8,0.7)
-	
+	$InnerGimbal.rotation.x = clamp($InnerGimbal.rotation.x, -0.8, 0.7)
+
 func _input(event):
 	if event is InputEventMouseMotion:
-		mouse_x_velocity = event.relative.x
-		mouse_y_velocity = event.relative.y
+		mouse_velocity = event.relative
 	elif event.is_action_pressed("zoom_out"):
 		current_zoom += 1
 	elif event.is_action_pressed("zoom_in"):
 		current_zoom -= 1
 
+	current_zoom = clamp(current_zoom, zoom_min, zoom_max)
+
 func _process(delta):
- 	# rotate outer gimbal around y axis
 	var y = 0
 	var x = 0
 
 	if Input.is_action_just_pressed("shift_lock"):
-		if shift_lock == true:
-			shift_lock = false
-		else:
-			shift_lock = true
-	elif Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT) or shift_lock == true:
+		shift_lock = not shift_lock
+	if Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT) or shift_lock == true:
 		if mouse_locked == false:
 			mouse_locked = true
-			locked_mouse_positon = get_viewport().get_mouse_position()
+			locked_mouse_position = get_viewport().get_mouse_position()
 		Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
 
-		if mouse_x_velocity > 5 or mouse_x_velocity < -5:
-			y -= clamp(mouse_x_velocity / 12.5, -10, 10)
-		if mouse_y_velocity > 5 or mouse_y_velocity < -5:
-			x -= clamp(mouse_y_velocity / 12.5, -10, 10)
+		if mouse_velocity.x > 5 or mouse_velocity.x < -5:
+			y -= clamp(mouse_velocity.x / 12.5, -10, 10)
+		if mouse_velocity.y > 5 or mouse_velocity.y < -5:
+			x -= clamp(mouse_velocity.y / 12.5, -10, 10)
 	else:
 		Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
+		mouse_velocity = Vector2.ZERO
 		mouse_locked = false
-		mouse_x_velocity = 0
-		mouse_y_velocity = 0
 
 	rotate_camera_y(y, delta)
 	rotate_camera_x(x, delta)
 
-	# reset gimbals
 	if Input.is_action_pressed("cam_reset"):
 		reset()
 
-	current_zoom = clamp(current_zoom, zoom_min, zoom_max)
-	
 	var pos = Vector3($InnerGimbal/Camera3D.position)
-	pos.y = lerp(pos.y, float(current_zoom), zoom_speed*delta)
-	pos.z = lerp(pos.z, float(current_zoom), zoom_speed*delta)
-	
+	pos.y = lerp(pos.y, float(current_zoom), zoom_speed * delta)
+	pos.z = lerp(pos.z, float(current_zoom), zoom_speed * delta)
+
 	$InnerGimbal/Camera3D.position = pos