Refactor inputs for move character controller and head movement

Author: scriptsengineer

addons/character-controller/core/character_controller_3d.gd

@@ -73,12 +73,7 @@ var fly_ability_path := NodePath("Fly Ability 3D")
 var swim_ability_path := NodePath("Swim Ability 3D")
 
 var direction := Vector3()
-var input_axis := Vector2()
-var input_crouch := false
-var input_jump := false
 var input_up := false
-var input_sprint := false
-var input_fly_mode := false
 var step_cycle : float = 0
 var next_step : float = 0
 var horizontal_velocity
@@ -142,14 +137,13 @@ func _start_variables():
 	swim_ability.submerged_speed_multiplier = submerged_speed_multiplier
 
 
-func move(_delta: float) -> void:
-	var direction = _direction_input(input_axis, direction_base_node)
+func move(_delta: float, input_axis := Vector2.ZERO, input_jump := false, input_crouch := false, input_sprint := false) -> void:
+	var direction = _direction_input(input_axis, input_crouch, direction_base_node)
 	if not swim_ability.is_floating():
 		_check_landed()
 	if not jump_ability.is_actived() and not is_fly_mode() and not is_submerged() and not is_floating():
 		velocity.y -= gravity * _delta
 
-	fly_ability.set_active(input_fly_mode)
 	swim_ability.set_active(!fly_ability.is_actived())
 	jump_ability.set_active(input_jump and is_on_floor() and not head_check.is_colliding())
 	walk_ability.set_active(not is_fly_mode() and not swim_ability.is_floating())
@@ -183,7 +177,7 @@ func _check_step(_delta):
 		_step(is_on_floor())
 
 
-func _direction_input(input : Vector2, aim_node : Node3D) -> Vector3:
+func _direction_input(input : Vector2, input_crouch : bool, aim_node : Node3D) -> Vector3:
 	direction = Vector3()
 	var aim = aim_node.get_global_transform().basis
 	if input.x >= 0.5:

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

@@ -18,14 +18,19 @@ func _ready():
 	submerged.connect(_on_controller_subemerged.bind())
 
 func _physics_process(delta):
-	input_axis = Input.get_vector(input_back_action_name, input_forward_action_name, input_left_action_name, input_right_action_name)
-	input_crouch = Input.is_action_pressed(input_crouch_action_name)
-	input_jump = Input.is_action_just_pressed(input_jump_action_name)
-	input_up = Input.is_action_pressed(input_jump_action_name)
-	input_sprint = Input.is_action_pressed(input_sprint_action_name)
-	if Input.is_action_just_pressed(input_fly_mode_action_name):
-		input_fly_mode = !input_fly_mode
-	move(delta)
+	var is_valid_input := Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED
+	
+	if is_valid_input:
+		if Input.is_action_just_pressed(input_fly_mode_action_name):
+			fly_ability.set_active(not fly_ability.is_actived())
+		var input_axis = Input.get_vector(input_back_action_name, input_forward_action_name, input_left_action_name, input_right_action_name)
+		var input_crouch = Input.is_action_pressed(input_crouch_action_name)
+		var input_jump = Input.is_action_just_pressed(input_jump_action_name)
+		var input_up = Input.is_action_pressed(input_jump_action_name)
+		var input_sprint = Input.is_action_pressed(input_sprint_action_name)
+		move(delta, input_axis, input_jump, input_crouch, input_sprint)
+	else:
+		move(delta)
 
 # Called when there is an input event
 func _input(event: InputEvent) -> void:

addons/character-controller/fps/bob/head_bob.gd

@@ -52,7 +52,7 @@ func _do_head_bob(speed: float, delta: float) -> Vector3:
 
 	return Vector3(x_pos,y_pos,0)
 
-func head_bob_process(horizontal_velocity:Vector3, input_axis:Vector2, is_sprint, is_on_floor:bool, _delta:float):
+func head_bob_process(horizontal_velocity:Vector3, input_axis:Vector2, is_sprint:bool, is_on_floor:bool, _delta:float):
 	if jump_bop_enabled:
 		lerp_bob_curve.bob_process(_delta)
 

addons/character-controller/fps/fps_controller_3d.gd

@@ -39,21 +39,21 @@ func setup():
 	head_bob.vertical_horizontal_ratio = vertical_horizontal_ratio
 	head_bob.setup_bob(step_interval * 2);
 
-func _check_head_bob(_delta):
+func _check_head_bob(_delta, input_axis : Vector2):
 	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):
+func move(_delta: float, input_axis := Vector2.ZERO, input_jump := false, input_crouch := false, input_sprint := false):
 	if is_fly_mode() or is_floating():
 		direction_base_node = head
 	else:
 		direction_base_node = self
-	super.move(_delta)
+	super.move(_delta, input_axis, input_jump, input_crouch, input_sprint)
 	if not is_fly_mode() and not swim_ability.is_floating() and not swim_ability.is_submerged():
 		camera.set_fov(lerp(camera.fov, normal_fov * _fov_modifiers, _delta * fov_change_speed))
-	_check_head_bob(_delta)
+	_check_head_bob(_delta, input_axis)
 
 func _on_jumped():
 	super._on_jumped()