Bevy 0.12 (#14)

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)

Cargo.toml

@@ -19,13 +19,13 @@ debug = ["bevy/bevy_gizmos", "bevy/bevy_render"]
 [dependencies]
 
 [dependencies.bevy]
-version = "0.11"
+version = "0.12"
 default-features = false
 
 [dev-dependencies]
 
 [dev-dependencies.bevy]
-version = "0.11"
+version = "0.12"
 features = ["bevy_render", "bevy_winit", "x11", "bevy_core_pipeline", "bevy_sprite", "bevy_pbr"]
 default-features = false
 

src/lib.rs

@@ -49,14 +49,13 @@
 )]
 
 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_fixed_timer};
+use bevy::{log, prelude::*, time::common_conditions::on_timer};
 use std::time::Duration;
 use systems::{
     points::update_points,
@@ -65,33 +64,27 @@ 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<f64>,
 }
 
 impl Plugin for VerletPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<VerletConfig>();
+        let system_set = (update_points, update_sticks, handle_stick_constraints).chain();
         if let Some(step) = self.time_step {
             app.add_systems(
                 FixedUpdate,
-                (update_points, update_sticks, handle_stick_constraints)
-                    .chain()
-                    .run_if(on_fixed_timer(Duration::from_secs_f64(step))),
+                system_set.run_if(on_timer(Duration::from_secs_f64(step))),
             );
-            app.insert_resource(VerletTimeStep::FixedDeltaTime(step));
         } else {
-            app.add_systems(
-                Update,
-                (update_points, update_sticks, handle_stick_constraints).chain(),
-            );
-            app.insert_resource(VerletTimeStep::DeltaTime);
+            app.add_systems(FixedUpdate, system_set);
         };
         #[cfg(feature = "debug")]
         {

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,22 +18,17 @@ fn update_point(
 
 #[allow(clippy::needless_pass_by_value, clippy::cast_possible_truncation)]
 pub fn update_points(
-    time_step: Res<VerletTimeStep>,
     mut points_query: Query<(&mut Transform, &mut VerletPoint), Without<VerletLocked>>,
     time: Res<Time>,
     config: Res<VerletConfig>,
 ) {
-    let delta_time = match &*time_step {
-        VerletTimeStep::DeltaTime => time.delta_seconds(),
-        VerletTimeStep::FixedDeltaTime(dt) => (*dt * *dt) as f32,
-    };
-    let gravity = config.gravity * delta_time;
+    let gravity = config.gravity * time.delta_seconds();
     let friction = config.friction_coefficient();
 
     if config.parallel_processing {
         points_query
             .par_iter_mut()
-            .for_each_mut(|(mut transform, mut point)| {
+            .for_each(|(mut transform, mut point)| {
                 update_point(&mut transform, &mut point, gravity, friction);
             });
     } else {