diff --git a/CHANGELOG.md b/CHANGELOG.md index f86f308..2adaa5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Bevy 0.12 support (#14) +* Verlet physics always happens on `FixedUpdate` schedule (#12) + ## 0.6.1 * Performance improvements (#12) diff --git a/src/resources/config.rs b/src/config.rs similarity index 100% rename from src/resources/config.rs rename to src/config.rs diff --git a/src/lib.rs b/src/lib.rs index 750b3be..78cfc26 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -49,13 +49,12 @@ )] pub use components::*; -pub use resources::*; +pub use config::*; mod components; -mod resources; +mod config; mod systems; -use crate::verlet_time_step::VerletTimeStep; use bevy::{log, prelude::*, time::common_conditions::on_timer}; use std::time::Duration; use systems::{ @@ -65,13 +64,13 @@ use systems::{ /// Prelude pub mod prelude { - pub use crate::{components::*, resources::*, VerletPlugin}; + pub use crate::{components::*, config::*, VerletPlugin}; } /// Plugin for Verlet physics #[derive(Debug, Copy, Clone, Default)] pub struct VerletPlugin { /// Custom time step in seconds for verlet physics, if set to `None` physics - /// will run every frame + /// will run every [`FixedUpdate`] frame pub time_step: Option, } @@ -84,10 +83,8 @@ impl Plugin for VerletPlugin { FixedUpdate, system_set.run_if(on_timer(Duration::from_secs_f64(step))), ); - app.insert_resource(VerletTimeStep::FixedDeltaTime(step)); } else { app.add_systems(FixedUpdate, system_set); - app.insert_resource(VerletTimeStep::DeltaTime); }; #[cfg(feature = "debug")] { diff --git a/src/resources/mod.rs b/src/resources/mod.rs deleted file mode 100644 index 84e0eb6..0000000 --- a/src/resources/mod.rs +++ /dev/null @@ -1,4 +0,0 @@ -pub use config::*; - -mod config; -pub(crate) mod verlet_time_step; diff --git a/src/resources/verlet_time_step.rs b/src/resources/verlet_time_step.rs deleted file mode 100644 index 7c63aec..0000000 --- a/src/resources/verlet_time_step.rs +++ /dev/null @@ -1,7 +0,0 @@ -use bevy::ecs::prelude::Resource; - -#[derive(Debug, Clone, Resource)] -pub enum VerletTimeStep { - DeltaTime, - FixedDeltaTime(f64), -} diff --git a/src/systems/points.rs b/src/systems/points.rs index eeaa2bb..dc895b7 100644 --- a/src/systems/points.rs +++ b/src/systems/points.rs @@ -1,6 +1,6 @@ use crate::{ components::{VerletLocked, VerletPoint}, - resources::{verlet_time_step::VerletTimeStep, VerletConfig}, + config::VerletConfig, }; use bevy::prelude::*; @@ -18,16 +18,11 @@ fn update_point( #[allow(clippy::needless_pass_by_value, clippy::cast_possible_truncation)] pub fn update_points( - time_step: Res, mut points_query: Query<(&mut Transform, &mut VerletPoint), Without>, time: Res