Put ParticleSpawnerData in ParticleSpawnerBundle

rparrett · Mar 27, 2024 · d33aa0a · d33aa0a
1 parent 3b8804a
commit d33aa0a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/src/core.rs b/src/core.rs
@@ -171,15 +171,21 @@ pub struct ParticleSpawnerBundle {
     settings: ParticleSpawnerSettings,
     mesh: Handle<Mesh>,
     name: Name,
+    data: ParticleSpawnerData,
+    no_batching: NoAutomaticBatching,
 }
 
 impl ParticleSpawnerBundle {
     pub fn from_settings(settings: ParticleSpawnerSettings) -> Self {
+        let data = ParticleSpawnerData::from(&settings);
+
         Self {
             settings,
             spatial: SpatialBundle::default(),
             mesh: DEFAULT_MESH.clone(),
             name: Name::new("Particle System"),
+            data,
+            no_batching: NoAutomaticBatching,
         }
     }
 }
@@ -212,18 +218,6 @@ impl Default for EffectModifier {
     }
 }
 
-pub fn create_spawner_data(
-    mut commands: Commands,
-    mut spawners: Query<(Entity, &ParticleSpawnerSettings), Without<ParticleSpawnerData>>,
-) {
-    for (entity, settings) in &mut spawners {
-        commands
-            .entity(entity)
-            .insert(ParticleSpawnerData::from(settings))
-            .insert(NoAutomaticBatching);
-    }
-}
-
 pub fn sync_spawner_data(
     mut spawners: Query<
         (&ParticleSpawnerSettings, &mut ParticleSpawnerData),

diff --git a/src/plugin.rs b/src/plugin.rs
@@ -2,8 +2,8 @@ use crate::core::setup_default_mesh;
 
 use super::{
     core::{
-        create_spawner_data, propagate_particle_spawner_modifier, spawn_particles,
-        sync_spawner_data, update_particles, ParticleSpawnerSettings,
+        propagate_particle_spawner_modifier, spawn_particles, sync_spawner_data, update_particles,
+        ParticleSpawnerSettings,
     },
     render,
 };
@@ -34,7 +34,7 @@ impl Plugin for ParticleSystemPlugin {
                 Update,
                 (
                     apply_deferred,
-                    (create_spawner_data, propagate_particle_spawner_modifier),
+                    propagate_particle_spawner_modifier,
                     apply_deferred,
                     sync_spawner_data,
                     #[cfg(feature = "physics_xpbd")]