From 0904924622cf73e4660c1261d01a367981833f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Lescaudey=20de=20Maneville?=
 <felix.maneville@gmail.com>
Date: Thu, 11 Jul 2024 12:53:01 +0200
Subject: [PATCH] Cleanup

---
 src/components/cloth.rs         | 1 +
 src/components/mod.rs           | 2 +-
 src/lib.rs                      | 2 +-
 src/systems/collisions/avian.rs | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/cloth.rs b/src/components/cloth.rs
index 8876fa1..c128222 100644
--- a/src/components/cloth.rs
+++ b/src/components/cloth.rs
@@ -316,6 +316,7 @@ impl Cloth {
 }
 
 #[cfg(test)]
+#[allow(clippy::unwrap_used)]
 mod tests {
     use super::*;
     use crate::mesh::rectangle_mesh;
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 26af891..e0383d6 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -5,5 +5,5 @@ pub mod cloth_builder;
 /// cloth rendering module
 pub mod cloth_rendering;
 /// collider module
-#[cfg(any(feature = "rapier_collisions", feature = "xpbd_collisions"))]
+#[cfg(any(feature = "rapier_collisions", feature = "avian_collisions"))]
 pub mod collider;
diff --git a/src/lib.rs b/src/lib.rs
index bf607b6..18e7851 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -345,7 +345,7 @@ use bevy::prelude::*;
 
 /// Prelude module, providing every public type of the lib
 pub mod prelude {
-    #[cfg(any(feature = "rapier_collisions", feature = "xpbd_collisions"))]
+    #[cfg(any(feature = "rapier_collisions", feature = "avian_collisions"))]
     pub use crate::components::collider::ClothCollider;
     pub use crate::{
         components::{cloth_builder::ClothBuilder, cloth_rendering::NormalComputing},
diff --git a/src/systems/collisions/avian.rs b/src/systems/collisions/avian.rs
index 84367d3..ff146b9 100644
--- a/src/systems/collisions/avian.rs
+++ b/src/systems/collisions/avian.rs
@@ -32,7 +32,7 @@ pub fn handle_collisions(
     time: Res<Time>,
 ) {
     let delta_time = time.delta_seconds();
-    for (entity, mut cloth, aabb, collider, mut xpbd_collider) in &mut cloth_query {
+    for (entity, mut cloth, aabb, collider, mut avian_collider) in &mut cloth_query {
         for contact_pair in collisions.collisions_with_entity(entity) {
             let other_entity = if contact_pair.entity1 == entity {
                 contact_pair.entity2
@@ -54,7 +54,7 @@ pub fn handle_collisions(
             });
             cloth.solve_collisions(|point| {
                 let other_transform = other_transform.compute_transform();
-                // TODO: Remove Nalgebra type conversions once bevy_xpbd has
+                // TODO: Remove Nalgebra type conversions once avian has
                 //       a `Collider::project_point` method that uses Glam.
                 let projection = other_collider.shape_scaled().project_point(
                     &avian3d::parry::math::Isometry::new(
@@ -88,7 +88,7 @@ pub fn handle_collisions(
                 ang_vel.0 *= damp;
             }
         }
-        *xpbd_collider = get_collider(aabb, collider);
+        *avian_collider = get_collider(aabb, collider);
     }
 }