feat: colliding entities component (jcornaz#216)

core/src/collisions.rs

@@ -0,0 +1,166 @@
+use bevy::{prelude::*, utils::HashSet};
+
+use crate::{CollisionEvent, RigidBody};
+
+/// Component which will be filled (if present) with a list of entities with which the current entity is currently in contact.
+#[derive(Component, Default, Reflect)]
+pub struct Collisions(HashSet<Entity>);
+
+impl Collisions {
+    /// Returns the number of colliding entities.
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Returns `true` if there is no colliding entities.
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Returns `true` if the collisions contains the specified entity.
+    #[must_use]
+    pub fn contains(&self, entity: &Entity) -> bool {
+        self.0.contains(entity)
+    }
+
+    /// An iterator visiting all colliding entities in arbitrary order.
+    pub fn iter(&self) -> impl Iterator<Item = Entity> + '_ {
+        self.0.iter().copied()
+    }
+}
+
+/// Adds entity to [`CollidingEntities`] on starting collision and removes from it when the
+/// collision end.
+pub(super) fn update_collisions_system(
+    mut collision_events: EventReader<'_, '_, CollisionEvent>,
+    mut collisions: Query<'_, '_, &mut Collisions>,
+) {
+    for event in collision_events.iter() {
+        let (entity1, entity2) = event.rigid_body_entities();
+        if event.is_started() {
+            if let Ok(mut entities) = collisions.get_mut(entity1) {
+                entities.0.insert(entity2);
+            }
+            if let Ok(mut entities) = collisions.get_mut(entity2) {
+                entities.0.insert(entity1);
+            }
+        } else {
+            if let Ok(mut entities) = collisions.get_mut(entity1) {
+                entities.0.remove(&entity2);
+            }
+            if let Ok(mut entities) = collisions.get_mut(entity2) {
+                entities.0.remove(&entity1);
+            }
+        }
+    }
+}
+
+/// Removes deleted entities from [`Collisions`] component because
+/// entity deletion doesn't emit [`CollisionEvent::Stopped`].
+/// It's an upstream [issue](https://github.com/dimforge/rapier/issues/299).
+pub(super) fn cleanup_collisions_system(
+    removed_rigid_bodies: RemovedComponents<'_, RigidBody>,
+    mut collisions: Query<'_, '_, &mut Collisions>,
+) {
+    for rigid_body in removed_rigid_bodies.iter() {
+        for mut colliding_entities in collisions.iter_mut() {
+            colliding_entities.0.remove(&rigid_body);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use bevy::app::Events;
+
+    use crate::{CollisionData, CollisionLayers};
+
+    use super::*;
+
+    #[test]
+    fn collisions_updates() {
+        let mut app = App::new();
+        app.add_event::<CollisionEvent>()
+            .add_system(update_collisions_system);
+
+        let entity1 = app.world.spawn().insert(Collisions::default()).id();
+        let entity2 = app.world.spawn().insert(Collisions::default()).id();
+
+        let collision_data1 =
+            CollisionData::new(entity1, Entity::from_raw(0), CollisionLayers::default(), []);
+        let collision_data2 =
+            CollisionData::new(entity2, Entity::from_raw(0), CollisionLayers::default(), []);
+        let mut collision_events = app
+            .world
+            .get_resource_mut::<Events<CollisionEvent>>()
+            .unwrap();
+        collision_events.send(CollisionEvent::Started(
+            collision_data1.clone(),
+            collision_data2.clone(),
+        ));
+
+        app.update();
+
+        let collisions1 = app.world.entity(entity1).get::<Collisions>().unwrap();
+        assert_eq!(collisions1.len(), 1, "There should be one colliding entity");
+        assert_eq!(
+            collisions1.iter().next().unwrap(),
+            entity2,
+            "Colliding entity should be equal to the second entity"
+        );
+
+        let collisions2 = app.world.entity(entity2).get::<Collisions>().unwrap();
+        assert_eq!(collisions2.len(), 1, "There should be one colliding entity");
+        assert_eq!(
+            collisions2.iter().next().unwrap(),
+            entity1,
+            "Colliding entity should be equal to the first entity"
+        );
+
+        let mut collision_events = app
+            .world
+            .get_resource_mut::<Events<CollisionEvent>>()
+            .unwrap();
+        collision_events.send(CollisionEvent::Stopped(collision_data1, collision_data2));
+
+        app.update();
+
+        let collisions1 = app.world.entity(entity1).get::<Collisions>().unwrap();
+        assert!(
+            collisions1.is_empty(),
+            "Colliding entity should be removed from the Collisions component when the collision ends"
+        );
+
+        let collisions2 = app.world.entity(entity2).get::<Collisions>().unwrap();
+        assert!(
+            collisions2.is_empty(),
+            "Colliding entity should be removed from the Collisions component when the collision ends"
+        );
+    }
+
+    #[test]
+    fn collisions_react_on_entity_removal() {
+        let mut app = App::new();
+        app.add_event::<CollisionEvent>()
+            .add_system(cleanup_collisions_system);
+
+        let removing_entity = app.world.spawn().insert(RigidBody::Static).id();
+        let mut collisions = Collisions::default();
+        collisions.0.insert(removing_entity);
+        let entity = app.world.spawn().insert(collisions).id();
+
+        app.update();
+
+        app.world.entity_mut(removing_entity).despawn();
+
+        app.update();
+
+        let collisions = app.world.entity(entity).get::<Collisions>().unwrap();
+        assert!(
+            collisions.is_empty(),
+            "Despawned entity should be removed from the Collisions component"
+        );
+    }
+}

core/src/lib.rs

@@ -12,6 +12,7 @@ use bevy::prelude::*;
 
 #[cfg(feature = "collision-from-mesh")]
 pub use collision_from_mesh::PendingConvexCollision;
+pub use collisions::Collisions;
 pub use constraints::RotationConstraints;
 pub use events::{CollisionData, CollisionEvent};
 pub use gravity::Gravity;
@@ -22,6 +23,7 @@ pub use velocity::{Acceleration, AxisAngle, Damping, Velocity};
 
 #[cfg(feature = "collision-from-mesh")]
 mod collision_from_mesh;
+mod collisions;
 mod constraints;
 mod events;
 mod gravity;
@@ -76,6 +78,9 @@ impl Plugin for CorePlugin {
             .register_type::<RotationConstraints>()
             .register_type::<CollisionLayers>()
             .register_type::<SensorShape>()
+            .register_type::<Collisions>()
+            .add_system(collisions::update_collisions_system)
+            .add_system_to_stage(CoreStage::PostUpdate, collisions::cleanup_collisions_system)
             .add_system_to_stage(CoreStage::First, PhysicsSteps::update)
             .add_stage_before(CoreStage::PostUpdate, crate::stage::ROOT, {
                 Schedule::default().with_stage(crate::stage::UPDATE, SystemStage::parallel())

src/lib.rs

@@ -146,9 +146,9 @@ pub mod prelude {
 
     #[allow(deprecated)]
     pub use crate::{
-        stage, Acceleration, AxisAngle, CollisionEvent, CollisionLayers, CollisionShape, Damping,
-        Gravity, PhysicMaterial, PhysicsLayer, PhysicsPlugin, PhysicsSystem, PhysicsTime,
-        RigidBody, RotationConstraints, Velocity,
+        stage, Acceleration, AxisAngle, CollisionEvent, CollisionLayers, CollisionShape,
+        Collisions, Damping, Gravity, PhysicMaterial, PhysicsLayer, PhysicsPlugin, PhysicsSystem,
+        PhysicsTime, RigidBody, RotationConstraints, Velocity,
     };
 }