From bdad89910dcf3a56790dba60ed1f0db679432323 Mon Sep 17 00:00:00 2001
From: Kai Stevenson <kai@kaistevenson.com>
Date: Sat, 22 Aug 2026 16:49:56 -0700
Subject: refactor entities

---
 src/main.rs | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 3976d71..372ef4e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,9 +25,10 @@ use crate::{
     sim::{
         cell::{cell::Cell, materials::MaterialId},
         cell_manager::manager::CellManager,
+        entity::entities::entity_cube::entity_cube_def,
         lib::force::apply_explosion,
         particle_manager::particle::Particle,
-        rb_manager::{DebugRenderMode, debug_ops::DebugOperator},
+        rb_manager::DebugRenderMode,
         sim_manager::SimManager,
     },
 };
@@ -103,16 +104,10 @@ impl App {
                 && let Some(lm) = self.input.last_mouse_world_pos
             {
                 self.input.trigger_test_1 = false;
-                sim.rb_manager
-                    .test_spawn_box(lm.0, lm.1, self.config.dropper_material);
-            }
-
-            if self.input.trigger_test_2
-                && let Some(lm) = self.input.last_mouse_world_pos
-            {
-                self.input.trigger_test_2 = false;
-                sim.rb_manager
-                    .test_spawn_ball(lm.0, lm.1, self.config.dropper_material);
+                sim.create_entity(entity_cube_def(
+                    Vec2::new(lm.0, lm.1),
+                    self.config.dropper_material,
+                ));
             }
 
             if self.input.trigger_test_3
@@ -286,10 +281,9 @@ impl ApplicationHandler for App {
                         KeyCode::KeyC => sim.cell_manager = CellManager::from_default_size(),
                         KeyCode::KeyP => sim.particle_manager.particles = Vec::new(),
                         KeyCode::KeyV => {
-                            let entity_ids: Vec<u32> =
-                                sim.rb_manager.rb_entities.keys().copied().collect();
-                            for entity_id in entity_ids {
-                                sim.rb_manager.destroy_rb_entity(entity_id);
+                            let ids: Vec<u32> = sim.entities.keys().cloned().collect();
+                            for id in ids {
+                                sim.destroy_entity(id);
                             }
                         }
                         KeyCode::Space if pressed => sim.paused = !sim.paused,
-- 
cgit v1.3.1