refactor out content

22 files changed, 47 insertions, 42 deletions

diff --git a/src/sim/entity/entities/entity_cube.rs b/src/content/entities/entity_cube.rs
index 2c79aa5..ab93e5e 100644
--- a/src/sim/entity/entities/entity_cube.rs
+++ b/src/content/entities/entity_cube.rs
@@ -1,8 +1,11 @@
 use glam::{IVec2, Vec2};
 
-use crate::sim::{
-    cell::{cell::Cell, materials::MaterialId},
-    entity::{EntityCells, EntityDef},
+use crate::{
+    content::materials::MaterialId,
+    sim::{
+        cell::cell::Cell,
+        entity::{EntityCells, EntityDef},
+    },
 };
 
 pub fn entity_cube_def(position: Vec2, material: MaterialId) -> EntityDef {
diff --git a/src/sim/entity/entities/entity_grenade.rs b/src/content/entities/entity_grenade.rs
index 952fb14..ab7aaa4 100644
--- a/src/sim/entity/entities/entity_grenade.rs
+++ b/src/content/entities/entity_grenade.rs
@@ -1,9 +1,13 @@
 use glam::{IVec2, Vec2};
 
-use crate::sim::{
-    cell::{cell::Cell, materials::MaterialId},
-    entity::{EntityBehaviour, EntityCells, EntityDef, EntityUpdateCtx, SimCtx},
-    lib::force::apply_explosion,
+use crate::{
+    content::materials::MaterialId,
+    sim::{
+        cell::cell::Cell,
+        entity::{EntityBehaviour, EntityCells, EntityDef, EntityUpdateCtx},
+        lib::force::apply_explosion,
+        sim_manager::SimCtx,
+    },
 };
 
 struct GrenadeEntityBehaviour {
diff --git a/src/sim/entity/entities/mod.rs b/src/content/entities/mod.rs
index e78eb89..e78eb89 100644
--- a/src/sim/entity/entities/mod.rs
+++ b/src/content/entities/mod.rs
diff --git a/src/sim/cell/materials/fire.rs b/src/content/materials/fire.rs
index 8cabe30..483afbc 100644
--- a/src/sim/cell/materials/fire.rs
+++ b/src/content/materials/fire.rs
@@ -1,8 +1,11 @@
 use rand::RngExt;
 
-use crate::sim::{
-    cell::{cell::Cell, materials::MaterialId},
-    cell_manager::sim::{PostUpdateAction, UpdateCtx},
+use crate::{
+    content::materials::MaterialId,
+    sim::{
+        cell::cell::Cell,
+        cell_manager::sim::{PostUpdateAction, UpdateCtx},
+    },
 };
 
 pub trait FireCellView {
diff --git a/src/sim/cell/materials/gas.rs b/src/content/materials/gas.rs
index 229d0e9..229d0e9 100644
--- a/src/sim/cell/materials/gas.rs
+++ b/src/content/materials/gas.rs
diff --git a/src/sim/cell/materials/liquid.rs b/src/content/materials/liquid.rs
index 6c3bdcd..6c3bdcd 100644
--- a/src/sim/cell/materials/liquid.rs
+++ b/src/content/materials/liquid.rs
diff --git a/src/sim/cell/materials/mod.rs b/src/content/materials/mod.rs
index 8116565..8116565 100644
--- a/src/sim/cell/materials/mod.rs
+++ b/src/content/materials/mod.rs
diff --git a/src/sim/cell/materials/powder.rs b/src/content/materials/powder.rs
index 8c916e4..8c916e4 100644
--- a/src/sim/cell/materials/powder.rs
+++ b/src/content/materials/powder.rs
diff --git a/src/content/mod.rs b/src/content/mod.rs
new file mode 100644
index 0000000..2044048
--- /dev/null
+++ b/src/content/mod.rs
@@ -0,0 +1,2 @@
+pub mod entities;
+pub mod materials;
diff --git a/src/main.rs b/src/main.rs
index adb723c..492f0ba 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,6 @@
 mod camera;
 mod config;
+mod content;
 mod renderer;
 mod sim;
 
@@ -21,11 +22,14 @@ use winit::{
 use crate::{
     camera::Camera,
     config::WINDOW_TITLE,
+    content::{
+        entities::{entity_cube::entity_cube_def, entity_grenade::entity_grenade_def},
+        materials::MaterialId,
+    },
     renderer::RendererState,
     sim::{
-        cell::{cell::Cell, materials::MaterialId},
+        cell::cell::Cell,
         cell_manager::manager::CellManager,
-        entity::entities::{entity_cube::entity_cube_def, entity_grenade::entity_grenade_def},
         lib::force::apply_explosion,
         particle_manager::particle::Particle,
         rb_manager::DebugRenderMode,
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index 2df15e6..c2e541b 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -9,9 +9,9 @@ use crate::{
     Config, Diagnostics, Input,
     camera::Camera,
     config::{CELLS_IN_CHUNK, CHUNK_SIZE},
+    content::materials::MaterialId,
     renderer::ui::draw_egui,
     sim::{
-        cell::materials::MaterialId,
         cell_manager::manager::CellManager,
         entity::Entity,
         rb_manager::debug_render::DebugVertex,
diff --git a/src/renderer/ui.rs b/src/renderer/ui.rs
index 4c6d61c..a7395a0 100644
--- a/src/renderer/ui.rs
+++ b/src/renderer/ui.rs
@@ -2,10 +2,8 @@ use egui::{Color32, Stroke, Ui, epaint::CircleShape};
 
 use crate::{
     Camera, Config, Diagnostics, Input,
-    sim::{
-        cell::materials::MaterialId, cell_manager::manager::CellManager,
-        rb_manager::DebugRenderMode, sim_manager::SimManager,
-    },
+    content::materials::MaterialId,
+    sim::{rb_manager::DebugRenderMode, sim_manager::SimManager},
 };
 
 const DEBUG_RENDER_MODES: [(&str, DebugRenderMode); 6] = [
diff --git a/src/sim/cell/cell.rs b/src/sim/cell/cell.rs
index 2a16d0c..6c6e704 100644
--- a/src/sim/cell/cell.rs
+++ b/src/sim/cell/cell.rs
@@ -1,4 +1,4 @@
-use crate::{config::SETTLED_THRESOHLD, sim::cell::materials::MaterialId};
+use crate::{config::SETTLED_THRESOHLD, content::materials::MaterialId};
 
 #[derive(Clone, Copy)]
 pub struct Cell {
diff --git a/src/sim/cell/mod.rs b/src/sim/cell/mod.rs
index 2d2175c..48433da 100644
--- a/src/sim/cell/mod.rs
+++ b/src/sim/cell/mod.rs
@@ -1,2 +1 @@
 pub mod cell;
-pub mod materials;
diff --git a/src/sim/cell_manager/chunk.rs b/src/sim/cell_manager/chunk.rs
index 3cf34ff..29e6536 100644
--- a/src/sim/cell_manager/chunk.rs
+++ b/src/sim/cell_manager/chunk.rs
@@ -2,10 +2,8 @@ use glam::IVec2;
 
 use crate::{
     config::{CELLS_IN_CHUNK, CHUNK_SIZE},
-    sim::{
-        cell::{cell::Cell, materials::MaterialForm},
-        lib::marching_squares::Marchable,
-    },
+    content::materials::MaterialForm,
+    sim::{cell::cell::Cell, lib::marching_squares::Marchable},
 };
 
 pub struct Chunk {
diff --git a/src/sim/cell_manager/sim.rs b/src/sim/cell_manager/sim.rs
index b79608e..0e67cad 100644
--- a/src/sim/cell_manager/sim.rs
+++ b/src/sim/cell_manager/sim.rs
@@ -6,8 +6,9 @@ use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 
 use crate::{
     config::{CHUNK_SIZE, SETTLED_THRESOHLD},
+    content::materials::MaterialDef,
     sim::{
-        cell::{cell::Cell, materials::MaterialDef},
+        cell::cell::Cell,
         cell_manager::{chunk::Chunk, manager::CellManager},
     },
 };
diff --git a/src/sim/entity/mod.rs b/src/sim/entity/mod.rs
index 0f4ae3c..4a79bf4 100644
--- a/src/sim/entity/mod.rs
+++ b/src/sim/entity/mod.rs
@@ -6,16 +6,13 @@ use rapier2d::{
 
 use crate::{
     config::{CELLS_TO_METRES, MASS_SCALING},
+    content::materials::MaterialId,
     sim::{
-        cell::{cell::Cell, materials::MaterialId},
-        lib::marching_squares::Marchable,
-        rb_manager::RbManager,
+        cell::cell::Cell, lib::marching_squares::Marchable, rb_manager::RbManager,
         sim_manager::SimCtx,
     },
 };
 
-pub mod entities;
-
 pub struct EntityCells {
     pub size: IVec2,
     pub cells: Vec<Cell>,
diff --git a/src/sim/lib/force.rs b/src/sim/lib/force.rs
index ff65fef..39b7904 100644
--- a/src/sim/lib/force.rs
+++ b/src/sim/lib/force.rs
@@ -1,13 +1,9 @@
 use glam::Vec2;
 use rand::random_range;
 
-use crate::sim::{
-    cell::{
-        cell::Cell,
-        materials::{MaterialForm, MaterialId, fire::FireCellView},
-    },
-    particle_manager::particle::Particle,
-    sim_manager::SimCtx,
+use crate::{
+    content::materials::{MaterialForm, MaterialId, fire::FireCellView},
+    sim::{cell::cell::Cell, particle_manager::particle::Particle, sim_manager::SimCtx},
 };
 
 pub fn apply_explosion(
diff --git a/src/sim/particle_manager/mod.rs b/src/sim/particle_manager/mod.rs
index 8ecf6f5..052369b 100644
--- a/src/sim/particle_manager/mod.rs
+++ b/src/sim/particle_manager/mod.rs
@@ -1,9 +1,8 @@
 use crate::{
     config::CELLS_TO_METRES,
+    content::materials::MaterialForm,
     sim::{
-        cell::{cell::Cell, materials::MaterialForm},
-        cell_manager::manager::CellManager,
-        lib::ray::AwDda,
+        cell::cell::Cell, cell_manager::manager::CellManager, lib::ray::AwDda,
         particle_manager::particle::Particle,
     },
 };
diff --git a/src/sim/particle_manager/particle.rs b/src/sim/particle_manager/particle.rs
index cc7dd28..c68d81e 100644
--- a/src/sim/particle_manager/particle.rs
+++ b/src/sim/particle_manager/particle.rs
@@ -1,6 +1,6 @@
 use glam::Vec2;
 
-use crate::sim::cell::materials::MaterialId;
+use crate::content::materials::MaterialId;
 
 pub struct Particle {
     pub position: Vec2,
diff --git a/src/sim/sim_manager/mod.rs b/src/sim/sim_manager/mod.rs
index 2b8bead..8f47761 100644
--- a/src/sim/sim_manager/mod.rs
+++ b/src/sim/sim_manager/mod.rs
@@ -6,8 +6,9 @@ use glam::IVec2;
 use crate::{
     Config,
     config::{PHYSICS_DELTA_TIME, PHYSICS_FPS, SIM_FPS},
+    content::materials::MaterialId,
     sim::{
-        cell::{cell::Cell, materials::MaterialId},
+        cell::cell::Cell,
         cell_manager::manager::CellManager,
         entity::{Entity, EntityDef},
         particle_manager::ParticleManager,
diff --git a/src/sim/sim_manager/utils.rs b/src/sim/sim_manager/utils.rs
index 97bc1f3..b668359 100644
--- a/src/sim/sim_manager/utils.rs
+++ b/src/sim/sim_manager/utils.rs
@@ -1,6 +1,6 @@
 use glam::IVec2;
 
-use crate::sim::{cell::materials::MaterialId, sim_manager::SimManager};
+use crate::{content::materials::MaterialId, sim::sim_manager::SimManager};
 
 pub fn write_entity_to_world(
     sim: &mut SimManager,