Add input_swim_up and input_swim_down

Author: scriptsengineer

addons/character-controller/core/character_controller_3d.gd

@@ -73,7 +73,6 @@ var fly_ability_path := NodePath("Fly Ability 3D")
 var swim_ability_path := NodePath("Swim Ability 3D")
 
 var direction := Vector3()
-var input_up := false
 var step_cycle : float = 0
 var next_step : float = 0
 var horizontal_velocity
@@ -137,8 +136,8 @@ func _start_variables():
 	swim_ability.submerged_speed_multiplier = submerged_speed_multiplier
 
 
-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)
+func move(_delta: float, input_axis := Vector2.ZERO, input_jump := false, input_crouch := false, input_sprint := false, input_swim_down := false, input_swim_up := false) -> void:
+	var direction = _direction_input(input_axis, input_swim_down, input_swim_up, 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():
@@ -177,7 +176,7 @@ func _check_step(_delta):
 		_step(is_on_floor())
 
 
-func _direction_input(input : Vector2, input_crouch : bool, aim_node : Node3D) -> Vector3:
+func _direction_input(input : Vector2, input_down : bool, input_up : bool, aim_node : Node3D) -> Vector3:
 	direction = Vector3()
 	var aim = aim_node.get_global_transform().basis
 	if input.x >= 0.5:
@@ -192,7 +191,7 @@ func _direction_input(input : Vector2, input_crouch : bool, aim_node : Node3D) -
 	if is_fly_mode() or is_floating():
 		if input_up:
 			direction.y += 1.0
-		elif input_crouch:
+		elif input_down:
 			direction.y -= 1.0
 	else:
 		direction.y = 0	

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

@@ -24,11 +24,12 @@ func _physics_process(delta):
 		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_crouch = Input.is_action_pressed(input_crouch_action_name)
 		var input_sprint = Input.is_action_pressed(input_sprint_action_name)
-		move(delta, input_axis, input_jump, input_crouch, input_sprint)
+		var input_swim_down = Input.is_action_pressed(input_crouch_action_name)
+		var input_swim_up = Input.is_action_pressed(input_jump_action_name)
+		move(delta, input_axis, input_jump, input_crouch, input_sprint, input_swim_down, input_swim_up)
 	else:
 		move(delta)
 

addons/character-controller/fps/fps_controller_3d.gd

@@ -45,12 +45,12 @@ func _check_head_bob(_delta, input_axis : Vector2):
 func rotate_head(mouse_axis : Vector2) -> void:
 	head.rotate_camera(mouse_axis)
 
-func move(_delta: float, input_axis := Vector2.ZERO, input_jump := false, input_crouch := false, input_sprint := false):
+func move(_delta: float, input_axis := Vector2.ZERO, input_jump := false, input_crouch := false, input_sprint := false, input_swim_down := false, input_swim_up := false):
 	if is_fly_mode() or is_floating():
 		direction_base_node = head
 	else:
 		direction_base_node = self
-	super.move(_delta, input_axis, input_jump, input_crouch, input_sprint)
+	super.move(_delta, input_axis, input_jump, input_crouch, input_sprint, input_swim_down, input_swim_up)
 	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, input_axis)