Skip to content

Revert testbed's character controller Y being gravity dependent (from 822) #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebcrozet merged 1 commit into from
Jul 24, 2025
Merged

Revert testbed's character controller Y being gravity dependent (from 822) #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples2d/utils/character.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub fn update_character(
fn character_movement_from_inputs(
gfx: &TestbedGraphics,
mut speed: Real,
artificial_gravity: Option<Real>,
artificial_gravity: bool,
) -> Vector<Real> {
let mut desired_movement = Vector::zeros();

Expand All @@ -77,8 +77,8 @@ fn character_movement_from_inputs(

desired_movement *= speed;

if let Some(artificial_gravity) = artificial_gravity {
desired_movement += Vector::y() * artificial_gravity;
if artificial_gravity {
desired_movement -= Vector::y() * speed;
}

desired_movement
Expand All @@ -91,7 +91,7 @@ fn update_pid_controller(
pid: &mut PidController,
speed: Real,
) {
let desired_movement = character_movement_from_inputs(gfx, speed, None);
let desired_movement = character_movement_from_inputs(gfx, speed, false);

let character_body = &mut phx.bodies[character_handle];

Expand Down Expand Up @@ -129,7 +129,7 @@ fn update_kinematic_controller(
controller: &KinematicCharacterController,
speed: Real,
) {
let desired_movement = character_movement_from_inputs(gfx, speed, Some(phx.gravity.y));
let desired_movement = character_movement_from_inputs(gfx, speed, true);

let character_body = &phx.bodies[character_handle];
let character_collider = &phx.colliders[character_body.colliders()[0]];
Expand Down
10 changes: 5 additions & 5 deletions examples3d/utils/character.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub fn update_character(
fn character_movement_from_inputs(
gfx: &TestbedGraphics,
mut speed: Real,
artificial_gravity: Option<f32>,
artificial_gravity: bool,
) -> Vector<Real> {
let mut desired_movement = Vector::zeros();

Expand Down Expand Up @@ -88,8 +88,8 @@ fn character_movement_from_inputs(

desired_movement *= speed;

if let Some(artificial_gravity) = artificial_gravity {
desired_movement += Vector::y() * artificial_gravity;
if artificial_gravity {
desired_movement -= Vector::y() * speed;
}

desired_movement
Expand All @@ -102,7 +102,7 @@ fn update_pid_controller(
pid: &mut PidController,
speed: Real,
) {
let desired_movement = character_movement_from_inputs(gfx, speed, None);
let desired_movement = character_movement_from_inputs(gfx, speed, false);
let character_body = &mut phx.bodies[character_handle];

// Adjust the controlled axis depending on the keys pressed by the user.
Expand Down Expand Up @@ -139,7 +139,7 @@ fn update_kinematic_controller(
controller: &KinematicCharacterController,
speed: Real,
) {
let desired_movement = character_movement_from_inputs(gfx, speed, Some(phx.gravity.y));
let desired_movement = character_movement_from_inputs(gfx, speed, true);

let character_body = &phx.bodies[character_handle];
let character_collider = &phx.colliders[character_body.colliders()[0]];
Expand Down