Move head rotate input to top layer scripts

Author: scriptsengineer

addons/character-controller/example/main/player.gd

@@ -27,6 +27,12 @@ func _physics_process(delta):
 		input_fly_mode = !input_fly_mode
 	move(delta)
 
+# Called when there is an input event
+func _input(event: InputEvent) -> void:
+	# Mouse look (only if the mouse is captured).
+	if event is InputEventMouseMotion and Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
+		rotate_head(event.relative)
+	
 func _on_controller_emerged():
 	camera.environment = null
 

addons/character-controller/fps/fps_controller_3d.gd

@@ -42,6 +42,9 @@ func setup():
 func _check_head_bob(_delta):
 	head_bob.head_bob_process(horizontal_velocity, input_axis, is_sprinting(), is_on_floor(), _delta)
 
+func rotate_head(mouse_axis : Vector2) -> void:
+	head.rotate_camera(mouse_axis)
+	
 func move(_delta: float):
 	if is_fly_mode() or is_floating():
 		direction_base_node = head

addons/character-controller/fps/head_movement.gd

@@ -7,7 +7,6 @@ class_name HeadMovement
 
 @export var mouse_sensitivity := 0.002
 @export var vertical_angle_limit := 90.0
-var mouse_axis := Vector2()
 var rot := Vector3()
 
 
@@ -19,15 +18,7 @@ func set_vertical_angle_limit(limit : float):
 	vertical_angle_limit = deg_to_rad(limit)
 
 
-# Called when there is an input event
-func _input(event: InputEvent) -> void:
-	# Mouse look (only if the mouse is captured).
-	if event is InputEventMouseMotion and Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
-		mouse_axis = event.relative
-		_camera_rotation()
-
-
-func _camera_rotation() -> void:
+func rotate_camera(mouse_axis : Vector2) -> void:
 	# Horizontal mouse look.
 	rot.y -= mouse_axis.x * mouse_sensitivity
 	# Vertical mouse look.