Allow collider/portal spawning to be run separately.

src/map.rs

@@ -34,6 +34,26 @@ pub struct MapObstruction;
 #[reflect(Component)]
 pub struct Portal;
 
+#[derive(Clone, Debug, Deref, DerefMut, Reflect)]
+#[reflect(Component)]
+pub struct SpawnColliders(pub bool);
+
+impl Default for SpawnColliders {
+    fn default() -> Self {
+        Self(true)
+    }
+}
+
+#[derive(Clone, Debug, Deref, DerefMut, Reflect)]
+#[reflect(Component)]
+pub struct SpawnPortals(pub bool);
+
+impl Default for SpawnPortals {
+    fn default() -> Self {
+        Self(true)
+    }
+}
+
 pub trait ITileType {
     fn blocks_motion(&self) -> bool;
     fn blocks_visibility(&self) -> bool;
@@ -51,7 +71,6 @@ impl ITileType for Tile {
 
 #[derive(Clone, Debug)]
 pub struct MapConfig {
-    pub autospawn_portals: bool,
     pub describe_undescribed_areas: bool,
     pub speak_area_descriptions: bool,
     pub start_revealed: bool,
@@ -60,7 +79,6 @@ pub struct MapConfig {
 impl Default for MapConfig {
     fn default() -> Self {
         Self {
-            autospawn_portals: true,
             describe_undescribed_areas: false,
             speak_area_descriptions: true,
             start_revealed: false,
@@ -94,6 +112,8 @@ impl Default for PortalBundle {
 #[derive(Bundle, Clone, Default)]
 pub struct MapBundle {
     pub map: Map,
+    pub spawn_colliders: SpawnColliders,
+    pub spawn_portals: SpawnPortals,
     pub children: Children,
     pub transform: Transform,
     pub global_transform: GlobalTransform,
@@ -171,8 +191,13 @@ impl MapFilter for GridBuilder {
     }
 }
 
-fn add_map_colliders(mut commands: Commands, maps: Query<(Entity, &Map), Added<Map>>) {
+fn spawn_colliders(
-    for (map_entity, map) in maps.iter() {
+    mut commands: Commands,
+    maps: Query<(Entity, &Map, &SpawnColliders), Changed<SpawnColliders>>,
+) {
+    for (map_entity, map, spawn_colliders) in maps.iter() {
+        if **spawn_colliders {
+            commands.entity(map_entity).remove::<SpawnColliders>();
             commands.entity(map_entity).insert_bundle(RigidBodyBundle {
                 body_type: RigidBodyType::Static,
                 ..Default::default()
@@ -218,14 +243,15 @@ fn add_map_colliders(mut commands: Commands, maps: Query<(Entity, &Map), Added<M
             }
         }
     }
+}
 
-fn portal_spawner(
+fn spawn_portals(
     mut commands: Commands,
-    map: Query<(Entity, &Map), Added<RigidBodyColliders>>,
+    map: Query<(Entity, &Map, &SpawnPortals), Changed<SpawnPortals>>,
-    config: Res<MapConfig>,
 ) {
-    for (entity, map) in map.iter() {
+    for (entity, map, spawn_portals) in map.iter() {
-        if config.autospawn_portals {
+        if **spawn_portals {
+            commands.entity(entity).remove::<SpawnPortals>();
             let mut portals: Vec<(f32, f32)> = vec![];
             for x in 1..map.width {
                 for y in 1..map.height {
@@ -267,6 +293,23 @@ fn portal_spawner(
                         coordinates,
                         ..Default::default()
                     })
+                    .id();
+                commands.entity(entity).push_children(&[portal]);
+            }
+        }
+    }
+}
+
+fn spawn_portal_colliders(
+    mut commands: Commands,
+    map: Query<(Entity, &SpawnColliders), With<Map>>,
+    portals: Query<(Entity, &Coordinates), Without<ColliderShape>>,
+) {
+    for (map_entity, spawn_colliders) in map.iter() {
+        if **spawn_colliders {
+            for (portal_entity, coordinates) in portals.iter() {
+                commands
+                    .entity(portal_entity)
                     .insert_bundle(ColliderBundle {
                         collider_type: ColliderType::Sensor,
                         shape: ColliderShape::cuboid(0.5, 0.5),
@@ -275,11 +318,10 @@ fn portal_spawner(
                     })
                     .insert(ColliderPositionSync::Discrete)
                     .insert(ColliderParent {
-                        handle: entity.handle(),
+                        handle: map_entity.handle(),
-                        pos_wrt_parent: Vec2::new(x + 0.5, y + 0.5).into(),
+                        pos_wrt_parent: Vec2::new(coordinates.x() + 0.5, coordinates.y() + 0.5)
-                    })
+                            .into(),
-                    .id();
+                    });
-                commands.entity(entity).push_children(&[portal]);
             }
         }
     }
@@ -331,8 +373,9 @@ impl Plugin for MapPlugin {
         }
         let config = app.world().get_resource::<MapConfig>().unwrap().clone();
         app.register_type::<Portal>()
-            .add_system(add_map_colliders.system())
+            .add_system(spawn_colliders.system())
-            .add_system(portal_spawner.system());
+            .add_system(spawn_portals.system())
+            .add_system(spawn_portal_colliders.system());
         if config.speak_area_descriptions {
             app.add_system_to_stage(CoreStage::PostUpdate, area_description.system());
         }