Drop rapier3d in favour of avian3d

Author: cb341

Cargo.lock

@@ -13,8 +13,8 @@ bevy_asset = "0.17.3"
 bevy_camera = "0.17.3"
 bevy_mesh = "0.17.3"
 bevy_dev_tools = "0.17.3"
-bevy_fps_controller = {version = "17.1.0", features = ["rapier"]}
-bevy_rapier3d = {version ="0.32"}
+bevy_fps_controller = {version = "17.1.0", features = ["avian"]}
+avian3d = {version="0.4", features = ["debug-plugin"]}
 bevy_flair = "0.6.0"
 bevy_egui = { version = "0.38.1", features = ["immutable_ctx"]}
 bevy_diagnostic = "0.17.3"

Cargo.toml

@@ -4,6 +4,7 @@ pub mod resources;
 pub mod systems;
 
 use crate::prelude::*;
+use avian3d::PhysicsPlugins;
 
 pub struct PlayerPlugin;
 
@@ -12,9 +13,9 @@ impl Plugin for PlayerPlugin {
         debug!("Building PlayerPlugin");
         info!("Building PlayerPlugin");
         app.add_plugins(FpsControllerPlugin);
-        app.add_plugins(RapierPhysicsPlugin::<NoUserData>::default());
+        app.add_plugins(PhysicsPlugins::default());
         #[cfg(feature = "physics_debug")]
-        app.add_plugins(RapierDebugRenderPlugin::default());
+        app.add_plugins(PhysicsDebugPlugin::default());
         app.add_message::<player_events::PlayerColliderUpdateEvent>();
         app.insert_resource(player_resources::BlockSelection::new());
         app.insert_resource(player_resources::PlayerSpawned(false));

src/client/player/mod.rs

@@ -36,26 +36,24 @@ pub fn setup_controller_on_area_ready_system(
 
     let logical_entity = commands
         .spawn((
-            Collider::capsule(Vec3::Y * 0.5, Vec3::Y * 1.5, 0.5),
+            Collider::cylinder(0.5, 1.5),
             Friction {
-                coefficient: 0.0,
-                combine_rule: CoefficientCombineRule::Min,
+                dynamic_coefficient: 0.0,
+                static_coefficient: 0.0,
+                combine_rule: CoefficientCombine::Min,
             },
             Restitution {
                 coefficient: 0.0,
-                combine_rule: CoefficientCombineRule::Min,
+                combine_rule: CoefficientCombine::Min,
             },
-            ActiveEvents::COLLISION_EVENTS,
-            Velocity::zero(),
+            LinearVelocity::ZERO,
             #[cfg(feature = "lock_player")]
-            RigidBody::Fixed,
+            RigidBody::Static,
             #[cfg(not(feature = "lock_player"))]
             RigidBody::Dynamic,
-            Sleeping::disabled(),
             LockedAxes::ROTATION_LOCKED,
-            AdditionalMassProperties::Mass(1.0),
+            Mass(1.0),
             GravityScale(0.0),
-            Ccd { enabled: true },
             Transform::from_translation(spawn_position),
             LogicalPlayer,
             #[cfg(not(feature = "lock_player"))]

src/client/player/systems/controller.rs

@@ -14,12 +14,9 @@ pub use bevy::prelude::*;
 pub use bevy::transform::components::Transform;
 pub use bevy::window::*;
 
+pub use avian3d::prelude::*;
 pub use bevy_fps_controller::controller::*;
 
-pub use bevy_rapier3d::geometry::Collider;
-pub use bevy_rapier3d::{dynamics::*, geometry::*};
-pub use bevy_rapier3d::{plugin::*, render::RapierDebugRenderPlugin};
-
 // networking crates
 pub use renet::{ClientId, ConnectionConfig, DefaultChannel, RenetClient};