Merge pull request #562 from ChristopherBiscardi/after-time

Run systems in First after Time set
StarArawn · Sep 16, 2024 · 42b74a3 · 42b74a3
2 parents 4ad090e + f8d25c6
commit 42b74a3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -14,9 +14,13 @@
 //! - Built in animation support  – see [`animation` example](https://github.com/StarArawn/bevy_ecs_tilemap/blob/main/examples/animation.rs).
 //! - Texture array support.
 
-use bevy::prelude::{
-    Bundle, Changed, Component, Deref, First, GlobalTransform, InheritedVisibility, Plugin, Query,
-    Reflect, ReflectComponent, Transform, ViewVisibility, Visibility,
+use bevy::{
+    prelude::{
+        Bundle, Changed, Component, Deref, First, GlobalTransform, InheritedVisibility,
+        IntoSystemConfigs, IntoSystemSetConfigs, Plugin, Query, Reflect, ReflectComponent,
+        SystemSet, Transform, ViewVisibility, Visibility,
+    },
+    time::TimeSystem,
 };
 
 #[cfg(feature = "render")]
@@ -58,7 +62,7 @@ impl Plugin for TilemapPlugin {
         #[cfg(feature = "render")]
         app.add_plugins(render::TilemapRenderingPlugin);
 
-        app.add_systems(First, update_changed_tile_positions);
+        app.add_systems(First, update_changed_tile_positions.in_set(TilemapFirstSet));
 
         #[cfg(all(not(feature = "atlas"), feature = "render"))]
         {
@@ -83,10 +87,14 @@ impl Plugin for TilemapPlugin {
             .register_type::<TileFlip>()
             .register_type::<TileStorage>()
             .register_type::<TilePosOld>()
-            .register_type::<AnimatedTile>();
+            .register_type::<AnimatedTile>()
+            .configure_sets(First, TilemapFirstSet.after(TimeSystem));
     }
 }
 
+#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
+pub struct TilemapFirstSet;
+
 #[derive(Component, Reflect, Debug, Clone, Copy, Deref)]
 #[reflect(Component)]
 pub struct FrustumCulling(pub bool);

diff --git a/src/render/mod.rs b/src/render/mod.rs
@@ -24,6 +24,7 @@ use bevy::render::texture::GpuImage;
 use crate::{
     prelude::TilemapRenderSettings,
     tiles::{TilePos, TileStorage},
+    TilemapFirstSet,
 };
 use crate::{
     prelude::TilemapTexture,
@@ -112,7 +113,7 @@ impl Plugin for TilemapRenderingPlugin {
         #[cfg(not(feature = "atlas"))]
         app.add_systems(Update, set_texture_to_copy_src);
 
-        app.add_systems(First, clear_removed);
+        app.add_systems(First, clear_removed.in_set(TilemapFirstSet));
         app.add_systems(PostUpdate, (removal_helper, removal_helper_tilemap));
 
         app.add_plugins(MaterialTilemapPlugin::<StandardTilemapMaterial>::default());