lisk77/comet
1
0
Fork 0
mirror of https://github.com/lisk77/comet.git synced 2025-10-23 21:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: changed deletion order in the delete_entity function of the World struct. Now deletes everything properly

Browse source
This commit is contained in:
lisk77 2025-03-05 07:47:18 +01:00
parent 38b41985dc
commit 7753ca7c4f
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/comet_ecs/src/world.rs
View file

@ -82,14 +82,17 @@ impl World {
/// Deletes an entity by its ID. /// Deletes an entity by its ID.
pub fn delete_entity(&mut self, entity_id: usize) { pub fn delete_entity(&mut self, entity_id: usize) {
self.remove_entity_from_archetype_subsets(entity_id as u32, self.get_component_set(entity_id));
self.entities[entity_id] = None; self.entities[entity_id] = None;
info!("Deleted entity! ID: {}", entity_id);
for (_, value) in self.components.iter_mut() { for (_, value) in self.components.iter_mut() {
value.remove::<u8>(entity_id); value.remove::<u8>(entity_id);
} }
self.id_queue.sorted_enqueue(entity_id as u32); self.id_queue.sorted_enqueue(entity_id as u32);
self.get_next_id(); self.get_next_id();
self.remove_entity_from_archetype_subsets(entity_id as u32, self.get_component_set(entity_id));
info!("Deleted entity! ID: {}", entity_id);
} }
fn create_archetype(&mut self, components: ComponentSet) { fn create_archetype(&mut self, components: ComponentSet) {
@ -139,10 +142,24 @@ impl World {
self.archetypes.remove_archetype(&key); self.archetypes.remove_archetype(&key);
} }
} }
info!("Removed entity {} from all archetypes!", entity_id);
} }
fn get_component_set(&self, entity_id: usize) -> ComponentSet { fn get_component_set(&self, entity_id: usize) -> ComponentSet {
let components = self.entities.get(entity_id).unwrap().as_ref().unwrap().get_components().iter().collect::<Vec<usize>>(); let components = match self.entities.get(entity_id) {
Some(cmp) => match cmp.as_ref() {
Some(e) => e.get_components().iter().collect::<Vec<usize>>(),
None => {
error!("This entity ({}) does not have any components!", entity_id);
Vec::new()
}
},
_ => {
error!("This entity ({}) does not exist!", entity_id);
Vec::new()
}
};
let type_ids = components.iter().map(|index| self.components.keys()[*index]).collect::<Vec<TypeId>>(); let type_ids = components.iter().map(|index| self.components.keys()[*index]).collect::<Vec<TypeId>>();
ComponentSet::from_ids(type_ids) ComponentSet::from_ids(type_ids)
} }
@ -175,14 +192,14 @@ impl World {
if self.get_component_set(entity_id) != ComponentSet::from_ids(vec![C::type_id()]) { if self.get_component_set(entity_id) != ComponentSet::from_ids(vec![C::type_id()]) {
self.add_entity_to_archetype(entity_id as u32, self.get_component_set(entity_id)); self.add_entity_to_archetype(entity_id as u32, self.get_component_set(entity_id));
} }
info!("Added component {} to entity {}", C::type_name(), entity_id); info!("Added component {} to entity {}!", C::type_name(), entity_id);
} }
/// Removes a component from an entity by its ID. /// Removes a component from an entity by its ID.
pub fn remove_component<C: Component + 'static>(&mut self, entity_id: usize) { pub fn remove_component<C: Component + 'static>(&mut self, entity_id: usize) {
self.components.remove_component::<C>(entity_id); self.components.remove_component::<C>(entity_id);
self.remove_entity_from_archetype_subsets(entity_id as u32, self.get_component_set(entity_id)); self.remove_entity_from_archetype_subsets(entity_id as u32, self.get_component_set(entity_id));
info!("Removed component {} from entity {}", C::type_name(), entity_id); info!("Removed component {} from entity {}!", C::type_name(), entity_id);
} }
/// Returns a reference to a component of an entity by its ID. /// Returns a reference to a component of an entity by its ID.

2
crates/comet_renderer/src/renderer2d.rs
View file

@ -792,7 +792,7 @@ impl<'a> Renderer2D<'a> {
} }
} }
} }
println!("{:?}", visible_entities); //println!("{:?}", visible_entities);
} }