sim manager refactor

1 files changed, 14 insertions, 5 deletions

diff --git a/src/renderer/ui.rs b/src/renderer/ui.rs
index c4f7585..4c6d61c 100644
--- a/src/renderer/ui.rs
+++ b/src/renderer/ui.rs
@@ -2,7 +2,10 @@ use egui::{Color32, Stroke, Ui, epaint::CircleShape};
 
 use crate::{
     Camera, Config, Diagnostics, Input,
-    sim::{cell::materials::MaterialId, cell_sim::world::World, rb_sim::DebugRenderMode},
+    sim::{
+        cell::materials::MaterialId, cell_manager::manager::CellManager,
+        rb_manager::DebugRenderMode, sim_manager::SimManager,
+    },
 };
 
 const DEBUG_RENDER_MODES: [(&str, DebugRenderMode); 6] = [
@@ -20,7 +23,7 @@ pub fn draw_egui<'a>(
     camera: &mut Camera,
     diagnostics: &Diagnostics,
     input: &Input,
-    world: &World,
+    sim: &SimManager,
 ) {
     puffin::profile_function!();
     ui.heading("Config");
@@ -109,8 +112,11 @@ pub fn draw_egui<'a>(
 
     if let Some(p) = input.last_mouse_chunk_pos {
         ui.label(format!("Mouse (chunk): x,y=({x}, {y})", x = p.0, y = p.1,));
-        if let Some(&chunk) = world.chunk_position_to_chunk_idx.get(&p) {
-            ui.label(format!("Sleeping={}", world.chunks[chunk].sleeping));
+        if let Some(&chunk) = sim.cell_manager.chunk_position_to_chunk_idx.get(&p) {
+            ui.label(format!(
+                "Sleeping={}",
+                sim.cell_manager.chunks[chunk].sleeping
+            ));
         }
     }
 
@@ -120,7 +126,10 @@ pub fn draw_egui<'a>(
 
     if let Some((x, y)) = input.last_mouse_world_pos {
         ui.heading("Entity");
-        if let Some(cell) = world.get_cell_from_game_position(x.round() as i32, y.round() as i32) {
+        if let Some(cell) = sim
+            .cell_manager
+            .get_cell_from_game_position(x.round() as i32, y.round() as i32)
+        {
             let material = cell.material.def();
             let cell_label = ui.label(
                 egui::RichText::new(format!("Cell: {}", material.name)).color(Color32::LIGHT_BLUE),