From 8b8078d1d02abaec317bbafe620a51c652159ff9 Mon Sep 17 00:00:00 2001 From: Jakob Hellermann Date: Thu, 2 Mar 2023 20:04:03 +0000 Subject: [PATCH] single parent set for transform propagate (#7869) # Objective - have no system belonging to multiple sets go from ![before](https://user-images.githubusercontent.com/22177966/222439644-7cf2f84e-0839-4703-a7b4-66ffe92c6aa1.png) to ![after](https://user-images.githubusercontent.com/22177966/222439747-37872d59-6b8e-4fff-a579-6d40c38f73d3.png) ## Solution - `propagate_transforms in PropagateTransformSets in TransformSystem::TransformPropagate` instead of ``` propagate_transforms in PropagateTransformSets propagate_transforms in TransformSystem::TransformPropagate PropagateTransformsSet is free ``` Co-authored-by: Jakob Hellermann --- crates/bevy_transform/src/lib.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/crates/bevy_transform/src/lib.rs b/crates/bevy_transform/src/lib.rs index 4ebbc43f0c..e45c648f72 100644 --- a/crates/bevy_transform/src/lib.rs +++ b/crates/bevy_transform/src/lib.rs @@ -100,6 +100,7 @@ impl Plugin for TransformPlugin { .add_plugin(ValidParentCheckPlugin::::default()) // add transform systems to startup so the first update is "correct" .configure_set(TransformSystem::TransformPropagate.in_base_set(CoreSet::PostUpdate)) + .configure_set(PropagateTransformsSet.in_set(TransformSystem::TransformPropagate)) .edit_schedule(CoreSchedule::Startup, |schedule| { schedule.configure_set( TransformSystem::TransformPropagate.in_base_set(StartupSet::PostStartup), @@ -113,20 +114,12 @@ impl Plugin for TransformPlugin { .in_set(TransformSystem::TransformPropagate) .ambiguous_with(PropagateTransformsSet), ) - .add_startup_system( - propagate_transforms - .in_set(TransformSystem::TransformPropagate) - .in_set(PropagateTransformsSet), - ) + .add_startup_system(propagate_transforms.in_set(PropagateTransformsSet)) .add_system( sync_simple_transforms .in_set(TransformSystem::TransformPropagate) .ambiguous_with(PropagateTransformsSet), ) - .add_system( - propagate_transforms - .in_set(TransformSystem::TransformPropagate) - .in_set(PropagateTransformsSet), - ); + .add_system(propagate_transforms.in_set(PropagateTransformsSet)); } }