Merge pull request #510 from thebluefish/main

Filter RemovedComponents for entities that no longer exist
StarArawn · Feb 11, 2024 · 92fc406 · 92fc406
2 parents b08a5d9 + 16cf328
commit 92fc406
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/render/extract.rs b/src/render/extract.rs
@@ -377,27 +377,27 @@ pub fn extract(
 
 pub fn extract_removal(
     mut commands: Commands,
-    removed_tiles_query: Extract<Query<&RemovedTileEntity>>,
-    removed_maps_query: Extract<Query<&RemovedMapEntity>>,
+    removed_tiles_query: Extract<Query<(Entity, &RemovedTileEntity)>>,
+    removed_maps_query: Extract<Query<(Entity, &RemovedMapEntity)>>,
 ) {
     let mut removed_tiles: Vec<(Entity, ExtractedRemovedTileBundle)> = Vec::new();
-    for entity in removed_tiles_query.iter() {
+    for (entity, removed) in removed_tiles_query.iter() {
         removed_tiles.push((
-            entity.0,
+            entity,
             ExtractedRemovedTileBundle {
-                tile: ExtractedRemovedTile { entity: entity.0 },
+                tile: ExtractedRemovedTile { entity: removed.0 },
             },
         ));
     }
 
     commands.insert_or_spawn_batch(removed_tiles);
 
     let mut removed_maps: Vec<(Entity, ExtractedRemovedMapBundle)> = Vec::new();
-    for entity in removed_maps_query.iter() {
+    for (entity, removed) in removed_maps_query.iter() {
         removed_maps.push((
-            entity.0,
+            entity,
             ExtractedRemovedMapBundle {
-                map: ExtractedRemovedMap { entity: entity.0 },
+                map: ExtractedRemovedMap { entity: removed.0 },
             },
         ));
     }

diff --git a/src/render/mod.rs b/src/render/mod.rs
@@ -116,7 +116,7 @@ impl Plugin for TilemapRenderingPlugin {
         app.add_systems(Update, set_texture_to_copy_src);
 
         app.add_systems(First, clear_removed);
-        app.add_systems(PostUpdate, (removal_helper_tilemap, removal_helper));
+        app.add_systems(PostUpdate, (removal_helper, removal_helper_tilemap));
 
         app.add_plugins(MaterialTilemapPlugin::<StandardTilemapMaterial>::default());
 

diff --git a/src/render/texture_array_cache.rs b/src/render/texture_array_cache.rs
@@ -86,7 +86,7 @@ impl TextureArrayCache {
                         "Expected image to have finished loading if \
                         it is being extracted as a texture!",
                     );
-                    let this_tile_size: TilemapTileSize = image.size_f32().try_into().unwrap();
+                    let this_tile_size: TilemapTileSize = image.size_f32().into();
                     if this_tile_size != tile_size {
                         panic!(
                             "Expected all provided image assets to have size {tile_size:?}, \