seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #58411 from cbscribe/rename_motion_velocity

Browse Source
This commit is contained in:
Rémi Verschelde
2022-02-23 09:48:58 +01:00
committed by GitHub
parent 2b8a6c14df 849d34ba8e
commit fcf8c2006d
10 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/editor_templates/CharacterBody2D/basic_movement.gd
View File

@ -12,18 +12,18 @@ var gravity: int = ProjectSettings.get_setting("physics/2d/default_gravity")
func _physics_process(delta: float) -> void:
# Add the gravity.
if not is_on_floor():
motion_velocity.y += gravity * delta
velocity.y += gravity * delta
# Handle Jump.
if Input.is_action_just_pressed("ui_accept") and is_on_floor():
motion_velocity.y = JUMP_VELOCITY
velocity.y = JUMP_VELOCITY
# Get the input direction and handle the movement/deceleration.
# As good practice, you should replace UI actions with custom gameplay actions.
var direction := Input.get_axis("ui_left", "ui_right")
if direction:
motion_velocity.x = direction * SPEED
velocity.x = direction * SPEED
else:
motion_velocity.x = move_toward(motion_velocity.x, 0, SPEED)
velocity.x = move_toward(velocity.x, 0, SPEED)
move_and_slide()

12
modules/gdscript/editor_templates/CharacterBody3D/basic_movement.gd
View File

@ -12,21 +12,21 @@ var gravity: float = ProjectSettings.get_setting("physics/3d/default_gravity")
func _physics_process(delta: float) -> void:
# Add the gravity.
if not is_on_floor():
motion_velocity.y -= gravity * delta
velocity.y -= gravity * delta
# Handle Jump.
if Input.is_action_just_pressed("ui_accept") and is_on_floor():
motion_velocity.y = JUMP_VELOCITY
velocity.y = JUMP_VELOCITY
# Get the input direction and handle the movement/deceleration.
# As good practice, you should replace UI actions with custom gameplay actions.
var input_dir := Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
var direction := (transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized()
if direction:
motion_velocity.x = direction.x * SPEED
motion_velocity.z = direction.z * SPEED
velocity.x = direction.x * SPEED
velocity.z = direction.z * SPEED
else:
motion_velocity.x = move_toward(motion_velocity.x, 0, SPEED)
motion_velocity.z = move_toward(motion_velocity.z, 0, SPEED)
velocity.x = move_toward(velocity.x, 0, SPEED)
velocity.z = move_toward(velocity.z, 0, SPEED)
move_and_slide()

12
modules/mono/editor_templates/CharacterBody2D/basic_movement.cs
View File

@ -13,29 +13,29 @@ public partial class _CLASS_ : _BASE_
public override void _PhysicsProcess(float delta)
{
Vector2 motionVelocity = MotionVelocity;
Vector2 velocity = Velocity;
// Add the gravity.
if (!IsOnFloor())
motionVelocity.y += gravity * delta;
velocity.y += gravity * delta;
// Handle Jump.
if (Input.IsActionJustPressed("ui_accept") && IsOnFloor())
motionVelocity.y = JumpVelocity;
velocity.y = JumpVelocity;
// Get the input direction and handle the movement/deceleration.
// As good practice, you should replace UI actions with custom gameplay actions.
Vector2 direction = Input.GetVector("ui_left", "ui_right", "ui_up", "ui_down");
if (direction != Vector2.Zero)
{
motionVelocity.x = direction.x * Speed;
velocity.x = direction.x * Speed;
}
else
{
motionVelocity.x = Mathf.MoveToward(MotionVelocity.x, 0, Speed);
velocity.x = Mathf.MoveToward(Velocity.x, 0, Speed);
}
MotionVelocity = motionVelocity;
Velocity = velocity;
MoveAndSlide();
}
}

16
modules/mono/editor_templates/CharacterBody3D/basic_movement.cs
View File

@ -13,15 +13,15 @@ public partial class _CLASS_ : _BASE_
public override void _PhysicsProcess(float delta)
{
Vector3 motionVelocity = MotionVelocity;
Vector3 velocity = Velocity;
// Add the gravity.
if (!IsOnFloor())
motionVelocity.y -= gravity * delta;
velocity.y -= gravity * delta;
// Handle Jump.
if (Input.IsActionJustPressed("ui_accept") && IsOnFloor())
motionVelocity.y = JumpVelocity;
velocity.y = JumpVelocity;
// Get the input direction and handle the movement/deceleration.
// As good practice, you should replace UI actions with custom gameplay actions.
@ -29,16 +29,16 @@ public partial class _CLASS_ : _BASE_
Vector3 direction = Transform.basis.Xform(new Vector3(inputDir.x, 0, inputDir.y)).Normalized();
if (direction != Vector3.Zero)
{
motionVelocity.x = direction.x * Speed;
motionVelocity.z = direction.z * Speed;
velocity.x = direction.x * Speed;
velocity.z = direction.z * Speed;
}
else
{
motionVelocity.x = Mathf.MoveToward(MotionVelocity.x, 0, Speed);
motionVelocity.z = Mathf.MoveToward(MotionVelocity.z, 0, Speed);
velocity.x = Mathf.MoveToward(Velocity.x, 0, Speed);
velocity.z = Mathf.MoveToward(Velocity.z, 0, Speed);
}
MotionVelocity = motionVelocity;
Velocity = velocity;
MoveAndSlide();
}
}