Parallel Transform Propagation

crates/bevy_transform/Cargo.toml

@@ -12,8 +12,11 @@ keywords = ["bevy"]
 # bevy
 bevy_app = { path = "../bevy_app", version = "0.16.0-dev", default-features = false, optional = true }
 bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev", default-features = false, optional = true }
+bevy_log = { path = "../bevy_log", version = "0.16.0-dev", default-features = false }
 bevy_math = { path = "../bevy_math", version = "0.16.0-dev", default-features = false }
 bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev", default-features = false, optional = true }
+bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-dev", default-features = false }
+bevy_utils = { path = "../bevy_utils", version = "0.16.0-dev", default-features = false }
 serde = { version = "1", default-features = false, features = [
   "derive",
 ], optional = true }

crates/bevy_transform/src/plugins.rs

@@ -1,4 +1,6 @@
-use crate::systems::{propagate_transforms, sync_simple_transforms};
+use crate::systems::{
+    compute_transform_leaves, propagate_parent_transforms, sync_simple_transforms,
+};
 use bevy_app::{App, Plugin, PostStartup, PostUpdate};
 use bevy_ecs::schedule::{IntoSystemConfigs, IntoSystemSetConfigs, SystemSet};
 
@@ -31,28 +33,27 @@ impl Plugin for TransformPlugin {
         // add transform systems to startup so the first update is "correct"
         .add_systems(
             PostStartup,
-            (
-                sync_simple_transforms
-                    .in_set(TransformSystem::TransformPropagate)
-                    // FIXME: https://github.com/bevyengine/bevy/issues/4381
-                    // These systems cannot access the same entities,
-                    // due to subtle query filtering that is not yet correctly computed in the ambiguity detector
-                    .ambiguous_with(PropagateTransformsSet),
-                propagate_transforms.in_set(PropagateTransformsSet),
-            ),
+            ((
+                sync_simple_transforms,
+                propagate_parent_transforms,
+                compute_transform_leaves,
+            )
+                .chain()
+                .in_set(PropagateTransformsSet),),
         )
         .configure_sets(
             PostUpdate,
             PropagateTransformsSet.in_set(TransformSystem::TransformPropagate),
         )
         .add_systems(
             PostUpdate,
-            (
-                sync_simple_transforms
-                    .in_set(TransformSystem::TransformPropagate)
-                    .ambiguous_with(PropagateTransformsSet),
-                propagate_transforms.in_set(PropagateTransformsSet),
-            ),
+            ((
+                sync_simple_transforms,
+                propagate_parent_transforms,
+                compute_transform_leaves,
+            )
+                .chain()
+                .in_set(PropagateTransformsSet),),
         );
     }
 }