Use observers and ExtractComponentPlugin for removal

Author: rparrett

src/render/extract.rs

@@ -2,7 +2,7 @@ use bevy::math::Affine3A;
 use bevy::render::primitives::{Aabb, Frustum};
 use bevy::render::render_resource::FilterMode;
 use bevy::render::render_resource::TextureFormat;
-use bevy::render::sync_world::{RenderEntity, TemporaryRenderEntity};
+use bevy::render::sync_world::RenderEntity;
 use bevy::{prelude::*, render::Extract, utils::HashMap};
 
 use crate::prelude::TilemapGridSize;
@@ -19,8 +19,7 @@ use crate::{
     FrustumCulling,
 };
 
-use super::RemovedMapEntity;
-use super::{chunk::PackedTileData, RemovedTileEntity};
+use super::chunk::PackedTileData;
 
 #[derive(Component)]
 pub struct ExtractedTile {
@@ -36,28 +35,6 @@ pub struct ExtractedTileBundle {
     tile: ExtractedTile,
 }
 
-#[derive(Component)]
-pub struct ExtractedRemovedTile {
-    pub entity: Entity,
-}
-
-#[derive(Bundle)]
-pub struct ExtractedRemovedTileBundle {
-    tile: ExtractedRemovedTile,
-    temp: TemporaryRenderEntity,
-}
-
-#[derive(Component)]
-pub struct ExtractedRemovedMap {
-    pub entity: Entity,
-}
-
-#[derive(Bundle)]
-pub struct ExtractedRemovedMapBundle {
-    map: ExtractedRemovedMap,
-    temp: TemporaryRenderEntity,
-}
-
 #[derive(Bundle)]
 pub struct ExtractedTilemapBundle {
     transform: GlobalTransform,
@@ -383,29 +360,3 @@ pub fn extract(
     commands.insert_or_spawn_batch(extracted_tilemap_textures);
     commands.insert_resource(SecondsSinceStartup(time.elapsed_secs_f64() as f32));
 }
-
-pub fn extract_removal(
-    mut commands: Commands,
-    removed_tiles_query: Extract<Query<&RemovedTileEntity>>,
-    removed_maps_query: Extract<Query<&RemovedMapEntity>>,
-) {
-    let mut removed_tiles: Vec<ExtractedRemovedTileBundle> = Vec::new();
-    for removed in removed_tiles_query.iter() {
-        removed_tiles.push(ExtractedRemovedTileBundle {
-            tile: ExtractedRemovedTile { entity: removed.0 },
-            temp: TemporaryRenderEntity,
-        });
-    }
-
-    commands.spawn_batch(removed_tiles);
-
-    let mut removed_maps: Vec<ExtractedRemovedMapBundle> = Vec::new();
-    for removed in removed_maps_query.iter() {
-        removed_maps.push(ExtractedRemovedMapBundle {
-            map: ExtractedRemovedMap { entity: removed.0 },
-            temp: TemporaryRenderEntity,
-        });
-    }
-
-    commands.spawn_batch(removed_maps);
-}

src/render/mod.rs

@@ -6,10 +6,12 @@ use bevy::{
     image::ImageSamplerDescriptor,
     prelude::*,
     render::{
+        extract_component::{ExtractComponent, ExtractComponentPlugin},
         extract_resource::{extract_resource, ExtractResource},
         mesh::MeshVertexAttribute,
         render_phase::AddRenderCommand,
         render_resource::{FilterMode, SpecializedRenderPipelines, VertexFormat},
+        sync_world::RenderEntity,
         view::{check_visibility, VisibilitySystems},
         Render, RenderApp, RenderSet,
     },
@@ -114,7 +116,12 @@ impl Plugin for TilemapRenderingPlugin {
         app.add_systems(Update, set_texture_to_copy_src);
 
         app.add_systems(First, clear_removed.in_set(TilemapFirstSet));
-        app.add_systems(PostUpdate, (removal_helper, removal_helper_tilemap));
+
+        app.add_observer(on_remove_tile);
+        app.add_observer(on_remove_tilemap);
+
+        app.add_plugins(ExtractComponentPlugin::<RemovedTileEntity>::default());
+        app.add_plugins(ExtractComponentPlugin::<RemovedMapEntity>::default());
 
         app.add_plugins(MaterialTilemapPlugin::<StandardTilemapMaterial>::default());
 
@@ -246,11 +253,7 @@ impl Plugin for TilemapRenderingPlugin {
             .insert_resource(SecondsSinceStartup(0.0))
             .add_systems(
                 ExtractSchedule,
-                (
-                    extract::extract,
-                    extract::extract_removal,
-                    extract_resource::<ModifiedImageIds>,
-                ),
+                (extract::extract, extract_resource::<ModifiedImageIds>),
             )
             .add_systems(
                 Render,
@@ -303,24 +306,30 @@ pub const ATTRIBUTE_TEXTURE: MeshVertexAttribute =
 pub const ATTRIBUTE_COLOR: MeshVertexAttribute =
     MeshVertexAttribute::new("Color", 231497124, VertexFormat::Float32x4);
 
-#[derive(Component)]
-pub struct RemovedTileEntity(pub Entity);
+#[derive(Component, ExtractComponent, Clone)]
 
-#[derive(Component)]
-pub struct RemovedMapEntity(pub Entity);
+pub struct RemovedTileEntity(pub RenderEntity);
 
-fn removal_helper(mut commands: Commands, mut removed_query: RemovedComponents<TilePos>) {
-    for entity in removed_query.read() {
-        commands.spawn(RemovedTileEntity(entity));
+#[derive(Component, ExtractComponent, Clone)]
+pub struct RemovedMapEntity(pub RenderEntity);
+
+fn on_remove_tile(
+    trigger: Trigger<OnRemove, TilePos>,
+    mut commands: Commands,
+    query: Query<&RenderEntity>,
+) {
+    if let Ok(render_entity) = query.get(trigger.entity()) {
+        commands.spawn(RemovedTileEntity(*render_entity));
     }
 }
 
-fn removal_helper_tilemap(
+fn on_remove_tilemap(
+    trigger: Trigger<OnRemove, TileStorage>,
     mut commands: Commands,
-    mut removed_query: RemovedComponents<TileStorage>,
+    query: Query<&RenderEntity>,
 ) {
-    for entity in removed_query.read() {
-        commands.spawn(RemovedMapEntity(entity));
+    if let Ok(render_entity) = query.get(trigger.entity()) {
+        commands.spawn(RemovedMapEntity(*render_entity));
     }
 }
 

src/render/prepare.rs

@@ -23,9 +23,10 @@ use bevy::{
 
 use super::{
     chunk::{ChunkId, PackedTileData, RenderChunk2dStorage, TilemapUniformData},
-    extract::{ExtractedRemovedMap, ExtractedRemovedTile, ExtractedTile, ExtractedTilemapTexture},
+    extract::{ExtractedTile, ExtractedTilemapTexture},
     DynamicUniformIndex,
 };
+use super::{RemovedMapEntity, RemovedTileEntity};
 
 #[derive(Resource, Default)]
 pub struct MeshUniformResource(pub DynamicUniformBuffer<MeshUniform>);
@@ -220,14 +221,14 @@ pub(crate) fn prepare(
 
 pub fn prepare_removal(
     mut chunk_storage: ResMut<RenderChunk2dStorage>,
-    removed_tiles: Query<&ExtractedRemovedTile>,
-    removed_maps: Query<&ExtractedRemovedMap>,
+    removed_tiles: Query<&RemovedTileEntity>,
+    removed_maps: Query<&RemovedMapEntity>,
 ) {
     for removed_tile in removed_tiles.iter() {
-        chunk_storage.remove_tile_with_entity(removed_tile.entity)
+        chunk_storage.remove_tile_with_entity(removed_tile.0.id())
     }
 
     for removed_map in removed_maps.iter() {
-        chunk_storage.remove_map(removed_map.entity);
+        chunk_storage.remove_map(removed_map.0.id());
     }
 }