core: remove redundant system set

philiplinden · Jan 12, 2025 · 2f671df · 2f671df
1 parent 2ac04de
commit 2f671df
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 29 deletions.
diff --git a/crates/yahs/src/core.rs b/crates/yahs/src/core.rs
@@ -29,18 +29,6 @@ impl Plugin for CorePhysicsPlugin {
             time::TimeScalePlugin,
         ));
         app.init_state::<SimState>();
-        app.configure_sets(
-            Update,
-            (
-                SimulationUpdateOrder::First,
-                SimulationUpdateOrder::IdealGas,
-                SimulationUpdateOrder::MeshVolumes,
-                SimulationUpdateOrder::Forces,
-                SimulationUpdateOrder::Last,
-            ).chain()
-                .before(PhysicsSet::Prepare)
-                .run_if(in_state(SimState::Running)),
-        );
     }
 }
 
@@ -52,12 +40,3 @@ pub enum SimState {
     Running,
     Faulted,
 }
-
-#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
-pub enum SimulationUpdateOrder {
-    First,
-    IdealGas,
-    MeshVolumes,
-    Forces,
-    Last,
-}
diff --git a/crates/yahs/src/forces/mod.rs b/crates/yahs/src/forces/mod.rs
@@ -14,7 +14,7 @@ pub use body::{Buoyancy, Weight};
 use crate::{
     gas::Atmosphere,
     vehicle::Balloon,
-    core::{SimState, SimulationUpdateOrder},
+    core::SimState,
     thermodynamics::{Density, Volume},
 };
 pub struct ForcesPlugin;

diff --git a/crates/yahs/src/gas/atmosphere.rs b/crates/yahs/src/gas/atmosphere.rs
@@ -11,7 +11,7 @@ use bevy::prelude::*;
 use super::{ideal_gas_density, GasSpecies};
 use crate::{
     thermodynamics::{Density, Pressure, Temperature},
-    core::{SimulationUpdateOrder, SimState},
+    core::SimState,
     vehicle::Balloon,
 };
 
@@ -21,7 +21,7 @@ impl Plugin for AtmospherePlugin {
         app.insert_resource(Atmosphere);
         app.add_systems(
             Update,
-            pause_on_out_of_bounds.in_set(SimulationUpdateOrder::First),
+            pause_on_out_of_bounds,
         );
     }
 }

diff --git a/crates/yahs/src/gas/ideal_gas.rs b/crates/yahs/src/gas/ideal_gas.rs
@@ -5,7 +5,6 @@ use bevy::prelude::*;
 
 use crate::{
     gas::Atmosphere,
-    core::SimulationUpdateOrder,
     thermodynamics::{
         Density, MolarMass, Pressure, Temperature, Volume, AVOGADRO_CONSTANT, BOLTZMANN_CONSTANT,
     },
@@ -24,7 +23,6 @@ impl Plugin for IdealGasPlugin {
                 update_ideal_gas_from_atmosphere,
                 sync_ideal_gas_with_physics_mass,
             )
-                .in_set(SimulationUpdateOrder::IdealGas),
         );
     }
 }

diff --git a/crates/yahs/src/lib.rs b/crates/yahs/src/lib.rs
@@ -8,7 +8,7 @@ mod time;
 mod trajectory;
 mod spawn;
 pub mod prelude {
-    pub use crate::core::{SimulatorPlugins, SimState, SimulationUpdateOrder};
+    pub use crate::core::{SimulatorPlugins, SimState};
     pub use crate::thermodynamics::{Density, Pressure, Temperature, Volume, MolarMass};
     pub use crate::forces::{Weight, Buoyancy, Drag, Force};
     pub use crate::vehicle::{Balloon, BalloonBundle, BalloonMaterial, BalloonPlugin};

diff --git a/crates/yahs/src/vehicle/balloon.rs b/crates/yahs/src/vehicle/balloon.rs
@@ -6,7 +6,6 @@ use bevy::prelude::*;
 use crate::{
     gas::IdealGas,
     thermodynamics::{sphere_radius_from_volume, Volume},
-    core::SimulationUpdateOrder,
     forces::{Weight, Drag, Buoyancy},
 };
 
@@ -20,7 +19,7 @@ impl Plugin for BalloonPlugin {
 
         app.add_systems(
             Update,
-            update_balloon_from_gas.in_set(SimulationUpdateOrder::MeshVolumes),
+            update_balloon_from_gas,
         );
     }
 }