From 3c5b52c742a86dfb86238bad3bfc375bf12fc518 Mon Sep 17 00:00:00 2001 From: Kai Stevenson Date: Sun, 23 Aug 2026 17:53:46 -0700 Subject: profiling, tweaks --- src/sim/sim_manager/mod.rs | 21 ++++++++++++++++++++- src/sim/sim_manager/utils.rs | 30 ++++++++++++++++++------------ 2 files changed, 38 insertions(+), 13 deletions(-) (limited to 'src/sim/sim_manager') diff --git a/src/sim/sim_manager/mod.rs b/src/sim/sim_manager/mod.rs index 89ae528..8fab9cf 100644 --- a/src/sim/sim_manager/mod.rs +++ b/src/sim/sim_manager/mod.rs @@ -5,9 +5,10 @@ use fxhash::FxHashMap; use crate::{ Config, InputManager, config::{PHYSICS_DELTA_TIME, PHYSICS_FPS, SIM_FPS}, + input::Input, sim::{ cell_manager::manager::CellManager, - entity::{Entity, EntityDef, EntityId, EntityUpdateResult}, + entity::{Entity, EntityDef, EntityId}, particle_manager::ParticleManager, rb_manager::RbManager, sim_manager::utils::{ @@ -163,6 +164,24 @@ impl SimManager { } pub fn update(&mut self, config: &Config, input_manager: &InputManager, delta_time: f32) { + // handle sim controls + if input_manager.pressed(Input::Pause) { + self.paused = !self.paused; + } + if input_manager.pressed(Input::Step) { + self.ignore_pause_next_tick = true; + } + if input_manager.pressed(Input::ClearGrid) { + self.cell_manager = CellManager::from_default_size(); + } + if input_manager.pressed(Input::ClearEntities) { + let entities: Vec = self.entities.drain().map(|(id, _)| id).collect(); + entities.iter().for_each(|&id| self.destroy_entity(id)); + } + if input_manager.pressed(Input::ClearParticles) { + self.particle_manager.particles = Vec::new(); + } + let now = Instant::now(); let secs_since_last_cell_update = (now - self.last_cell_update).as_secs_f32(); let expected_secs_since_last_cell_update = 1.0 / SIM_FPS as f32; diff --git a/src/sim/sim_manager/utils.rs b/src/sim/sim_manager/utils.rs index e77f30a..f30e9a0 100644 --- a/src/sim/sim_manager/utils.rs +++ b/src/sim/sim_manager/utils.rs @@ -68,6 +68,7 @@ pub fn write_entities_to_world( sim: &mut SimManager, // (entity_x, entity_y, cell_x, cell_y) ) -> Vec<(EntityId, Vec<(u8, u8, i32, i32)>)> { + puffin::profile_function!(); // TODO optimize let entity_ids: Vec = sim.entities.keys().copied().collect(); let mut cells_written_by_entity: Vec<(EntityId, Vec<(u8, u8, i32, i32)>)> = Vec::new(); @@ -85,6 +86,7 @@ pub fn read_back_entities_from_world( sim: &mut SimManager, cells_written_by_entity: Vec<(EntityId, Vec<(u8, u8, i32, i32)>)>, ) { + puffin::profile_function!(); for (entity_id, cells_written) in cells_written_by_entity { let mut entity = sim.entities.get_mut(&entity_id); let mut should_update_entity = false; @@ -115,19 +117,23 @@ pub fn read_back_entities_from_world( if let Some(entity) = &mut entity && should_update_entity { + puffin::profile_scope!("Recompute collider"); if let Some(new_collider) = entity.compute_collider() { - sim.rb_manager - .physics_manager - .world - .remove_collider(entity.data.collider_h.unwrap()); - - let new_handle = sim - .rb_manager - .physics_manager - .world - .insert_collider(new_collider, Some(entity.data.rb_h.unwrap())); - - entity.data.collider_h = Some(new_handle); + { + puffin::profile_scope!("Upsert collider"); + sim.rb_manager + .physics_manager + .world + .remove_collider(entity.data.collider_h.unwrap()); + + let new_handle = sim + .rb_manager + .physics_manager + .world + .insert_collider(new_collider, Some(entity.data.rb_h.unwrap())); + + entity.data.collider_h = Some(new_handle); + } } } } -- cgit v1.3.1