From 488037d074cabf854f77328f620b88830c4aacf3 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Wed, 19 Jan 2022 18:37:04 -0600
Subject: [PATCH] Simplify some conversions.

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

diff --git a/src/map.rs b/src/map.rs
index db9d1e5..bf8188c 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -227,7 +227,7 @@ fn spawn_colliders(
                         if tile.blocks_motion() {
                             let id = commands
                                 .spawn_bundle(ColliderBundle {
-                                    shape: ColliderShapeComponent(ColliderShape::cuboid(0.5, 0.5)),
+                                    shape: ColliderShape::cuboid(0.5, 0.5).into(),
                                     position: Vec2::new(x as f32 + 0.5, y as f32 + 0.5).into(),
                                     ..Default::default()
                                 })
@@ -322,10 +322,7 @@ fn spawn_colliders(
                             );*/
                             let id = commands
                                 .spawn_bundle(ColliderBundle {
-                                    shape: ColliderShapeComponent(ColliderShape::cuboid(
-                                        half_width,
-                                        half_height,
-                                    )),
+                                    shape: ColliderShape::cuboid(half_width, half_height).into(),
                                     position: Vec2::new(x, y).into(),
                                     ..Default::default()
                                 })
@@ -349,8 +346,8 @@ fn spawn_colliders(
                 let aabb = shape.compute_aabb(&position);
                 let id = commands
                     .spawn_bundle(ColliderBundle {
-                        collider_type: ColliderTypeComponent(ColliderType::Sensor),
-                        shape: ColliderShapeComponent(shape.clone()),
+                        collider_type: ColliderType::Sensor.into(),
+                        shape: shape.clone().into(),
                         flags: ActiveEvents::INTERSECTION_EVENTS.into(),
                         position,
                         ..Default::default()
@@ -431,7 +428,7 @@ fn spawn_portal_colliders(
                     .entity(portal_entity)
                     .insert_bundle(ColliderBundle {
                         collider_type: ColliderTypeComponent(ColliderType::Sensor),
-                        shape: ColliderShapeComponent(ColliderShape::cuboid(0.5, 0.5)),
+                        shape: ColliderShape::cuboid(0.5, 0.5).into(),
                         position,
                         flags: ActiveEvents::INTERSECTION_EVENTS.into(),
                         ..Default::default()