0.10.1

ManevilleF · Jul 15, 2024 · 283d0ce · 283d0ce
1 parent f5bb49e
commit 283d0ce
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## 0.10.1
+
+* Fixed system ordering
+* Fixed potential crash in cell tick for despawned cells
+* Added system set labels
+
 ## 0.10.0
 
 * Bevy 0.14

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_life"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 authors = ["Felix de Maneville <[email protected]>"]
 license-file = "./LICENSE"

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
  [![unsafe forbidden](https://img.shields.io/badge/unsafe-forbidden-success.svg)](https://github.com/rust-secure-code/safety-dance/)
  [![Crates.io](https://img.shields.io/crates/v/bevy_life.svg)](https://crates.io/crates/bevy_life)
  [![Docs.rs](https://docs.rs/bevy_life/badge.svg)](https://docs.rs/bevy_life)
- [![dependency status](https://deps.rs/crate/bevy_life/0.10.0/status.svg)](https://deps.rs/crate/bevy_life)
+ [![dependency status](https://deps.rs/crate/bevy_life/0.10.1/status.svg)](https://deps.rs/crate/bevy_life)
 
 <!-- cargo-sync-readme start -->
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -172,6 +172,17 @@ pub type CyclicColors2dPlugin<const N: usize> =
 pub type CyclicColors3dPlugin<const N: usize> =
     CellularAutomatonPlugin<components::MooreCell3d, CyclicColorCellState<N>>;
 
+/// System set variant for each cellular automaton step
+#[derive(Debug, PartialEq, Eq, Clone, Hash, SystemSet)]
+pub enum LifeSystemSet {
+    /// Spawned Cell insertion in [`CellMap`] (Requires [`CellularAutomatonPlugin::use_cell_map`])
+    NewCells,
+    /// Despawned Cell removal from [`CellMap`] (Requires [`CellularAutomatonPlugin::use_cell_map`])
+    RemovedCells,
+    /// Cell life tick update system set
+    CellUpdate,
+}
+
 /// Generic Cellular Automaton plugin. It will register systems for the matching
 /// `Cell` and `CellState` types.
 ///
@@ -196,14 +207,27 @@ impl<C: Cell, S: CellState> Plugin for CellularAutomatonPlugin<C, S> {
         // register_type::<CellMap::<C>>();
         if self.use_cell_map {
             app.insert_resource(CellMap::<C>::default());
-            app.add_systems(Update, handle_new_cells::<C>);
-            app.add_systems(PostUpdate, handle_removed_cells::<C>);
+            app.add_systems(
+                PostUpdate,
+                (
+                    handle_new_cells::<C>.in_set(LifeSystemSet::NewCells),
+                    handle_removed_cells::<C>.in_set(LifeSystemSet::RemovedCells),
+                ),
+            );
         }
         if let Some(time_step) = self.tick_time_step {
             let duration = Duration::from_secs_f64(time_step);
-            app.add_systems(Update, handle_cells::<C, S>.run_if(on_timer(duration)));
+            app.add_systems(
+                Update,
+                handle_cells::<C, S>
+                    .run_if(on_timer(duration))
+                    .in_set(LifeSystemSet::CellUpdate),
+            );
         } else {
-            app.add_systems(Update, handle_cells::<C, S>);
+            app.add_systems(
+                Update,
+                handle_cells::<C, S>.in_set(LifeSystemSet::CellUpdate),
+            );
         }
 
         #[cfg(feature = "auto-coloring")]

diff --git a/src/systems/cells.rs b/src/systems/cells.rs
@@ -42,14 +42,14 @@ pub fn handle_cells<C, S>(
         query.par_iter().for_each(|(entity, cell, state)| {
             if let Some(new_state) = handle_cell((cell, state), &map) {
                 par_commands.command_scope(|mut cmd| {
-                    cmd.entity(entity).insert(new_state);
+                    cmd.entity(entity).try_insert(new_state);
                 });
             }
         });
     } else {
         for (entity, cell, state) in query.iter() {
             if let Some(new_state) = handle_cell((cell, state), &map) {
-                commands.entity(entity).insert(new_state);
+                commands.entity(entity).try_insert(new_state);
             }
         }
     }