refactor entities

1 files changed, 15 insertions, 13 deletions

diff --git a/src/sim/sim_manager/utils.rs b/src/sim/sim_manager/utils.rs
index b636186..1565ced 100644
--- a/src/sim/sim_manager/utils.rs
+++ b/src/sim/sim_manager/utils.rs
@@ -1,28 +1,30 @@
+use glam::IVec2;
+
 use crate::sim::{cell::materials::MaterialId, sim_manager::SimManager};
 
-pub fn write_rb_entity_to_world(
+pub fn write_entity_to_world(
     sim: &mut SimManager,
-    rb_entity_id: u32,
+    entity_id: u32,
     // make sure these cells will be simulated
     seqno: u64,
     // (entity_x, entity_y, cell_x, cell_y)
 ) -> Vec<(u8, u8, i32, i32)> {
     let mut cells_written: Vec<(u8, u8, i32, i32)> = Vec::new();
-    if let Some(rb_entity) = sim.rb_manager.rb_entities.get(&rb_entity_id)
-        && let Some((rb_x, rb_y, cos, sin)) = sim.rb_manager.get_rb_entity_transform(rb_entity_id)
+    if let Some(entity) = sim.entities.get(&entity_id)
+        && let Some(cells) = &entity.cells
+        && let Some((pos, (cos, sin))) = entity.transform(sim)
     {
-        let (half_size_x, half_size_y) =
-            (rb_entity.width as f32 / 2.0, rb_entity.height as f32 / 2.0);
+        let (half_size_x, half_size_y) = (cells.size.x as f32 / 2.0, cells.size.y as f32 / 2.0);
         // half-extent of the rotated grid's axis-aligned bounding box, plus a cell of margin
         let (radius_x, radius_y) = (
             half_size_x * (cos.abs() + sin.abs()) + 1.0,
             half_size_y * (cos.abs() + sin.abs()) + 1.0,
         );
 
-        let world_xl = (rb_x - radius_x).floor() as i32;
-        let world_xu = (rb_x + radius_x).ceil() as i32;
-        let world_yl = (rb_y - radius_y).floor() as i32;
-        let world_yu = (rb_y + radius_y).ceil() as i32;
+        let world_xl = (pos.x - radius_x).floor() as i32;
+        let world_xu = (pos.x + radius_x).ceil() as i32;
+        let world_yl = (pos.y - radius_y).floor() as i32;
+        let world_yu = (pos.y + radius_y).ceil() as i32;
 
         for world_x in world_xl..=world_xu {
             for world_y in world_yl..=world_yu {
@@ -32,18 +34,18 @@ pub fn write_rb_entity_to_world(
                     && cur_world_cell.material == MaterialId::Void
                 {
                     // same as shader
-                    let d = (world_x as f32 + 0.5 - rb_x, world_y as f32 + 0.5 - rb_y);
+                    let d = (world_x as f32 + 0.5 - pos.x, world_y as f32 + 0.5 - pos.y);
                     let q = (d.0.floor() + 0.5, d.1.floor() + 0.5);
                     let (lx, ly) = (
                         (q.0 * cos + q.1 * sin + half_size_x).floor() as i32,
                         (-q.0 * sin + q.1 * cos + half_size_y).floor() as i32,
                     );
 
-                    if lx < 0 || ly < 0 || lx >= rb_entity.width || ly >= rb_entity.height {
+                    if lx < 0 || ly < 0 || lx >= cells.size.x || ly >= cells.size.y {
                         continue;
                     }
 
-                    let mut cell = rb_entity.get_cell_at_local_position(lx as u8, ly as u8);
+                    let mut cell = cells.get_cell_at_local_position(IVec2::new(lx, ly));
                     if cell.material == MaterialId::Void {
                         continue;
                     }