From e09b7d25370a7f25bbdb88ce4d9675b07f1231b5 Mon Sep 17 00:00:00 2001
From: Mitchell M <mitchoah@gmail.com>
Date: Mon, 2 Feb 2026 15:21:36 -0600
Subject: [PATCH] update movement

---
 assets/player.png | Bin 2114 -> 34 bytes
 src/avian.rs      | 134 ++--------------------------------------------
 src/main.rs       |  19 ++-----
 3 files changed, 8 insertions(+), 145 deletions(-)
 mode change 100644 => 120000 assets/player.png

diff --git a/assets/player.png b/assets/player.png
deleted file mode 100644
index 97557cd2f580fcf0aa5f4be7bea511fffa3241df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2114
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

diff --git a/assets/player.png b/assets/player.png
new file mode 120000
index 0000000..e413cde
--- /dev/null
+++ b/assets/player.png
@@ -0,0 +1 @@
+/home/mitchell/Pictures/player.png
\ No newline at end of file
diff --git a/src/avian.rs b/src/avian.rs
index 2992c45..90b879c 100644
--- a/src/avian.rs
+++ b/src/avian.rs
@@ -6,15 +6,7 @@ pub struct CharacterControllerPlugin;
 impl Plugin for CharacterControllerPlugin {
     fn build(&self, app: &mut App) {
         app.add_message::<MovementAction>()
-            .add_systems(Update, ((keyboard_input, gamepad_input), movement).chain())
-            .add_systems(
-                // Run collision handling after collision detection.
-                //
-                // NOTE: The collision implementation here is very basic and a bit buggy.
-                //       A collide-and-slide algorithm would likely work better.
-                PhysicsSchedule,
-                kinematic_controller_collisions.in_set(NarrowPhaseSystems::Last),
-            );
+            .add_systems(Update, ((keyboard_input, gamepad_input), movement).chain());
     }
 }
 
@@ -51,8 +43,8 @@ impl CharacterControllerBundle {
             character_controller: CharacterController,
             body: RigidBody::Kinematic,
             collider,
-            speed: MaxSpeed(100.),
-            acceleration: MaxAcceleration(1000.),
+            speed: MaxSpeed(300.),
+            acceleration: MaxAcceleration(5000.),
         }
     }
 }
