bevy_transform: Use Changed in the query for much faster transform_pr…

…opagate_system
bevyengine · Mar 11, 2022 · 59ef108 · 59ef108
1 parent 5af7464
commit 59ef108
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/crates/bevy_transform/src/transform_propagate_system.rs b/crates/bevy_transform/src/transform_propagate_system.rs
@@ -1,24 +1,32 @@
 use crate::components::{Children, GlobalTransform, Parent, Transform};
 use bevy_ecs::{
     entity::Entity,
-    query::{Changed, With, Without},
+    prelude::Changed,
+    query::{With, Without},
     system::Query,
 };
 
 /// Update [`GlobalTransform`] component of entities based on entity hierarchy and
 /// [`Transform`] component.
 pub fn transform_propagate_system(
     mut root_query: Query<
-        (Entity, Option<&Children>, &Transform, &mut GlobalTransform),
+        (
+            Option<&Children>,
+            &Transform,
+            Changed<Transform>,
+            &mut GlobalTransform,
+        ),
         Without<Parent>,
     >,
-    mut transform_query: Query<(&Transform, &mut GlobalTransform), With<Parent>>,
-    changed_transform_query: Query<Entity, Changed<Transform>>,
+    mut transform_query: Query<
+        (&Transform, Changed<Transform>, &mut GlobalTransform),
+        With<Parent>,
+    >,
     children_query: Query<Option<&Children>, (With<Parent>, With<GlobalTransform>)>,
 ) {
-    for (entity, children, transform, mut global_transform) in root_query.iter_mut() {
+    for (children, transform, transform_changed, mut global_transform) in root_query.iter_mut() {
         let mut changed = false;
-        if changed_transform_query.get(entity).is_ok() {
+        if transform_changed {
             *global_transform = GlobalTransform::from(*transform);
             changed = true;
         }
@@ -27,7 +35,6 @@ pub fn transform_propagate_system(
             for child in children.0.iter() {
                 propagate_recursive(
                     &global_transform,
-                    &changed_transform_query,
                     &mut transform_query,
                     &children_query,
                     *child,
@@ -40,16 +47,19 @@ pub fn transform_propagate_system(
 
 fn propagate_recursive(
     parent: &GlobalTransform,
-    changed_transform_query: &Query<Entity, Changed<Transform>>,
-    transform_query: &mut Query<(&Transform, &mut GlobalTransform), With<Parent>>,
+    transform_query: &mut Query<
+        (&Transform, Changed<Transform>, &mut GlobalTransform),
+        With<Parent>,
+    >,
     children_query: &Query<Option<&Children>, (With<Parent>, With<GlobalTransform>)>,
     entity: Entity,
     mut changed: bool,
 ) {
-    changed |= changed_transform_query.get(entity).is_ok();
-
     let global_matrix = {
-        if let Ok((transform, mut global_transform)) = transform_query.get_mut(entity) {
+        if let Ok((transform, transform_changed, mut global_transform)) =
+            transform_query.get_mut(entity)
+        {
+            changed |= transform_changed;
             if changed {
                 *global_transform = parent.mul_transform(*transform);
             }
@@ -63,7 +73,6 @@ fn propagate_recursive(
         for child in children.0.iter() {
             propagate_recursive(
                 &global_matrix,
-                changed_transform_query,
                 transform_query,
                 children_query,
                 *child,