skip disabled entities in scenes

Author: janis-bhm

crates/bevy_ecs/src/archetype.rs

@@ -488,10 +488,10 @@ impl Archetype {
         &self.entities
     }
 
-    /// Fetches the disabled entities contained in this archetype.
+    /// Fetches the enabled entities contained in this archetype.
     #[inline]
-    pub fn disabled_entities(&self) -> &[ArchetypeEntity] {
-        &self.entities[..self.disabled_entities as usize]
+    pub fn enabled_entities(&self) -> &[ArchetypeEntity] {
+        &self.entities[self.disabled_entities as usize..]
     }
 
     /// Get the valid table rows (i.e. non-disabled entities).
@@ -507,8 +507,7 @@ impl Archetype {
     #[inline]
     pub fn entities_with_location(
         &self,
-    ) -> impl Iterator<Item = (Entity, EntityLocation)> + DoubleEndedIterator + ExactSizeIterator
-    {
+    ) -> impl DoubleEndedIterator<Item = (Entity, EntityLocation)> + ExactSizeIterator {
         self.entities.iter().enumerate().map(
             |(archetype_row, &ArchetypeEntity { entity, table_row })| {
                 (

crates/bevy_scene/src/dynamic_scene.rs

@@ -60,7 +60,7 @@ impl DynamicScene {
                 world
                     .archetypes()
                     .iter()
-                    .flat_map(bevy_ecs::archetype::Archetype::entities)
+                    .flat_map(bevy_ecs::archetype::Archetype::enabled_entities)
                     .map(bevy_ecs::archetype::ArchetypeEntity::id),
             )
             .extract_resources()

crates/bevy_scene/src/scene.rs

@@ -106,15 +106,15 @@ impl Scene {
         // Ensure that all scene entities have been allocated in the destination
         // world before handling components that may contain references that need mapping.
         for archetype in self.world.archetypes().iter() {
-            for scene_entity in archetype.entities() {
+            for scene_entity in archetype.enabled_entities() {
                 entity_map
                     .entry(scene_entity.id())
                     .or_insert_with(|| world.spawn_empty().id());
             }
         }
 
         for archetype in self.world.archetypes().iter() {
-            for scene_entity in archetype.entities() {
+            for scene_entity in archetype.enabled_entities() {
                 let entity = *entity_map
                     .get(&scene_entity.id())
                     .expect("should have previously spawned an entity");