@@ -109,6 +101,7 @@ fn movement(
 
     for (max_speed, max_acceleration, mut linear_velocity) in &mut controllers {
         while movement_reader.len() > 1 {
+            warn!("Extra movement message. Ignoring");
             movement_reader.read();
         }
 
@@ -128,122 +121,3 @@ fn movement(
         **linear_velocity += delta;
     }
 }
-
-/// Kinematic bodies do not get pushed by collisions by default,
-/// so it needs to be done manually.
-///
-/// This system handles collision response for kinematic character controllers
-/// by pushing them along their contact normals by the current penetration depth,
-/// and applying velocity corrections in order to snap to slopes, slide along walls,
-/// and predict collisions using speculative contacts.
-#[allow(clippy::type_complexity)]
-fn kinematic_controller_collisions(
-    collisions: Collisions,
-    bodies: Query<&RigidBody>,
-    collider_rbs: Query<&ColliderOf, Without<Sensor>>,
-    mut character_controllers: Query<
-        (&mut Position, &mut LinearVelocity),
-        (With<RigidBody>, With<CharacterController>),
-    >,
-    time: Res<Time>,
-) {
-    // Iterate through collisions and move the kinematic body to resolve penetration
-    for contacts in collisions.iter() {
-        // Get the rigid body entities of the colliders (colliders could be children)
-        let Ok([&ColliderOf { body: rb1 }, &ColliderOf { body: rb2 }]) =
-            collider_rbs.get_many([contacts.collider1, contacts.collider2])
-        else {
-            continue;
-        };
-
-        // Get the body of the character controller and whether it is the first
-        // or second entity in the collision.
-        let is_first: bool;
-
-        let character_rb: RigidBody;
-        let is_other_dynamic: bool;
-
-        let (mut position, mut linear_velocity) =
-            if let Ok(character) = character_controllers.get_mut(rb1) {
-                is_first = true;
-                character_rb = *bodies.get(rb1).unwrap();
-                is_other_dynamic = bodies.get(rb2).is_ok_and(|rb| rb.is_dynamic());
-                character
-            } else if let Ok(character) = character_controllers.get_mut(rb2) {
-                is_first = false;
-                character_rb = *bodies.get(rb2).unwrap();
-                is_other_dynamic = bodies.get(rb1).is_ok_and(|rb| rb.is_dynamic());
-                character
-            } else {
-                continue;
-            };
-
-        // This system only handles collision response for kinematic character controllers.
-        if !character_rb.is_kinematic() {
-            continue;
-        }
-
-        // Iterate through contact manifolds and their contacts.
-        // Each contact in a single manifold shares the same contact normal.
-        for manifold in contacts.manifolds.iter() {
-            let normal = if is_first {
-                -manifold.normal
-            } else {
-                manifold.normal
-            };
-
-            let mut deepest_penetration: Scalar = Scalar::MIN;
-
-            // Solve each penetrating contact in the manifold.
-            for contact in manifold.points.iter() {
-                if contact.penetration > 0.0 {
-                    position.0 += normal * contact.penetration;
-                }
-                deepest_penetration = deepest_penetration.max(contact.penetration);
-            }
-
-            // For now, this system only handles velocity corrections for collisions against static geometry.
-            if is_other_dynamic {
-                continue;
-            }
-
-            if deepest_penetration > 0.0 {
-                // The character is intersecting an unclimbable object, like a wall.
-                // We want the character to slide along the surface, similarly to
-                // a collide-and-slide algorithm.
-
-                // Don't apply an impulse if the character is moving away from the surface.
-                if linear_velocity.dot(normal) > 0.0 {
-                    continue;
-                }
-
-                // Slide along the surface, rejecting the velocity along the contact normal.
-                let impulse = linear_velocity.reject_from_normalized(normal);
-                linear_velocity.0 = impulse;
-            } else {
-                // The character is not yet intersecting the other object,
-                // but the narrow phase detected a speculative collision.
-                //
-                // We need to push back the part of the velocity
-                // that would cause penetration within the next frame.
-
-                let normal_speed = linear_velocity.dot(normal);
-
-                // Don't apply an impulse if the character is moving away from the surface.
-                if normal_speed > 0.0 {
-                    continue;
-                }
-
-                // Compute the impulse to apply.
-                let impulse_magnitude =
-                    normal_speed - (deepest_penetration / time.delta_secs_f64().adjust_precision());
-                let mut impulse = impulse_magnitude * normal;
-
-                // Apply the impulse differently depending on the slope angle.
-                // Avoid climbing up walls.
-                impulse.y = impulse.y.max(0.0);
-                linear_velocity.0 -= impulse;
-            }
-        }
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 4b76ac6..cb2cb93 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,12 +23,7 @@ fn main() {
         .run();
 }
 
-fn setup(
-    mut commands: Commands,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    asset_server: Res<AssetServer>,
-) {
+fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     let mut projection = OrthographicProjection::default_2d();
     projection.scaling_mode = ScalingMode::AutoMin {
         min_width: 1920.,
@@ -38,10 +33,9 @@ fn setup(
 
     // player
     commands.spawn((
-        Mesh2d(meshes.add(Capsule2d::new(12.5, 20.0))),
-        MeshMaterial2d(materials.add(Color::srgb(0.2, 0.7, 0.9))),
-        Transform::from_xyz(0.0, -100.0, 0.0),
-        CharacterControllerBundle::new(Collider::capsule(12.5, 20.0)),
+        Sprite::from_image(asset_server.load("player.png")),
+        Transform::from_xyz(0.0, 0.0, 0.0),
+        CharacterControllerBundle::new(Collider::capsule(15., 27.5)),
     ));
 
     // A cube to move around
@@ -55,11 +49,6 @@ fn setup(
         RigidBody::Dynamic,
         Collider::rectangle(30.0, 30.0),
     ));
-
-    commands.spawn((
-        Sprite::from_image(asset_server.load("player.png")),
-        Transform::from_xyz(0., 0., 0.),
-    ));
 }
 
 fn debug_border(mut gizmos: Gizmos) {