Merge branch 'master' into bevy-0.10

dimforge · Mar 7, 2023 · 4fd45d7 · 4fd45d7
2 parents d3a53b7 + 7f0a612
commit 4fd45d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/bevy_rapier2d/Cargo.toml b/bevy_rapier2d/Cargo.toml
@@ -6,7 +6,7 @@ description = "2-dimensional physics engine in Rust, official Bevy plugin."
 documentation = "http://docs.rs/bevy_rapier2d"
 homepage = "http://rapier.rs"
 repository = "https://github.com/dimforge/bevy_rapier"
-readme = "README.md"
+readme = "../README.md"
 keywords = [ "physics", "dynamics", "rigid", "real-time", "joints" ]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/bevy_rapier3d/Cargo.toml b/bevy_rapier3d/Cargo.toml
@@ -6,7 +6,7 @@ description = "3-dimensional physics engine in Rust, official Bevy plugin."
 documentation = "http://docs.rs/bevy_rapier3d"
 homepage = "http://rapier.rs"
 repository = "https://github.com/dimforge/bevy_rapier"
-readme = "README.md"
+readme = "../README.md"
 keywords = [ "physics", "dynamics", "rigid", "real-time", "joints" ]
 license = "Apache-2.0"
 edition = "2021"

diff --git a/src/plugin/plugin.rs b/src/plugin/plugin.rs
@@ -10,9 +10,9 @@ use std::marker::PhantomData;
 pub type NoUserData = ();
 
 /// A plugin responsible for setting up a full Rapier physics simulation pipeline and resources.
-//
-// This will automatically setup all the resources needed to run a physics simulation with the
-// Rapier physics engine.
+///
+/// This will automatically setup all the resources needed to run a physics simulation with the
+/// Rapier physics engine.
 pub struct RapierPhysicsPlugin<PhysicsHooks = ()> {
     physics_scale: f32,
     default_system_setup: bool,
@@ -67,7 +67,9 @@ where
 
         match set {
             PhysicsSet::SyncBackend => (
+                // Run the character controller before the manual transform propagation.
                 systems::update_character_controls,
+                // Run Bevy transform propagation additionally to sync [`GlobalTransform`]
                 bevy::transform::systems::sync_simple_transforms
                     .in_set(RapierTransformPropagateSet)
                     .after(systems::update_character_controls),