Refactor collider component

Author: CuddlyBunion341

src/client/collider/components.rs

@@ -2,5 +2,5 @@ use crate::prelude::*;
 
 #[derive(Component)]
 pub struct MyCollider {
-    pub key: u32,
+    pub relative_position: Vec3,
 }

src/client/collider/systems.rs

@@ -9,14 +9,13 @@ pub fn setup_coliders_system(mut commands: Commands) {
     for x in collider_range.clone() {
         for y in collider_range.clone() {
             for z in collider_range.clone() {
-                let key = x * COLLIDER_GRID_SIZE * COLLIDER_GRID_SIZE + y * COLLIDER_GRID_SIZE + z;
                 commands
                     .spawn(Collider::cuboid(0.5, 0.5, 0.5))
                     .insert(TransformBundle::from(Transform::from_xyz(
-                        x as f32, y as f32, z as f32,
+                                x as f32, y as f32, z as f32,
                     )))
-                    .insert(collider_components::MyCollider { key });
-            }
+                    .insert(collider_components::MyCollider { relative_position: Vec3 {x: x as f32, y: y as f32, z: z as f32} });
+                }
         }
     }
 }
@@ -30,7 +29,7 @@ pub fn handle_collider_update_events_system(
         let event_position =
             Vec3::new(event.grid_center_position[0], event.grid_center_position[1], event.grid_center_position[2]).floor();
         for (mut transform, collider) in query.iter_mut() {
-            let relative_position = relative_colider_position(collider.key);
+            let relative_position = collider.relative_position;
             let collider_position = (event_position + relative_position).floor();
             let block = chunk_manager.get_block(collider_position);
 
@@ -50,18 +49,6 @@ pub fn handle_collider_update_events_system(
     }
 }
 
-fn relative_colider_position(key: u32) -> Vec3 {
-    let x = key / (COLLIDER_GRID_SIZE * COLLIDER_GRID_SIZE);
-    let y = (key % (COLLIDER_GRID_SIZE * COLLIDER_GRID_SIZE)) / COLLIDER_GRID_SIZE;
-    let z = key % COLLIDER_GRID_SIZE;
-
-    Vec3 {
-        x: x as f32 - (COLLIDER_GRID_SIZE / 2) as f32,
-        y: y as f32 - (COLLIDER_GRID_SIZE / 2) as f32,
-        z: z as f32 - (COLLIDER_GRID_SIZE / 2) as f32,
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use collider_events::ColliderUpdateEvent;
@@ -95,15 +82,15 @@ mod tests {
         app.insert_resource(terrain_resources::ChunkManager::new());
 
         app.world.spawn((
-            Transform {
-                translation: Vec3 {
-                    x: 0.0,
-                    y: 0.0,
-                    z: 0.0,
+                Transform {
+                    translation: Vec3 {
+                        x: 0.0,
+                        y: 0.0,
+                        z: 0.0,
+                    },
+                    ..Default::default()
                 },
-                ..Default::default()
-            },
-            collider_components::MyCollider { key: 0 },
+                collider_components::MyCollider { relative_position: Vec3 {x: 1.0, y: 2.0, z: 3.0}},
         ));
 
         let block = BlockId::Dirt;
@@ -122,15 +109,15 @@ mod tests {
         resource.insert_chunks(chunks);
         resource.set_block(
             Vec3 {
-                x: 9.0,
-                y: 9.0,
-                z: 9.0,
+                x: 6.0,
+                y: 7.0,
+                z: 8.0,
             },
             block,
         );
 
         app.world.send_event(ColliderUpdateEvent {
-            grid_center_position: [10.0, 10.0, 10.0],
+            grid_center_position: [5.0, 5.0, 5.0],
         });
 
         app.update();
@@ -141,9 +128,9 @@ mod tests {
         let (collider_transform, _) = collider_query.single(&app.world);
         assert_eq!(
             Vec3 {
-                x: 9.5,
-                y: 9.5,
-                z: 9.5
+                x: 6.5,
+                y: 7.5,
+                z: 8.5
             },
             collider_transform.translation
         );

src/client/player/systems/controller.rs

@@ -68,7 +68,7 @@ pub fn handle_controller_movement_system(
         let controller_position = transform.translation;
         if last_position.0.floor() != controller_position.floor() {
             collider_events.send(collider_events::ColliderUpdateEvent {
-                position: controller_position.into(),
+                grid_center_position: controller_position.into(),
             });
         }
         last_position.0 = controller_position;

src/client/player/systems/keyboard.rs

@@ -10,7 +10,7 @@ pub fn handle_keyboard_events_system(
             let controller_transform = camera_query.single();
             println!("Handling event: {:?}", controller_transform.translation);
             collider_events.send(collider_events::ColliderUpdateEvent {
-                position: controller_transform.translation.into(),
+                grid_center_position: controller_transform.translation.into(),
             });
         }
     }

src/client/player/systems/terrain.rs

@@ -43,7 +43,7 @@ pub fn handle_player_collider_events_system(
         let player_position = transform.translation.floor();
 
         collider_events.send(collider_events::ColliderUpdateEvent {
-            position: player_position.into(),
+            grid_center_position: player_position.into(),
         });
     }
 }