From cb02e39870b0e1e9ef81eb8a85f7211415dd324c Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Mon, 10 Jan 2022 13:55:42 -0600
Subject: [PATCH] Include area AABB in component.

---
 src/map.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/map.rs b/src/map.rs
index fb914a6..011f520 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -22,9 +22,9 @@ impl From<mapgen::geometry::Point> for Coordinates {
     }
 }
 
-#[derive(Component, Clone, Debug, Default, Reflect)]
+#[derive(Component, Clone, Debug, Default, Deref, DerefMut, Reflect)]
 #[reflect(Component)]
-pub struct Area;
+pub struct Area(AABB);
 
 #[derive(Component, Clone, Debug, Default, Deref, DerefMut, Reflect)]
 #[reflect(Component)]
@@ -354,8 +354,7 @@ fn spawn_colliders(
                         position,
                         ..Default::default()
                     })
-                    .insert(aabb)
-                    .insert(Area)
+                    .insert(Area(aabb))
                     .id();
                 commands.entity(map_entity).push_children(&[id]);
             }
@@ -445,7 +444,7 @@ fn spawn_portal_colliders(
 
 fn area_description(
     mut events: EventReader<IntersectionEvent>,
-    areas: Query<(&AABB, Option<&Name>), With<Area>>,
+    areas: Query<(&Area, Option<&Name>)>,
     players: Query<&Player>,
     config: Res<MapConfig>,
     mut log: Query<&mut Log>,