ecs/src/world.rs

@@ -43,7 +43,6 @@ impl WorldBuilder {
             entities_to_remove: Default::default(),
             entities_to_add: Default::default(),
             entities_updates: Default::default(),
-            had_entity_changes: false,
 
             entity_object_manager: Default::default(),
 
@@ -69,7 +68,6 @@ pub struct World {
     entities_to_remove: Vec<Entity>,
     entities_to_add: Vec<EntityObject>,
     entities_updates: HashMap<Entity, Vec<ComponentChange>>,
-    had_entity_changes: bool,
 
     entity_object_manager: EntityObjectManager,
 
@@ -105,10 +103,6 @@ impl World {
         self.entities.values()
     }
 
-    pub fn had_entity_changes(&self) -> bool {
-        self.had_entity_changes
-    }
-
     pub fn entity_resources(
         &mut self,
         entity: Entity,
@@ -342,36 +336,26 @@ impl World {
     }
 
     pub fn commit_entity_changes(&mut self) -> Result<()> {
-        #[cfg(debug_assertions)]
+        if !self.entities_to_remove.is_empty() {
-        {
+            println!("entities to remove {}", self.entities_to_remove.len());
-            if !self.entities_to_remove.is_empty() {
-                println!("entities to remove {}", self.entities_to_remove.len());
-            }
-
-            if !self.entities_to_add.is_empty() {
-                println!("entities to add {}", self.entities_to_add.len());
-            }
-
-            if !self.entities_updates.is_empty() {
-                println!("entities to update {}", self.entities_updates.len());
-            }
-        }
-
-        if self.entities_to_remove.is_empty()
-            && self.entities_to_add.is_empty()
-            && self.entities_updates.is_empty()
-        {
-            return Ok(());
         }
 
         for entity in core::mem::take(&mut self.entities_to_remove) {
             self._remove_entity(entity)?;
         }
 
+        if !self.entities_to_add.is_empty() {
+            println!("entities to add {}", self.entities_to_add.len());
+        }
+
         for entity_object in core::mem::take(&mut self.entities_to_add) {
             self._add_entity(entity_object)?;
         }
 
+        if !self.entities_updates.is_empty() {
+            println!("entities to update {}", self.entities_updates.len());
+        }
+
         for (entity, changes) in core::mem::take(&mut self.entities_updates) {
             self.updates.remove_entity(entity);
             self.archetypes.remove_entity(entity);
@@ -409,7 +393,6 @@ impl World {
             }
         }
 
-        self.had_entity_changes = true;
         Ok(())
     }
 }
@@ -439,9 +422,6 @@ impl World {
                     return Ok(());
                 }
             }
-
-            // reset flag
-            self.had_entity_changes = false;
         }
     }
 }