add camera

2 files changed, 46 insertions, 1 deletions

diff --git a/client/scripts/follow_camera.gd b/client/scripts/follow_camera.gd
new file mode 100644
index 00000000..b49bdc2b
--- /dev/null
+++ b/client/scripts/follow_camera.gd
@@ -0,0 +1,38 @@
+class_name FollowCamera
+extends Camera3D
+
+const ROTATE_SPEED: float = 1.5
+const ROTATE_WEIGHT: float = 8.0
+const LOOK_WEIGHT: float = 8.0
+const MOVE_WEIGHT: float = 2.0
+
+@export var target: Node3D
+
+var angle_target: float = 0
+var angle: float = 0
+var ground: Vector3
+
+func _ready():
+	if target == null:
+		push_warning("target is not set")
+	else:
+		ground = target.position
+
+func _process(delta):
+	if target != null:
+		follow(delta)
+
+func follow(delta):
+	var new_transform = transform.looking_at(target.position)
+
+	transform.basis = transform.basis.from_euler(Vector3(
+		lerp_angle(transform.basis.get_euler().x, new_transform.basis.get_euler().x, delta * LOOK_WEIGHT),
+		lerp_angle(transform.basis.get_euler().y, new_transform.basis.get_euler().y, delta * LOOK_WEIGHT),
+		lerp_angle(transform.basis.get_euler().z, new_transform.basis.get_euler().z, delta * LOOK_WEIGHT)
+	))
+
+	angle_target += Input.get_axis("rotate_left", "rotate_right") * ROTATE_SPEED * delta
+	angle = lerp_angle(angle, angle_target, delta * ROTATE_WEIGHT)
+
+	ground = ground.lerp(target.position, delta * MOVE_WEIGHT)
+	position = ground + Vector3(0, 7.5, 7.5).rotated(Vector3.UP, angle)
diff --git a/client/scripts/player.gd b/client/scripts/player.gd
index 8296ebad..d574d70c 100644
--- a/client/scripts/player.gd
+++ b/client/scripts/player.gd
@@ -1,14 +1,17 @@
 extends Node3D
 
 const PLAYER_SIZE: float = 0.4
+const SPEED: float = 25.
 
 @export var map: Node3D
+@export var camera: FollowCamera
 
 var facing = Vector2(1, 0)
 var velocity = Vector2(0, 0)
 
 func _physics_process(delta):
 	var input = Vector2(Input.get_axis("left", "right"), Input.get_axis("forward", "backwards")).normalized()
+	input = input.rotated(-camera.angle_target)
 
 	if input.length() > 0.1:
 		facing = lerp_vector2_exp(facing, input, delta * 10.)
@@ -18,7 +21,11 @@ func _physics_process(delta):
 	velocity.x += input.x * delta * 0.5
 	velocity.y += input.y * delta * 0.5
 
-	position = Vector3(position.x + velocity.x, 0, position.z + velocity.y)
+	position = Vector3(
+		position.x + (velocity.x * delta * SPEED),
+		0,
+		position.z + (velocity.y * delta * SPEED)
+	)
 
 	# collide
 	collide(delta)