From 08e6c4779a523294e1b7b19d9f57d3220b980233 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Mon, 7 Jun 2021 12:43:20 -0500
Subject: [PATCH] Use colliders for portals, and other cleanup.

---
 src/map.rs        | 35 +++++++++++++++++++++--------------
 src/navigation.rs |  3 +--
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/map.rs b/src/map.rs
index ff3fa07..e226580 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -22,9 +22,9 @@ impl From<mapgen::geometry::Point> for Coordinates {
 #[derive(Clone, Debug, Default, Deref, DerefMut)]
 pub struct Areas(pub Vec<Area>);
 
-#[derive(Clone, Debug, Default, Deref, DerefMut, Reflect)]
+#[derive(Clone, Debug, Default, Reflect)]
 #[reflect(Component)]
-pub struct Portal(Vec<(i32, i32)>);
+pub struct Portal;
 
 #[derive(Clone, Default)]
 pub struct Map {
@@ -218,18 +218,16 @@ fn add_map_colliders(mut commands: Commands, maps: Query<(Entity, &Map), Added<M
             for y in 0..map.height() {
                 let tile = map.base.at(x, y);
                 if tile.blocks_motion() {
-                    let collider = ColliderBundle {
-                        shape: ColliderShape::cuboid(0.5, 0.5),
-                        ..Default::default()
-                    };
-                    let collider_parent = ColliderParent {
-                        handle: rigid_body_entity.handle(),
-                        pos_wrt_parent: Vec2::new(x as f32 + 0.5, y as f32 + 0.5).into(),
-                    };
                     let id = commands
                         .spawn()
-                        .insert_bundle(collider)
-                        .insert(collider_parent)
+                        .insert_bundle(ColliderBundle {
+                            shape: ColliderShape::cuboid(0.5, 0.5),
+                            ..Default::default()
+                        })
+                        .insert(ColliderParent {
+                            handle: rigid_body_entity.handle(),
+                            pos_wrt_parent: Vec2::new(x as f32 + 0.5, y as f32 + 0.5).into(),
+                        })
                         .id();
                     if tile.blocks_visibility() {
                         commands.entity(id).insert(BlocksVisibility);
@@ -291,10 +289,19 @@ fn portal_spawner(
                     .spawn()
                     .insert_bundle(PortalBundle {
                         coordinates,
-                        portal: Portal(vec![coordinates.i32()]),
-                        transform: Transform::from_translation(Vec3::new(x, y, 0.)),
                         ..Default::default()
                     })
+                    .insert_bundle(ColliderBundle {
+                        collider_type: ColliderType::Sensor,
+                        shape: ColliderShape::cuboid(0.5, 0.5),
+                        flags: ActiveEvents::INTERSECTION_EVENTS.into(),
+                        ..Default::default()
+                    })
+                    .insert(ColliderPositionSync::Discrete)
+                    .insert(ColliderParent {
+                        handle: entity.handle(),
+                        pos_wrt_parent: Vec2::new(x + 0.5, y + 0.5).into(),
+                    })
                     .id();
                 commands.entity(entity).push_children(&[portal]);
             }
diff --git a/src/navigation.rs b/src/navigation.rs
index 5d1ff80..dd87998 100644
--- a/src/navigation.rs
+++ b/src/navigation.rs
@@ -7,10 +7,9 @@ use bevy_tts::Tts;
 use derive_more::{Deref, DerefMut};
 
 use crate::{
-    core::{Angle, CardinalDirection, Player, PointLike},
+    core::{Angle, CardinalDirection, Player},
     error::error_handler,
     exploration::{ExplorationFocused, Exploring},
-    map::{ITileType, Map},
     pathfinding::Destination,
 };