From 8fbbaaee6a359dab36e50d1cef22dd71da099407 Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Wed, 8 Mar 2023 23:31:41 -0500 Subject: [PATCH 01/11] prefer `add_systems` --- .../bevy_ecs/scheduling/run_condition.rs | 52 ++++++++++--------- .../bevy_ecs/scheduling/running_systems.rs | 15 ++---- .../benches/bevy_ecs/scheduling/schedule.rs | 4 +- crates/bevy_app/src/lib.rs | 30 ++++++----- crates/bevy_asset/src/asset_server.rs | 6 ++- crates/bevy_asset/src/assets.rs | 6 ++- crates/bevy_core_pipeline/src/bloom/mod.rs | 10 ++-- crates/bevy_core_pipeline/src/core_2d/mod.rs | 8 +-- crates/bevy_core_pipeline/src/core_3d/mod.rs | 12 ++--- crates/bevy_ecs/examples/change_detection.rs | 14 ++--- crates/bevy_ecs/examples/events.rs | 6 ++- crates/bevy_ecs/examples/resources.rs | 3 +- crates/bevy_ecs/src/schedule/mod.rs | 33 ++++++------ crates/bevy_ecs/src/system/mod.rs | 16 +++--- crates/bevy_ecs/src/system/system_param.rs | 9 ++-- crates/bevy_pbr/src/lib.rs | 32 ++++-------- crates/bevy_pbr/src/material.rs | 10 ++-- crates/bevy_pbr/src/prepass/mod.rs | 12 ++--- crates/bevy_pbr/src/render/mesh.rs | 8 +-- crates/bevy_render/src/camera/projection.rs | 9 ++-- crates/bevy_render/src/lib.rs | 28 +++++----- crates/bevy_render/src/render_asset.rs | 6 ++- crates/bevy_render/src/view/mod.rs | 6 +-- crates/bevy_render/src/view/visibility/mod.rs | 14 ++--- crates/bevy_sprite/src/mesh2d/material.rs | 8 +-- crates/bevy_sprite/src/mesh2d/mesh.rs | 8 +-- crates/bevy_transform/src/lib.rs | 18 +++---- crates/bevy_transform/src/systems.rs | 15 ++---- crates/bevy_ui/src/accessibility.rs | 5 +- crates/bevy_ui/src/lib.rs | 8 ++- crates/bevy_ui/src/render/mod.rs | 8 +-- crates/bevy_winit/src/accessibility.rs | 10 ++-- examples/2d/bloom_2d.rs | 3 +- examples/2d/mesh2d_manual.rs | 6 ++- examples/2d/move_sprite.rs | 3 +- examples/2d/pixel_perfect.rs | 3 +- examples/2d/sprite_sheet.rs | 3 +- examples/2d/text2d.rs | 10 ++-- examples/2d/texture_atlas.rs | 8 +-- examples/3d/3d_shapes.rs | 3 +- examples/3d/atmospheric_fog.rs | 4 +- examples/3d/blend_modes.rs | 3 +- examples/3d/bloom_3d.rs | 8 +-- examples/3d/fog.rs | 4 +- examples/3d/fxaa.rs | 3 +- examples/3d/lighting.rs | 4 +- examples/3d/load_gltf.rs | 3 +- examples/3d/msaa.rs | 3 +- examples/3d/parenting.rs | 3 +- examples/3d/pbr.rs | 3 +- examples/3d/render_to_texture.rs | 4 +- examples/3d/shadow_biases.rs | 12 +++-- examples/3d/shadow_caster_receiver.rs | 4 +- examples/3d/skybox.rs | 12 +++-- examples/3d/split_screen.rs | 3 +- examples/3d/spotlight.rs | 4 +- examples/3d/tonemapping.rs | 22 ++++---- examples/3d/update_gltf_scene.rs | 3 +- examples/animation/animated_fox.rs | 8 +-- examples/animation/custom_skinned_mesh.rs | 3 +- examples/animation/gltf_skinned_mesh.rs | 3 +- examples/asset/custom_asset.rs | 3 +- examples/async_tasks/async_compute.rs | 4 +- .../external_source_external_thread.rs | 5 +- examples/audio/audio_control.rs | 5 +- examples/audio/spatial_audio_2d.rs | 3 +- examples/audio/spatial_audio_3d.rs | 3 +- examples/diagnostics/custom_diagnostic.rs | 3 +- examples/ecs/apply_system_buffers.rs | 14 ++--- examples/ecs/component_change_detection.rs | 10 ++-- examples/ecs/custom_query_param.rs | 13 +++-- examples/ecs/event.rs | 4 +- examples/ecs/fixed_timestep.rs | 10 ++-- examples/ecs/generic_system.rs | 8 +-- examples/ecs/hierarchy.rs | 3 +- examples/ecs/nondeterministic_system_order.rs | 38 +++++++------- examples/ecs/parallel_query.rs | 4 +- examples/ecs/removal_detection.rs | 8 +-- examples/ecs/run_conditions.rs | 8 +-- examples/ecs/state.rs | 8 +-- examples/ecs/system_param.rs | 3 +- examples/ecs/system_piping.rs | 14 ++--- examples/ecs/timers.rs | 4 +- examples/games/alien_cake_addict.rs | 2 +- examples/games/contributors.rs | 13 ++--- examples/games/game_menu.rs | 11 ++-- examples/input/gamepad_input_events.rs | 3 +- examples/input/text_input.rs | 14 ++--- examples/mobile/src/lib.rs | 6 +-- examples/scene/scene.rs | 4 +- examples/shader/array_texture.rs | 3 +- examples/shader/post_processing.rs | 3 +- examples/shader/shader_instancing.rs | 6 ++- .../shader_material_screenspace_texture.rs | 3 +- examples/shader/shader_prepass.rs | 4 +- examples/stress_tests/bevymark.rs | 14 ++--- .../stress_tests/many_animated_sprites.rs | 10 ++-- examples/stress_tests/many_buttons.rs | 3 +- examples/stress_tests/many_cubes.rs | 4 +- examples/stress_tests/many_foxes.rs | 10 ++-- examples/stress_tests/many_lights.rs | 4 +- examples/stress_tests/many_sprites.rs | 8 +-- examples/stress_tests/text_pipeline.rs | 3 +- examples/tools/gamepad_viewer.rs | 15 +++--- .../tools/scene_viewer/scene_viewer_plugin.rs | 12 ++--- examples/transforms/3d_rotation.rs | 3 +- examples/transforms/scale.rs | 4 +- examples/transforms/transform.rs | 10 ++-- examples/transforms/translation.rs | 3 +- examples/ui/button.rs | 3 +- examples/ui/font_atlas_debug.rs | 4 +- examples/ui/relative_cursor_position.rs | 3 +- examples/ui/text.rs | 4 +- examples/ui/text_debug.rs | 3 +- examples/ui/ui.rs | 3 +- examples/ui/ui_scaling.rs | 8 +-- examples/window/clear_color.rs | 3 +- examples/window/low_power.rs | 12 +++-- examples/window/scale_factor_override.rs | 10 ++-- examples/window/window_resizing.rs | 6 +-- examples/window/window_settings.rs | 12 +++-- tests/how_to_test_systems.rs | 6 +-- tests/window/minimising.rs | 3 +- tests/window/resizing.rs | 11 ++-- 124 files changed, 499 insertions(+), 526 deletions(-) diff --git a/benches/benches/bevy_ecs/scheduling/run_condition.rs b/benches/benches/bevy_ecs/scheduling/run_condition.rs index be6f25a4c7f31..21af1786d4e39 100644 --- a/benches/benches/bevy_ecs/scheduling/run_condition.rs +++ b/benches/benches/bevy_ecs/scheduling/run_condition.rs @@ -21,12 +21,13 @@ pub fn run_condition_yes(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(yes)); for _ in 0..amount { - schedule - .add_system(empty.run_if(yes)) - .add_system(empty.run_if(yes)) - .add_system(empty.run_if(yes)) - .add_system(empty.run_if(yes)) - .add_system(empty.run_if(yes)); + schedule.add_systems(( + empty.run_if(yes), + empty.run_if(yes), + empty.run_if(yes), + empty.run_if(yes), + empty.run_if(yes), + )); } // run once to initialize systems schedule.run(&mut world); @@ -49,12 +50,13 @@ pub fn run_condition_no(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(no)); for _ in 0..amount { - schedule - .add_system(empty.run_if(no)) - .add_system(empty.run_if(no)) - .add_system(empty.run_if(no)) - .add_system(empty.run_if(no)) - .add_system(empty.run_if(no)); + schedule.add_systems(( + empty.run_if(no), + empty.run_if(no), + empty.run_if(no), + empty.run_if(no), + empty.run_if(no), + )); } // run once to initialize systems schedule.run(&mut world); @@ -84,12 +86,13 @@ pub fn run_condition_yes_with_query(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(yes_with_query)); for _ in 0..amount { - schedule - .add_system(empty.run_if(yes_with_query)) - .add_system(empty.run_if(yes_with_query)) - .add_system(empty.run_if(yes_with_query)) - .add_system(empty.run_if(yes_with_query)) - .add_system(empty.run_if(yes_with_query)); + schedule.add_systems(( + empty.run_if(yes_with_query), + empty.run_if(yes_with_query), + empty.run_if(yes_with_query), + empty.run_if(yes_with_query), + empty.run_if(yes_with_query), + )); } // run once to initialize systems schedule.run(&mut world); @@ -116,12 +119,13 @@ pub fn run_condition_yes_with_resource(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(yes_with_resource)); for _ in 0..amount { - schedule - .add_system(empty.run_if(yes_with_resource)) - .add_system(empty.run_if(yes_with_resource)) - .add_system(empty.run_if(yes_with_resource)) - .add_system(empty.run_if(yes_with_resource)) - .add_system(empty.run_if(yes_with_resource)); + schedule.add_systems(( + empty.run_if(yes_with_resource), + empty.run_if(yes_with_resource), + empty.run_if(yes_with_resource), + empty.run_if(yes_with_resource), + empty.run_if(yes_with_resource), + )); } // run once to initialize systems schedule.run(&mut world); diff --git a/benches/benches/bevy_ecs/scheduling/running_systems.rs b/benches/benches/bevy_ecs/scheduling/running_systems.rs index 9206bd285fcf4..99a0827c2a6c5 100644 --- a/benches/benches/bevy_ecs/scheduling/running_systems.rs +++ b/benches/benches/bevy_ecs/scheduling/running_systems.rs @@ -35,12 +35,7 @@ pub fn empty_systems(criterion: &mut Criterion) { for amount in 1..21 { let mut schedule = Schedule::new(); for _ in 0..amount { - schedule - .add_system(empty) - .add_system(empty) - .add_system(empty) - .add_system(empty) - .add_system(empty); + schedule.add_systems((empty, empty, empty, empty, empty)); } schedule.run(&mut world); group.bench_function(&format!("{:03}_systems", 5 * amount), |bencher| { @@ -79,9 +74,9 @@ pub fn busy_systems(criterion: &mut Criterion) { world.spawn_batch((0..ENTITY_BUNCH).map(|_| (A(0.0), B(0.0), C(0.0), E(0.0)))); for system_amount in 0..5 { let mut schedule = Schedule::new(); - schedule.add_system(ab).add_system(cd).add_system(ce); + schedule.add_systems((ab, cd, ce)); for _ in 0..system_amount { - schedule.add_system(ab).add_system(cd).add_system(ce); + schedule.add_systems((ab, cd, ce)); } schedule.run(&mut world); group.bench_function( @@ -130,9 +125,9 @@ pub fn contrived(criterion: &mut Criterion) { world.spawn_batch((0..ENTITY_BUNCH).map(|_| (C(0.0), D(0.0)))); for system_amount in 0..5 { let mut schedule = Schedule::new(); - schedule.add_system(s_0).add_system(s_1).add_system(s_2); + schedule.add_systems((s_0, s_1, s_2)); for _ in 0..system_amount { - schedule.add_system(s_0).add_system(s_1).add_system(s_2); + schedule.add_systems((s_0, s_1, s_2)); } schedule.run(&mut world); group.bench_function( diff --git a/benches/benches/bevy_ecs/scheduling/schedule.rs b/benches/benches/bevy_ecs/scheduling/schedule.rs index 3117c0fff2bc7..5d2ab876775a2 100644 --- a/benches/benches/bevy_ecs/scheduling/schedule.rs +++ b/benches/benches/bevy_ecs/scheduling/schedule.rs @@ -47,9 +47,7 @@ pub fn schedule(c: &mut Criterion) { world.spawn_batch((0..10000).map(|_| (A(0.0), B(0.0), C(0.0), E(0.0)))); let mut schedule = Schedule::new(); - schedule.add_system(ab); - schedule.add_system(cd); - schedule.add_system(ce); + schedule.add_systems((ab, cd, ce)); schedule.run(&mut world); b.iter(move || schedule.run(&mut world)); diff --git a/crates/bevy_app/src/lib.rs b/crates/bevy_app/src/lib.rs index 8348a7c16e15e..c09e6002f3e96 100644 --- a/crates/bevy_app/src/lib.rs +++ b/crates/bevy_app/src/lib.rs @@ -136,11 +136,13 @@ impl CoreSet { // Create "stage-like" structure using buffer flushes + ordering schedule .set_default_base_set(Update) - .add_system(apply_system_buffers.in_base_set(FirstFlush)) - .add_system(apply_system_buffers.in_base_set(PreUpdateFlush)) - .add_system(apply_system_buffers.in_base_set(UpdateFlush)) - .add_system(apply_system_buffers.in_base_set(PostUpdateFlush)) - .add_system(apply_system_buffers.in_base_set(LastFlush)) + .add_systems(( + apply_system_buffers.in_base_set(FirstFlush), + apply_system_buffers.in_base_set(PreUpdateFlush), + apply_system_buffers.in_base_set(UpdateFlush), + apply_system_buffers.in_base_set(PostUpdateFlush), + apply_system_buffers.in_base_set(LastFlush), + )) .configure_sets( ( First, @@ -197,13 +199,17 @@ impl StartupSet { schedule.set_default_base_set(Startup); // Create "stage-like" structure using buffer flushes + ordering - schedule.add_system(apply_system_buffers.in_base_set(PreStartupFlush)); - schedule.add_system(apply_system_buffers.in_base_set(StartupFlush)); - schedule.add_system(apply_system_buffers.in_base_set(PostStartupFlush)); - - schedule.configure_set(PreStartup.before(PreStartupFlush)); - schedule.configure_set(Startup.after(PreStartupFlush).before(StartupFlush)); - schedule.configure_set(PostStartup.after(StartupFlush).before(PostStartupFlush)); + schedule.add_systems(( + apply_system_buffers.in_base_set(PreStartupFlush), + apply_system_buffers.in_base_set(StartupFlush), + apply_system_buffers.in_base_set(PostStartupFlush), + )); + + schedule.configure_sets(( + PreStartup.before(PreStartupFlush), + Startup.after(PreStartupFlush).before(StartupFlush), + PostStartup.after(StartupFlush).before(PostStartupFlush), + )); schedule } diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index c7eea2916c0a8..dd6a8ae307b7b 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -852,8 +852,10 @@ mod test { let mut app = App::new(); app.insert_resource(assets); app.insert_resource(asset_server); - app.add_system(free_unused_assets_system.in_set(FreeUnusedAssets)); - app.add_system(update_asset_storage_system::.after(FreeUnusedAssets)); + app.add_systems(( + free_unused_assets_system.in_set(FreeUnusedAssets), + update_asset_storage_system::.after(FreeUnusedAssets), + )); fn load_asset(path: AssetPath, world: &World) -> HandleUntyped { let asset_server = world.resource::(); diff --git a/crates/bevy_asset/src/assets.rs b/crates/bevy_asset/src/assets.rs index f0f1a035f6617..40d390187f80d 100644 --- a/crates/bevy_asset/src/assets.rs +++ b/crates/bevy_asset/src/assets.rs @@ -331,8 +331,10 @@ impl AddAsset for App { }; self.insert_resource(assets) - .add_system(Assets::::asset_event_system.in_base_set(AssetSet::AssetEvents)) - .add_system(update_asset_storage_system::.in_base_set(AssetSet::LoadAssets)) + .add_systems(( + Assets::::asset_event_system.in_base_set(AssetSet::AssetEvents), + update_asset_storage_system::.in_base_set(AssetSet::LoadAssets), + )) .register_type::>() .add_event::>() } diff --git a/crates/bevy_core_pipeline/src/bloom/mod.rs b/crates/bevy_core_pipeline/src/bloom/mod.rs index 4653d107653de..5ff8cfba4e376 100644 --- a/crates/bevy_core_pipeline/src/bloom/mod.rs +++ b/crates/bevy_core_pipeline/src/bloom/mod.rs @@ -71,10 +71,12 @@ impl Plugin for BloomPlugin { .init_resource::() .init_resource::>() .init_resource::>() - .add_system(prepare_bloom_textures.in_set(RenderSet::Prepare)) - .add_system(prepare_downsampling_pipeline.in_set(RenderSet::Prepare)) - .add_system(prepare_upsampling_pipeline.in_set(RenderSet::Prepare)) - .add_system(queue_bloom_bind_groups.in_set(RenderSet::Queue)); + .add_systems(( + prepare_bloom_textures.in_set(RenderSet::Prepare), + prepare_downsampling_pipeline.in_set(RenderSet::Prepare), + prepare_upsampling_pipeline.in_set(RenderSet::Prepare), + queue_bloom_bind_groups.in_set(RenderSet::Queue), + )); // Add bloom to the 3d render graph { diff --git a/crates/bevy_core_pipeline/src/core_2d/mod.rs b/crates/bevy_core_pipeline/src/core_2d/mod.rs index 573bf0d5a0f70..a94da4d0b3651 100644 --- a/crates/bevy_core_pipeline/src/core_2d/mod.rs +++ b/crates/bevy_core_pipeline/src/core_2d/mod.rs @@ -52,13 +52,13 @@ impl Plugin for Core2dPlugin { render_app .init_resource::>() - .add_system(extract_core_2d_camera_phases.in_schedule(ExtractSchedule)) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)) - .add_system( + .add_systems(( + extract_core_2d_camera_phases.in_schedule(ExtractSchedule), + sort_phase_system::.in_set(RenderSet::PhaseSort), batch_phase_system:: .after(sort_phase_system::) .in_set(RenderSet::PhaseSort), - ); + )); let pass_node_2d = MainPass2dNode::new(&mut render_app.world); let tonemapping = TonemappingNode::new(&mut render_app.world); diff --git a/crates/bevy_core_pipeline/src/core_3d/mod.rs b/crates/bevy_core_pipeline/src/core_3d/mod.rs index 71cfaf6d402f3..166f6765e0ea2 100644 --- a/crates/bevy_core_pipeline/src/core_3d/mod.rs +++ b/crates/bevy_core_pipeline/src/core_3d/mod.rs @@ -68,15 +68,15 @@ impl Plugin for Core3dPlugin { .init_resource::>() .init_resource::>() .init_resource::>() - .add_system(extract_core_3d_camera_phases.in_schedule(ExtractSchedule)) - .add_system( + .add_systems(( + extract_core_3d_camera_phases.in_schedule(ExtractSchedule), prepare_core_3d_depth_textures .in_set(RenderSet::Prepare) .after(bevy_render::view::prepare_windows), - ) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)); + sort_phase_system::.in_set(RenderSet::PhaseSort), + sort_phase_system::.in_set(RenderSet::PhaseSort), + sort_phase_system::.in_set(RenderSet::PhaseSort), + )); let prepass_node = PrepassNode::new(&mut render_app.world); let pass_node_3d = MainPass3dNode::new(&mut render_app.world); diff --git a/crates/bevy_ecs/examples/change_detection.rs b/crates/bevy_ecs/examples/change_detection.rs index 03a97933184a4..0abbf487a0678 100644 --- a/crates/bevy_ecs/examples/change_detection.rs +++ b/crates/bevy_ecs/examples/change_detection.rs @@ -21,11 +21,13 @@ fn main() { // Add systems to the Schedule to execute our app logic // We can label our systems to force a specific run-order between some of them - schedule.add_system(spawn_entities.in_set(SimulationSystem::Spawn)); - schedule.add_system(print_counter_when_changed.after(SimulationSystem::Spawn)); - schedule.add_system(age_all_entities.in_set(SimulationSystem::Age)); - schedule.add_system(remove_old_entities.after(SimulationSystem::Age)); - schedule.add_system(print_changed_entities.after(SimulationSystem::Age)); + schedule.add_systems(( + spawn_entities.in_set(SimulationSet::Spawn), + print_counter_when_changed.after(SimulationSet::Spawn), + age_all_entities.in_set(SimulationSet::Age), + remove_old_entities.after(SimulationSet::Age), + print_changed_entities.after(SimulationSet::Age), + )); // Simulate 10 frames in our world for iteration in 1..=10 { @@ -48,7 +50,7 @@ struct Age { // System sets can be used to group systems and configured to control relative ordering #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)] -enum SimulationSystem { +enum SimulationSet { Spawn, Age, } diff --git a/crates/bevy_ecs/examples/events.rs b/crates/bevy_ecs/examples/events.rs index b0f96e39a1421..2dae9475cf9e8 100644 --- a/crates/bevy_ecs/examples/events.rs +++ b/crates/bevy_ecs/examples/events.rs @@ -19,8 +19,10 @@ fn main() { schedule.add_system(Events::::update_system.in_set(FlushEvents)); // Add systems sending and receiving events after the events are flushed. - schedule.add_system(sending_system.after(FlushEvents)); - schedule.add_system(receiving_system.after(sending_system)); + schedule.add_systems(( + sending_system.after(FlushEvents), + receiving_system.after(sending_system), + )); // Simulate 10 frames of our world for iteration in 1..=10 { diff --git a/crates/bevy_ecs/examples/resources.rs b/crates/bevy_ecs/examples/resources.rs index a3fd26fc290a5..4030b5fee6b70 100644 --- a/crates/bevy_ecs/examples/resources.rs +++ b/crates/bevy_ecs/examples/resources.rs @@ -15,8 +15,7 @@ fn main() { let mut schedule = Schedule::default(); // Add systems to increase the counter and to print out the current value - schedule.add_system(increase_counter); - schedule.add_system(print_counter.after(increase_counter)); + schedule.add_systems((increase_counter, print_counter).chain()); for iteration in 1..=10 { println!("Simulating frame {iteration}/10"); diff --git a/crates/bevy_ecs/src/schedule/mod.rs b/crates/bevy_ecs/src/schedule/mod.rs index f886d815d1d37..0a5f92a4ddb35 100644 --- a/crates/bevy_ecs/src/schedule/mod.rs +++ b/crates/bevy_ecs/src/schedule/mod.rs @@ -127,13 +127,13 @@ mod tests { world.init_resource::(); - schedule.add_system(named_system); - schedule.add_system(make_function_system(1).before(named_system)); - schedule.add_system( + schedule.add_systems(( + named_system, + make_function_system(1).before(named_system), make_function_system(0) .after(named_system) .in_set(TestSet::A), - ); + )); schedule.run(&mut world); assert_eq!(world.resource::().0, vec![1, u32::MAX, 0]); @@ -144,12 +144,12 @@ mod tests { // modify the schedule after it's been initialized and test ordering with sets schedule.configure_set(TestSet::A.after(named_system)); - schedule.add_system( + schedule.add_systems(( make_function_system(3) .before(TestSet::A) .after(named_system), - ); - schedule.add_system(make_function_system(4).after(TestSet::A)); + make_function_system(4).after(TestSet::A), + )); schedule.run(&mut world); assert_eq!( @@ -275,10 +275,12 @@ mod tests { world.init_resource::(); - schedule.add_system(counting_system.run_if(|| false).run_if(|| false)); - schedule.add_system(counting_system.run_if(|| true).run_if(|| false)); - schedule.add_system(counting_system.run_if(|| false).run_if(|| true)); - schedule.add_system(counting_system.run_if(|| true).run_if(|| true)); + schedule.add_systems(( + counting_system.run_if(|| false).run_if(|| false), + counting_system.run_if(|| true).run_if(|| false), + counting_system.run_if(|| false).run_if(|| true), + counting_system.run_if(|| true).run_if(|| true), + )); schedule.run(&mut world); assert_eq!(world.resource::().0.load(Ordering::Relaxed), 1); @@ -535,8 +537,7 @@ mod tests { let mut schedule = Schedule::new(); // Schedule `bar` to run after `foo`. - schedule.add_system(foo); - schedule.add_system(bar.after(foo)); + schedule.add_systems((foo, bar.after(foo))); // There's only one `foo`, so it's fine. let result = schedule.initialize(&mut world); @@ -790,8 +791,10 @@ mod tests { schedule .set_default_base_set(Base::A) .configure_set(Base::A.before(Base::B)) - .add_system(make_function_system(0).in_base_set(Base::B)) - .add_system(make_function_system(1)); + .add_systems(( + make_function_system(0).in_base_set(Base::B), + make_function_system(1), + )); schedule.run(&mut world); assert_eq!(world.resource::().0, vec![1, 0]); diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index 0e88adf24e81d..753788cad22d1 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -58,9 +58,11 @@ //! # let mut app = Schedule::new(); //! // Prints "Hello, World!" each frame. //! app -//! .add_system(print_first.before(print_mid)) -//! .add_system(print_mid) -//! .add_system(print_last.after(print_mid)); +//! .add_systems(( +//! print_first.before(print_mid), +//! print_mid, +//! print_last.after(print_mid), +//! )); //! # let mut world = World::new(); //! # app.run(&mut world); //! @@ -334,9 +336,11 @@ mod tests { let mut schedule = Schedule::default(); - schedule.add_system(incr_e_on_flip); - schedule.add_system(apply_system_buffers.after(incr_e_on_flip)); - schedule.add_system(World::clear_trackers.after(apply_system_buffers)); + schedule.add_systems(( + incr_e_on_flip, + apply_system_buffers.after(incr_e_on_flip), + World::clear_trackers.after(apply_system_buffers), + )); schedule.run(&mut world); assert_eq!(world.resource::().0, 1); diff --git a/crates/bevy_ecs/src/system/system_param.rs b/crates/bevy_ecs/src/system/system_param.rs index 437a726f4413d..e38a66eb935ff 100644 --- a/crates/bevy_ecs/src/system/system_param.rs +++ b/crates/bevy_ecs/src/system/system_param.rs @@ -402,8 +402,7 @@ impl_param_set!(); /// resource.value = 0; /// assert_eq!(resource.value, 0); /// } -/// # schedule.add_system(read_resource_system); -/// # schedule.add_system(write_resource_system.after(read_resource_system)); +/// # schedule.add_systems((read_resource_system, write_resource_system).chain()); /// # schedule.run(&mut world); /// ``` pub trait Resource: Send + Sync + 'static {} @@ -867,10 +866,8 @@ pub trait SystemBuffer: FromWorld + Send + 'static { /// }); /// /// let mut schedule = Schedule::new(); -/// schedule -/// // These two systems have no conflicts and will run in parallel. -/// .add_system(alert_criminal) -/// .add_system(alert_monster); +/// // These two systems have no conflicts and will run in parallel. +/// schedule.add_systems((alert_criminal, alert_monster)); /// /// // There are no criminals or monsters, so the alarm is not sounded. /// schedule.run(&mut world); diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs index 530a2fa71ee55..a55458d802dac 100644 --- a/crates/bevy_pbr/src/lib.rs +++ b/crates/bevy_pbr/src/lib.rs @@ -188,22 +188,18 @@ impl Plugin for PbrPlugin { .in_base_set(CoreSet::PostUpdate), ) .add_plugin(FogPlugin) - .add_system(add_clusters.in_set(SimulationLightSystems::AddClusters)) - .add_system(apply_system_buffers.in_set(SimulationLightSystems::AddClustersFlush)) - .add_system( + .add_systems(( + add_clusters.in_set(SimulationLightSystems::AddClusters), + apply_system_buffers.in_set(SimulationLightSystems::AddClustersFlush), assign_lights_to_clusters .in_set(SimulationLightSystems::AssignLightsToClusters) .after(TransformSystem::TransformPropagate) .after(VisibilitySystems::CheckVisibility) .after(CameraUpdateSystem), - ) - .add_system( update_directional_light_cascades .in_set(SimulationLightSystems::UpdateDirectionalLightCascades) .after(TransformSystem::TransformPropagate) .after(CameraUpdateSystem), - ) - .add_system( update_directional_light_frusta .in_set(SimulationLightSystems::UpdateLightFrusta) // This must run after CheckVisibility because it relies on ComputedVisibility::is_visible() @@ -214,20 +210,14 @@ impl Plugin for PbrPlugin { // so these systems will run independently of one another. // FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481. .ambiguous_with(update_spot_light_frusta), - ) - .add_system( update_point_light_frusta .in_set(SimulationLightSystems::UpdateLightFrusta) .after(TransformSystem::TransformPropagate) .after(SimulationLightSystems::AssignLightsToClusters), - ) - .add_system( update_spot_light_frusta .in_set(SimulationLightSystems::UpdateLightFrusta) .after(TransformSystem::TransformPropagate) .after(SimulationLightSystems::AssignLightsToClusters), - ) - .add_system( check_light_mesh_visibility .in_set(SimulationLightSystems::CheckLightVisibility) .after(VisibilitySystems::CalculateBoundsFlush) @@ -237,7 +227,7 @@ impl Plugin for PbrPlugin { // because that resets entity ComputedVisibility for the first view // which would override any results from this otherwise .after(VisibilitySystems::CheckVisibility), - ); + )); app.world .resource_mut::>() @@ -267,25 +257,21 @@ impl Plugin for PbrPlugin { ) .in_schedule(ExtractSchedule), ) - .add_system( + .add_systems(( render::prepare_lights .before(ViewSet::PrepareUniforms) .in_set(RenderLightSystems::PrepareLights), - ) - // A sync is needed after prepare_lights, before prepare_view_uniforms, - // because prepare_lights creates new views for shadow mapping - .add_system( + // A sync is needed after prepare_lights, before prepare_view_uniforms, + // because prepare_lights creates new views for shadow mapping apply_system_buffers .in_set(RenderSet::Prepare) .after(RenderLightSystems::PrepareLights) .before(ViewSet::PrepareUniforms), - ) - .add_system( render::prepare_clusters .after(render::prepare_lights) .in_set(RenderLightSystems::PrepareClusters), - ) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)) + sort_phase_system::.in_set(RenderSet::PhaseSort), + )) .init_resource::() .init_resource::() .init_resource::(); diff --git a/crates/bevy_pbr/src/material.rs b/crates/bevy_pbr/src/material.rs index cb57e68f4d0dd..0072474083164 100644 --- a/crates/bevy_pbr/src/material.rs +++ b/crates/bevy_pbr/src/material.rs @@ -199,14 +199,14 @@ where .init_resource::>() .init_resource::>() .init_resource::>>() - .add_system(extract_materials::.in_schedule(ExtractSchedule)) - .add_system( + .add_systems(( + extract_materials::.in_schedule(ExtractSchedule), prepare_materials:: .in_set(RenderSet::Prepare) .after(PrepareAssetSet::PreAssetPrepare), - ) - .add_system(render::queue_shadows::.in_set(RenderLightSystems::QueueShadows)) - .add_system(queue_material_meshes::.in_set(RenderSet::Queue)); + render::queue_shadows::.in_set(RenderLightSystems::QueueShadows), + queue_material_meshes::.in_set(RenderSet::Queue), + )); } // PrepassPipelinePlugin is required for shadow mapping and the optional PrepassPlugin diff --git a/crates/bevy_pbr/src/prepass/mod.rs b/crates/bevy_pbr/src/prepass/mod.rs index 855d1e4ae8e33..b890de737de49 100644 --- a/crates/bevy_pbr/src/prepass/mod.rs +++ b/crates/bevy_pbr/src/prepass/mod.rs @@ -129,15 +129,15 @@ where }; render_app - .add_system(extract_camera_prepass_phase.in_schedule(ExtractSchedule)) - .add_system( + .add_systems(( + extract_camera_prepass_phase.in_schedule(ExtractSchedule), prepare_prepass_textures .in_set(RenderSet::Prepare) .after(bevy_render::view::prepare_windows), - ) - .add_system(queue_prepass_material_meshes::.in_set(RenderSet::Queue)) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)) + queue_prepass_material_meshes::.in_set(RenderSet::Queue), + sort_phase_system::.in_set(RenderSet::PhaseSort), + sort_phase_system::.in_set(RenderSet::PhaseSort), + )) .init_resource::>() .init_resource::>() .add_render_command::>() diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs index 9b1239099bfd8..1faf66bc4c19f 100644 --- a/crates/bevy_pbr/src/render/mesh.rs +++ b/crates/bevy_pbr/src/render/mesh.rs @@ -108,9 +108,11 @@ impl Plugin for MeshRenderPlugin { .init_resource::() .init_resource::() .add_systems((extract_meshes, extract_skinned_meshes).in_schedule(ExtractSchedule)) - .add_system(prepare_skinned_meshes.in_set(RenderSet::Prepare)) - .add_system(queue_mesh_bind_group.in_set(RenderSet::Queue)) - .add_system(queue_mesh_view_bind_groups.in_set(RenderSet::Queue)); + .add_systems(( + prepare_skinned_meshes.in_set(RenderSet::Prepare), + queue_mesh_bind_group.in_set(RenderSet::Queue), + queue_mesh_view_bind_groups.in_set(RenderSet::Queue), + )); } } } diff --git a/crates/bevy_render/src/camera/projection.rs b/crates/bevy_render/src/camera/projection.rs index 34757708f3de1..fd82cd72da44e 100644 --- a/crates/bevy_render/src/camera/projection.rs +++ b/crates/bevy_render/src/camera/projection.rs @@ -1,6 +1,6 @@ use std::marker::PhantomData; -use bevy_app::{App, CoreSchedule, CoreSet, Plugin, StartupSet}; +use bevy_app::{App, CoreSchedule, CoreSet, IntoSystemAppConfig, Plugin, StartupSet}; use bevy_ecs::{prelude::*, reflect::ReflectComponent}; use bevy_math::{Mat4, Rect, Vec2}; use bevy_reflect::{ @@ -31,22 +31,21 @@ impl Plugin for CameraPro schedule.configure_set(CameraUpdateSystem.in_base_set(StartupSet::PostStartup)); }) .configure_set(CameraUpdateSystem.in_base_set(CoreSet::PostUpdate)) - .add_startup_system( + .add_systems(( crate::camera::camera_system:: + .on_startup() .in_set(CameraUpdateSystem) // We assume that each camera will only have one projection, // so we can ignore ambiguities with all other monomorphizations. // FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481. .ambiguous_with(CameraUpdateSystem), - ) - .add_system( crate::camera::camera_system:: .in_set(CameraUpdateSystem) // We assume that each camera will only have one projection, // so we can ignore ambiguities with all other monomorphizations. // FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481. .ambiguous_with(CameraUpdateSystem), - ); + )); } } diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs index 783ee7cdfe447..583858cf17fb9 100644 --- a/crates/bevy_render/src/lib.rs +++ b/crates/bevy_render/src/lib.rs @@ -112,18 +112,22 @@ impl RenderSet { let mut schedule = Schedule::new(); // Create "stage-like" structure using buffer flushes + ordering - schedule.add_system(apply_system_buffers.in_set(PrepareFlush)); - schedule.add_system(apply_system_buffers.in_set(QueueFlush)); - schedule.add_system(apply_system_buffers.in_set(PhaseSortFlush)); - schedule.add_system(apply_system_buffers.in_set(RenderFlush)); - schedule.add_system(apply_system_buffers.in_set(CleanupFlush)); - - schedule.configure_set(ExtractCommands.before(Prepare)); - schedule.configure_set(Prepare.after(ExtractCommands).before(PrepareFlush)); - schedule.configure_set(Queue.after(PrepareFlush).before(QueueFlush)); - schedule.configure_set(PhaseSort.after(QueueFlush).before(PhaseSortFlush)); - schedule.configure_set(Render.after(PhaseSortFlush).before(RenderFlush)); - schedule.configure_set(Cleanup.after(RenderFlush).before(CleanupFlush)); + schedule.add_systems(( + apply_system_buffers.in_set(PrepareFlush), + apply_system_buffers.in_set(QueueFlush), + apply_system_buffers.in_set(PhaseSortFlush), + apply_system_buffers.in_set(RenderFlush), + apply_system_buffers.in_set(CleanupFlush), + )); + + schedule.configure_sets(( + ExtractCommands.before(Prepare), + Prepare.after(ExtractCommands).before(PrepareFlush), + Queue.after(PrepareFlush).before(QueueFlush), + PhaseSort.after(QueueFlush).before(PhaseSortFlush), + Render.after(PhaseSortFlush).before(RenderFlush), + Cleanup.after(RenderFlush).before(CleanupFlush), + )); schedule } diff --git a/crates/bevy_render/src/render_asset.rs b/crates/bevy_render/src/render_asset.rs index 65542e6ea1445..d49471c122225 100644 --- a/crates/bevy_render/src/render_asset.rs +++ b/crates/bevy_render/src/render_asset.rs @@ -92,8 +92,10 @@ impl Plugin for RenderAssetPlugin { .init_resource::>() .init_resource::>() .init_resource::>() - .add_system(extract_render_asset::.in_schedule(ExtractSchedule)) - .add_system(prepare_assets::.in_set(self.prepare_asset_set.clone())); + .add_systems(( + extract_render_asset::.in_schedule(ExtractSchedule), + prepare_assets::.in_set(self.prepare_asset_set.clone()), + )); } } } diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs index 2a15363fdaf31..fa8bf29603723 100644 --- a/crates/bevy_render/src/view/mod.rs +++ b/crates/bevy_render/src/view/mod.rs @@ -56,13 +56,13 @@ impl Plugin for ViewPlugin { render_app .init_resource::() .configure_set(ViewSet::PrepareUniforms.in_set(RenderSet::Prepare)) - .add_system(prepare_view_uniforms.in_set(ViewSet::PrepareUniforms)) - .add_system( + .add_systems(( + prepare_view_uniforms.in_set(ViewSet::PrepareUniforms), prepare_view_targets .after(WindowSystem::Prepare) .in_set(RenderSet::Prepare) .after(crate::render_asset::prepare_assets::), - ); + )); } } } diff --git a/crates/bevy_render/src/view/visibility/mod.rs b/crates/bevy_render/src/view/visibility/mod.rs index ca5e8a9df2503..3163f7a831b37 100644 --- a/crates/bevy_render/src/view/visibility/mod.rs +++ b/crates/bevy_render/src/view/visibility/mod.rs @@ -223,8 +223,8 @@ impl Plugin for VisibilityPlugin { .configure_set(UpdateProjectionFrusta.in_base_set(CoreSet::PostUpdate)) .configure_set(CheckVisibility.in_base_set(CoreSet::PostUpdate)) .configure_set(VisibilityPropagate.in_base_set(CoreSet::PostUpdate)) - .add_system(calculate_bounds.in_set(CalculateBounds)) - .add_system( + .add_systems(( + calculate_bounds.in_set(CalculateBounds), update_frusta:: .in_set(UpdateOrthographicFrusta) .after(camera_system::) @@ -234,8 +234,6 @@ impl Plugin for VisibilityPlugin { // FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481. .ambiguous_with(update_frusta::) .ambiguous_with(update_frusta::), - ) - .add_system( update_frusta:: .in_set(UpdatePerspectiveFrusta) .after(camera_system::) @@ -244,15 +242,11 @@ impl Plugin for VisibilityPlugin { // so these systems will run independently of one another. // FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481. .ambiguous_with(update_frusta::), - ) - .add_system( update_frusta:: .in_set(UpdateProjectionFrusta) .after(camera_system::) .after(TransformSystem::TransformPropagate), - ) - .add_system(visibility_propagate_system.in_set(VisibilityPropagate)) - .add_system( + visibility_propagate_system.in_set(VisibilityPropagate), check_visibility .in_set(CheckVisibility) .after(CalculateBoundsFlush) @@ -261,7 +255,7 @@ impl Plugin for VisibilityPlugin { .after(UpdateProjectionFrusta) .after(VisibilityPropagate) .after(TransformSystem::TransformPropagate), - ); + )); } } diff --git a/crates/bevy_sprite/src/mesh2d/material.rs b/crates/bevy_sprite/src/mesh2d/material.rs index 4982efe381ac1..4ee87cff02ac9 100644 --- a/crates/bevy_sprite/src/mesh2d/material.rs +++ b/crates/bevy_sprite/src/mesh2d/material.rs @@ -161,13 +161,13 @@ where .init_resource::>() .init_resource::>() .init_resource::>>() - .add_system(extract_materials_2d::.in_schedule(ExtractSchedule)) - .add_system( + .add_systems(( + extract_materials_2d::.in_schedule(ExtractSchedule), prepare_materials_2d:: .in_set(RenderSet::Prepare) .after(PrepareAssetSet::PreAssetPrepare), - ) - .add_system(queue_material2d_meshes::.in_set(RenderSet::Queue)); + queue_material2d_meshes::.in_set(RenderSet::Queue), + )); } } } diff --git a/crates/bevy_sprite/src/mesh2d/mesh.rs b/crates/bevy_sprite/src/mesh2d/mesh.rs index 42030fb52bed8..a001b00dc3a8c 100644 --- a/crates/bevy_sprite/src/mesh2d/mesh.rs +++ b/crates/bevy_sprite/src/mesh2d/mesh.rs @@ -103,9 +103,11 @@ impl Plugin for Mesh2dRenderPlugin { render_app .init_resource::() .init_resource::>() - .add_system(extract_mesh2d.in_schedule(ExtractSchedule)) - .add_system(queue_mesh2d_bind_group.in_set(RenderSet::Queue)) - .add_system(queue_mesh2d_view_bind_groups.in_set(RenderSet::Queue)); + .add_systems(( + extract_mesh2d.in_schedule(ExtractSchedule), + queue_mesh2d_bind_group.in_set(RenderSet::Queue), + queue_mesh2d_view_bind_groups.in_set(RenderSet::Queue), + )); } } } diff --git a/crates/bevy_transform/src/lib.rs b/crates/bevy_transform/src/lib.rs index e45c648f7264a..d377d08970b04 100644 --- a/crates/bevy_transform/src/lib.rs +++ b/crates/bevy_transform/src/lib.rs @@ -106,20 +106,20 @@ impl Plugin for TransformPlugin { TransformSystem::TransformPropagate.in_base_set(StartupSet::PostStartup), ); }) - // 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 - .add_startup_system( + .add_startup_systems(( 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), - ) - .add_startup_system(propagate_transforms.in_set(PropagateTransformsSet)) - .add_system( + propagate_transforms.in_set(PropagateTransformsSet), + )) + .add_systems(( sync_simple_transforms .in_set(TransformSystem::TransformPropagate) .ambiguous_with(PropagateTransformsSet), - ) - .add_system(propagate_transforms.in_set(PropagateTransformsSet)); + propagate_transforms.in_set(PropagateTransformsSet), + )); } } diff --git a/crates/bevy_transform/src/systems.rs b/crates/bevy_transform/src/systems.rs index be0613213f4ef..fcc30c56442a4 100644 --- a/crates/bevy_transform/src/systems.rs +++ b/crates/bevy_transform/src/systems.rs @@ -171,8 +171,7 @@ mod test { let mut world = World::default(); let mut schedule = Schedule::new(); - schedule.add_system(sync_simple_transforms); - schedule.add_system(propagate_transforms); + schedule.add_systems((sync_simple_transforms, propagate_transforms)); // Root entity world.spawn(TransformBundle::from(Transform::from_xyz(1.0, 0.0, 0.0))); @@ -210,8 +209,7 @@ mod test { let mut world = World::default(); let mut schedule = Schedule::new(); - schedule.add_system(sync_simple_transforms); - schedule.add_system(propagate_transforms); + schedule.add_systems((sync_simple_transforms, propagate_transforms)); // Root entity let mut queue = CommandQueue::default(); @@ -251,8 +249,7 @@ mod test { let mut world = World::default(); let mut schedule = Schedule::new(); - schedule.add_system(sync_simple_transforms); - schedule.add_system(propagate_transforms); + schedule.add_systems((sync_simple_transforms, propagate_transforms)); // Add parent entities let mut children = Vec::new(); @@ -328,8 +325,7 @@ mod test { let mut app = App::new(); ComputeTaskPool::init(TaskPool::default); - app.add_system(sync_simple_transforms); - app.add_system(propagate_transforms); + app.add_systems((sync_simple_transforms, propagate_transforms)); let translation = vec3(1.0, 0.0, 0.0); @@ -375,8 +371,7 @@ mod test { let mut temp = World::new(); let mut app = App::new(); - app.add_system(propagate_transforms) - .add_system(sync_simple_transforms); + app.add_systems((propagate_transforms, sync_simple_transforms)); fn setup_world(world: &mut World) -> (Entity, Entity) { let mut grandchild = Entity::from_raw(0); diff --git a/crates/bevy_ui/src/accessibility.rs b/crates/bevy_ui/src/accessibility.rs index ee79773189bd1..af576ef2ea99d 100644 --- a/crates/bevy_ui/src/accessibility.rs +++ b/crates/bevy_ui/src/accessibility.rs @@ -149,9 +149,6 @@ pub(crate) struct AccessibilityPlugin; impl Plugin for AccessibilityPlugin { fn build(&self, app: &mut App) { - app.add_system(calc_bounds) - .add_system(button_changed) - .add_system(image_changed) - .add_system(label_changed); + app.add_systems((calc_bounds, button_changed, image_changed, label_changed)); } } diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs index b668c2b9515a4..c8456a7d6bd5f 100644 --- a/crates/bevy_ui/src/lib.rs +++ b/crates/bevy_ui/src/lib.rs @@ -141,17 +141,15 @@ impl Plugin for UiPlugin { system }) - .add_system( + .add_systems(( flex_node_system .in_set(UiSystem::Flex) .before(TransformSystem::TransformPropagate), - ) - .add_system(ui_stack_system.in_set(UiSystem::Stack)) - .add_system( + ui_stack_system.in_set(UiSystem::Stack), update_clipping_system .after(TransformSystem::TransformPropagate) .in_base_set(CoreSet::PostUpdate), - ); + )); crate::render::build_ui_render(app); } diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index 2cfa098d28bb1..853a3776a8c50 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -86,9 +86,11 @@ pub fn build_ui_render(app: &mut App) { ) .in_schedule(ExtractSchedule), ) - .add_system(prepare_uinodes.in_set(RenderSet::Prepare)) - .add_system(queue_uinodes.in_set(RenderSet::Queue)) - .add_system(sort_phase_system::.in_set(RenderSet::PhaseSort)); + .add_systems(( + prepare_uinodes.in_set(RenderSet::Prepare), + queue_uinodes.in_set(RenderSet::Queue), + sort_phase_system::.in_set(RenderSet::PhaseSort), + )); // Render graph let ui_graph_2d = get_ui_graph(render_app); diff --git a/crates/bevy_winit/src/accessibility.rs b/crates/bevy_winit/src/accessibility.rs index fd0f4dc1e4645..68eff9b21462e 100644 --- a/crates/bevy_winit/src/accessibility.rs +++ b/crates/bevy_winit/src/accessibility.rs @@ -163,9 +163,11 @@ impl Plugin for AccessibilityPlugin { app.init_non_send_resource::() .init_resource::() .add_event::() - .add_system(handle_window_focus) - .add_system(window_closed) - .add_system(poll_receivers) - .add_system(update_accessibility_nodes); + .add_systems(( + handle_window_focus, + window_closed, + poll_receivers, + update_accessibility_nodes, + )); } } diff --git a/examples/2d/bloom_2d.rs b/examples/2d/bloom_2d.rs index e46f24c751a85..825f4803bf439 100644 --- a/examples/2d/bloom_2d.rs +++ b/examples/2d/bloom_2d.rs @@ -13,8 +13,7 @@ fn main() { App::new() .insert_resource(ClearColor(Color::DARK_GRAY)) .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(update_bloom_settings) + .add_systems((setup.on_startup(), update_bloom_settings)) .run(); } diff --git a/examples/2d/mesh2d_manual.rs b/examples/2d/mesh2d_manual.rs index 635a19c0ceb21..3425837fe25b3 100644 --- a/examples/2d/mesh2d_manual.rs +++ b/examples/2d/mesh2d_manual.rs @@ -283,8 +283,10 @@ impl Plugin for ColoredMesh2dPlugin { .add_render_command::() .init_resource::() .init_resource::>() - .add_system(extract_colored_mesh2d.in_schedule(ExtractSchedule)) - .add_system(queue_colored_mesh2d.in_set(RenderSet::Queue)); + .add_systems(( + extract_colored_mesh2d.in_schedule(ExtractSchedule), + queue_colored_mesh2d.in_set(RenderSet::Queue), + )); } } diff --git a/examples/2d/move_sprite.rs b/examples/2d/move_sprite.rs index f7e353c266b78..cab129ff9ffa0 100644 --- a/examples/2d/move_sprite.rs +++ b/examples/2d/move_sprite.rs @@ -5,8 +5,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(sprite_movement) + .add_systems((setup.on_startup(), sprite_movement)) .run(); } diff --git a/examples/2d/pixel_perfect.rs b/examples/2d/pixel_perfect.rs index cce3d6135fa30..0496bd9bcc041 100644 --- a/examples/2d/pixel_perfect.rs +++ b/examples/2d/pixel_perfect.rs @@ -5,8 +5,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest())) - .add_startup_system(setup) - .add_system(sprite_movement) + .add_systems((setup.on_startup(), sprite_movement)) .run(); } diff --git a/examples/2d/sprite_sheet.rs b/examples/2d/sprite_sheet.rs index 597737bdb3f31..94d7d0ecd63cf 100644 --- a/examples/2d/sprite_sheet.rs +++ b/examples/2d/sprite_sheet.rs @@ -6,8 +6,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest())) // prevents blurry sprites - .add_startup_system(setup) - .add_system(animate_sprite) + .add_systems((setup.on_startup(), animate_sprite)) .run(); } diff --git a/examples/2d/text2d.rs b/examples/2d/text2d.rs index e920ab5062557..509dfc12c9d48 100644 --- a/examples/2d/text2d.rs +++ b/examples/2d/text2d.rs @@ -13,10 +13,12 @@ use bevy::{ fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(animate_translation) - .add_system(animate_rotation) - .add_system(animate_scale) + .add_systems(( + setup.on_startup(), + animate_translation, + animate_rotation, + animate_scale, + )) .run(); } diff --git a/examples/2d/texture_atlas.rs b/examples/2d/texture_atlas.rs index 678fb7d97be76..8ffabc814121b 100644 --- a/examples/2d/texture_atlas.rs +++ b/examples/2d/texture_atlas.rs @@ -8,9 +8,11 @@ fn main() { .init_resource::() .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest())) // prevents blurry sprites .add_state::() - .add_system(load_textures.in_schedule(OnEnter(AppState::Setup))) - .add_system(check_textures.in_set(OnUpdate(AppState::Setup))) - .add_system(setup.in_schedule(OnEnter(AppState::Finished))) + .add_systems(( + load_textures.in_schedule(OnEnter(AppState::Setup)), + check_textures.in_set(OnUpdate(AppState::Setup)), + setup.in_schedule(OnEnter(AppState::Finished)), + )) .run(); } diff --git a/examples/3d/3d_shapes.rs b/examples/3d/3d_shapes.rs index 5358ca4ed321b..22da05a37c4b4 100644 --- a/examples/3d/3d_shapes.rs +++ b/examples/3d/3d_shapes.rs @@ -11,8 +11,7 @@ use bevy::{ fn main() { App::new() .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest())) - .add_startup_system(setup) - .add_system(rotate) + .add_systems((setup.on_startup(), rotate)) .run(); } diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs index 5766bc7201e3b..1969303ff75bd 100644 --- a/examples/3d/atmospheric_fog.rs +++ b/examples/3d/atmospheric_fog.rs @@ -15,9 +15,7 @@ use bevy::{ fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup_camera_fog) - .add_startup_system(setup_terrain_scene) - .add_startup_system(setup_instructions) + .add_startup_systems((setup_camera_fog, setup_terrain_scene, setup_instructions)) .add_system(toggle_system) .run(); } diff --git a/examples/3d/blend_modes.rs b/examples/3d/blend_modes.rs index 78db84aff93c6..5fe22dfc4a177 100644 --- a/examples/3d/blend_modes.rs +++ b/examples/3d/blend_modes.rs @@ -17,8 +17,7 @@ fn main() { let mut app = App::new(); app.add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(example_control_system); + .add_systems((setup.on_startup(), example_control_system)); // Unfortunately, MSAA and HDR are not supported simultaneously under WebGL. // Since this example uses HDR, we must disable MSAA for WASM builds, at least diff --git a/examples/3d/bloom_3d.rs b/examples/3d/bloom_3d.rs index da922c4b378d1..94fcdf90fd789 100644 --- a/examples/3d/bloom_3d.rs +++ b/examples/3d/bloom_3d.rs @@ -16,9 +16,11 @@ fn main() { App::new() .insert_resource(ClearColor(Color::DARK_GRAY)) .add_plugins(DefaultPlugins) - .add_startup_system(setup_scene) - .add_system(update_bloom_settings) - .add_system(bounce_spheres) + .add_systems(( + setup_scene.on_startup(), + update_bloom_settings, + bounce_spheres, + )) .run(); } diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs index ba9f844c124db..745b828982ddd 100644 --- a/examples/3d/fog.rs +++ b/examples/3d/fog.rs @@ -22,9 +22,7 @@ use bevy::{ fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup_camera_fog) - .add_startup_system(setup_pyramid_scene) - .add_startup_system(setup_instructions) + .add_startup_systems((setup_camera_fog, setup_pyramid_scene, setup_instructions)) .add_system(update_system) .run(); } diff --git a/examples/3d/fxaa.rs b/examples/3d/fxaa.rs index 8873987385ee5..06dad37a4159b 100644 --- a/examples/3d/fxaa.rs +++ b/examples/3d/fxaa.rs @@ -17,8 +17,7 @@ fn main() { // Disable MSAA by default .insert_resource(Msaa::Off) .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(toggle_fxaa) + .add_systems((setup.on_startup(), toggle_fxaa)) .run(); } diff --git a/examples/3d/lighting.rs b/examples/3d/lighting.rs index 3f2dae782dc26..c12ab5d3775d1 100644 --- a/examples/3d/lighting.rs +++ b/examples/3d/lighting.rs @@ -8,9 +8,7 @@ use bevy::{pbr::CascadeShadowConfigBuilder, prelude::*}; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(movement) - .add_system(animate_light_direction) + .add_systems((setup.on_startup(), movement, animate_light_direction)) .run(); } diff --git a/examples/3d/load_gltf.rs b/examples/3d/load_gltf.rs index 216842a8309d2..756bf7653b60b 100644 --- a/examples/3d/load_gltf.rs +++ b/examples/3d/load_gltf.rs @@ -15,8 +15,7 @@ fn main() { }) .insert_resource(DirectionalLightShadowMap { size: 4096 }) .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(animate_light_direction) + .add_systems((setup.on_startup(), animate_light_direction)) .run(); } diff --git a/examples/3d/msaa.rs b/examples/3d/msaa.rs index b3ee49c272a86..a82b352dcd083 100644 --- a/examples/3d/msaa.rs +++ b/examples/3d/msaa.rs @@ -10,8 +10,7 @@ fn main() { App::new() .insert_resource(Msaa::default()) .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(cycle_msaa) + .add_systems((setup.on_startup(), cycle_msaa)) .run(); } diff --git a/examples/3d/parenting.rs b/examples/3d/parenting.rs index 29dc1a4b28e56..5e1cb133dcd5e 100644 --- a/examples/3d/parenting.rs +++ b/examples/3d/parenting.rs @@ -6,8 +6,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(rotator_system) + .add_systems((setup.on_startup(), rotator_system)) .run(); } diff --git a/examples/3d/pbr.rs b/examples/3d/pbr.rs index 89532aee75c06..ccf34966d975d 100644 --- a/examples/3d/pbr.rs +++ b/examples/3d/pbr.rs @@ -5,8 +5,7 @@ use bevy::{asset::LoadState, prelude::*}; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(environment_map_load_finish) + .add_systems((setup.on_startup(), environment_map_load_finish)) .run(); } diff --git a/examples/3d/render_to_texture.rs b/examples/3d/render_to_texture.rs index 7732146097831..28588867af289 100644 --- a/examples/3d/render_to_texture.rs +++ b/examples/3d/render_to_texture.rs @@ -17,9 +17,7 @@ use bevy::{ fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(cube_rotator_system) - .add_system(rotator_system) + .add_systems((setup.on_startup(), cube_rotator_system, rotator_system)) .run(); } diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs index 81b9fbe024b96..f33a1985f0453 100644 --- a/examples/3d/shadow_biases.rs +++ b/examples/3d/shadow_biases.rs @@ -19,11 +19,13 @@ fn main() { ); App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(adjust_point_light_biases) - .add_system(toggle_light) - .add_system(adjust_directional_light_biases) - .add_system(camera_controller) + .add_systems(( + setup.on_startup(), + adjust_point_light_biases, + toggle_light, + adjust_directional_light_biases, + camera_controller, + )) .run(); } diff --git a/examples/3d/shadow_caster_receiver.rs b/examples/3d/shadow_caster_receiver.rs index f8eed512d738b..2efacd0f4e281 100644 --- a/examples/3d/shadow_caster_receiver.rs +++ b/examples/3d/shadow_caster_receiver.rs @@ -16,9 +16,7 @@ fn main() { ); App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(toggle_light) - .add_system(toggle_shadows) + .add_systems((setup.on_startup(), toggle_light, toggle_shadows)) .run(); } diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs index c9dadafd5b8f1..74f149b536bca 100644 --- a/examples/3d/skybox.rs +++ b/examples/3d/skybox.rs @@ -46,11 +46,13 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .add_plugin(MaterialPlugin::::default()) - .add_startup_system(setup) - .add_system(cycle_cubemap_asset) - .add_system(asset_loaded.after(cycle_cubemap_asset)) - .add_system(camera_controller) - .add_system(animate_light_direction) + .add_systems(( + setup.on_startup(), + cycle_cubemap_asset, + asset_loaded.after(cycle_cubemap_asset), + camera_controller, + animate_light_direction, + )) .run(); } diff --git a/examples/3d/split_screen.rs b/examples/3d/split_screen.rs index bb1e67d5a8fd4..2e8f01acf65ab 100644 --- a/examples/3d/split_screen.rs +++ b/examples/3d/split_screen.rs @@ -10,8 +10,7 @@ use bevy::{ fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(set_camera_viewports) + .add_systems((setup.on_startup(), set_camera_viewports)) .run(); } diff --git a/examples/3d/spotlight.rs b/examples/3d/spotlight.rs index a066041745657..19c5e4431780b 100644 --- a/examples/3d/spotlight.rs +++ b/examples/3d/spotlight.rs @@ -12,9 +12,7 @@ fn main() { .add_plugins(DefaultPlugins) .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_plugin(LogDiagnosticsPlugin::default()) - .add_startup_system(setup) - .add_system(light_sway) - .add_system(movement) + .add_systems((setup.on_startup(), light_sway, movement)) .run(); } diff --git a/examples/3d/tonemapping.rs b/examples/3d/tonemapping.rs index cc4f2cc3f7951..996f6cbe14758 100644 --- a/examples/3d/tonemapping.rs +++ b/examples/3d/tonemapping.rs @@ -27,15 +27,19 @@ fn main() { .init_resource::() .insert_resource(CurrentScene(1)) .insert_resource(SelectedParameter { value: 0, max: 4 }) - .add_startup_system(setup) - .add_startup_system(setup_basic_scene) - .add_startup_system(setup_color_gradient_scene) - .add_startup_system(setup_image_viewer_scene) - .add_system(update_image_viewer) - .add_system(toggle_scene) - .add_system(toggle_tonemapping_method) - .add_system(update_color_grading_settings) - .add_system(update_ui) + .add_startup_systems(( + setup, + setup_basic_scene, + setup_color_gradient_scene, + setup_image_viewer_scene, + )) + .add_systems(( + update_image_viewer, + toggle_scene, + toggle_tonemapping_method, + update_color_grading_settings, + update_ui, + )) .run(); } diff --git a/examples/3d/update_gltf_scene.rs b/examples/3d/update_gltf_scene.rs index b33a8a24b10eb..07c095bb60bea 100644 --- a/examples/3d/update_gltf_scene.rs +++ b/examples/3d/update_gltf_scene.rs @@ -6,8 +6,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(move_scene_entities) + .add_systems((setup.on_startup(), move_scene_entities)) .run(); } diff --git a/examples/animation/animated_fox.rs b/examples/animation/animated_fox.rs index 1cc50849e606c..c00d502dcd749 100644 --- a/examples/animation/animated_fox.rs +++ b/examples/animation/animated_fox.rs @@ -13,9 +13,11 @@ fn main() { color: Color::WHITE, brightness: 1.0, }) - .add_startup_system(setup) - .add_system(setup_scene_once_loaded) - .add_system(keyboard_animation_control) + .add_systems(( + setup.on_startup(), + setup_scene_once_loaded, + keyboard_animation_control, + )) .run(); } diff --git a/examples/animation/custom_skinned_mesh.rs b/examples/animation/custom_skinned_mesh.rs index 8b6b6a68b8e7b..9bec25dca14fc 100644 --- a/examples/animation/custom_skinned_mesh.rs +++ b/examples/animation/custom_skinned_mesh.rs @@ -20,8 +20,7 @@ fn main() { brightness: 1.0, ..default() }) - .add_startup_system(setup) - .add_system(joint_animation) + .add_systems((setup.on_startup(), joint_animation)) .run(); } diff --git a/examples/animation/gltf_skinned_mesh.rs b/examples/animation/gltf_skinned_mesh.rs index 80c0df7aa6b29..d0f2f9e765780 100644 --- a/examples/animation/gltf_skinned_mesh.rs +++ b/examples/animation/gltf_skinned_mesh.rs @@ -12,8 +12,7 @@ fn main() { brightness: 1.0, ..default() }) - .add_startup_system(setup) - .add_system(joint_animation) + .add_systems((setup.on_startup(), joint_animation)) .run(); } diff --git a/examples/asset/custom_asset.rs b/examples/asset/custom_asset.rs index 50089d5dfb5fb..0087cf2d86247 100644 --- a/examples/asset/custom_asset.rs +++ b/examples/asset/custom_asset.rs @@ -41,8 +41,7 @@ fn main() { .init_resource::() .add_asset::() .init_asset_loader::() - .add_startup_system(setup) - .add_system(print_on_load) + .add_systems((setup.on_startup(), print_on_load)) .run(); } diff --git a/examples/async_tasks/async_compute.rs b/examples/async_tasks/async_compute.rs index d0f4466d76eaf..4b5461c81fac6 100644 --- a/examples/async_tasks/async_compute.rs +++ b/examples/async_tasks/async_compute.rs @@ -12,9 +12,7 @@ use std::time::{Duration, Instant}; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup_env) - .add_startup_system(add_assets) - .add_startup_system(spawn_tasks) + .add_startup_systems((setup_env, add_assets, spawn_tasks)) .add_system(handle_tasks) .run(); } diff --git a/examples/async_tasks/external_source_external_thread.rs b/examples/async_tasks/external_source_external_thread.rs index 3a174713904fa..0325d962557ec 100644 --- a/examples/async_tasks/external_source_external_thread.rs +++ b/examples/async_tasks/external_source_external_thread.rs @@ -10,10 +10,7 @@ fn main() { App::new() .add_event::() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(read_stream) - .add_system(spawn_text) - .add_system(move_text) + .add_systems((setup.on_startup(), read_stream, spawn_text, move_text)) .run(); } diff --git a/examples/audio/audio_control.rs b/examples/audio/audio_control.rs index 33c72147a073e..c111e030f6dfc 100644 --- a/examples/audio/audio_control.rs +++ b/examples/audio/audio_control.rs @@ -5,10 +5,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(update_speed) - .add_system(pause) - .add_system(volume) + .add_systems((setup.on_startup(), update_speed, pause, volume)) .run(); } diff --git a/examples/audio/spatial_audio_2d.rs b/examples/audio/spatial_audio_2d.rs index 44601d0e632b4..e076a0495947b 100644 --- a/examples/audio/spatial_audio_2d.rs +++ b/examples/audio/spatial_audio_2d.rs @@ -4,8 +4,7 @@ use bevy::{prelude::*, sprite::MaterialMesh2dBundle}; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(update_positions) + .add_systems((setup.on_startup(), update_positions)) .run(); } diff --git a/examples/audio/spatial_audio_3d.rs b/examples/audio/spatial_audio_3d.rs index c9213a30cf765..397540a344d8d 100644 --- a/examples/audio/spatial_audio_3d.rs +++ b/examples/audio/spatial_audio_3d.rs @@ -4,8 +4,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(update_positions) + .add_systems((setup.on_startup(), update_positions)) .run(); } diff --git a/examples/diagnostics/custom_diagnostic.rs b/examples/diagnostics/custom_diagnostic.rs index 41cd5aefefb86..d8fac4aeb2fa9 100644 --- a/examples/diagnostics/custom_diagnostic.rs +++ b/examples/diagnostics/custom_diagnostic.rs @@ -11,8 +11,7 @@ fn main() { // The "print diagnostics" plugin is optional. // It just visualizes our diagnostics in the console. .add_plugin(LogDiagnosticsPlugin::default()) - .add_startup_system(setup_diagnostic_system) - .add_system(my_system) + .add_systems((setup_diagnostic_system.on_startup(), my_system)) .run(); } diff --git a/examples/ecs/apply_system_buffers.rs b/examples/ecs/apply_system_buffers.rs index 67a25274dda0d..283645ec6dd17 100644 --- a/examples/ecs/apply_system_buffers.rs +++ b/examples/ecs/apply_system_buffers.rs @@ -15,12 +15,14 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .init_resource::() - .add_startup_system(setup) - .add_system(despawn_old_and_spawn_new_fruits.before(CustomFlush)) - .add_system(apply_system_buffers.in_set(CustomFlush)) - .add_system(count_apple.after(CustomFlush)) - .add_system(count_orange) - .add_system(bevy::window::close_on_esc) + .add_systems(( + setup.on_startup(), + despawn_old_and_spawn_new_fruits.before(CustomFlush), + apply_system_buffers.in_set(CustomFlush), + count_apple.after(CustomFlush), + count_orange, + bevy::window::close_on_esc, + )) .run(); } diff --git a/examples/ecs/component_change_detection.rs b/examples/ecs/component_change_detection.rs index 8758e03c25792..704e3ab194801 100644 --- a/examples/ecs/component_change_detection.rs +++ b/examples/ecs/component_change_detection.rs @@ -6,10 +6,12 @@ use rand::Rng; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(change_component) - .add_system(change_detection) - .add_system(tracker_monitoring) + .add_systems(( + setup.on_startup(), + change_component, + change_detection, + tracker_monitoring, + )) .run(); } diff --git a/examples/ecs/custom_query_param.rs b/examples/ecs/custom_query_param.rs index e13e4695e7c53..04b0ff04b599d 100644 --- a/examples/ecs/custom_query_param.rs +++ b/examples/ecs/custom_query_param.rs @@ -18,10 +18,15 @@ use std::fmt::Debug; fn main() { App::new() .add_startup_system(spawn) - .add_system(print_components_read_only) - .add_system(print_components_iter_mut.after(print_components_read_only)) - .add_system(print_components_iter.after(print_components_iter_mut)) - .add_system(print_components_tuple.after(print_components_iter)) + .add_systems( + ( + print_components_read_only, + print_components_iter_mut, + print_components_iter, + print_components_tuple, + ) + .chain(), + ) .run(); } diff --git a/examples/ecs/event.rs b/examples/ecs/event.rs index cc4c2a7762de1..c2ad8feaacd5f 100644 --- a/examples/ecs/event.rs +++ b/examples/ecs/event.rs @@ -9,9 +9,7 @@ fn main() { .add_event::() .add_event::() .init_resource::() - .add_system(event_trigger) - .add_system(event_listener) - .add_system(sound_player) + .add_systems((event_trigger, event_listener, sound_player)) .run(); } diff --git a/examples/ecs/fixed_timestep.rs b/examples/ecs/fixed_timestep.rs index ba776f92b1ce3..98e0d466b9f55 100644 --- a/examples/ecs/fixed_timestep.rs +++ b/examples/ecs/fixed_timestep.rs @@ -6,10 +6,12 @@ const FIXED_TIMESTEP: f32 = 0.5; fn main() { App::new() .add_plugins(DefaultPlugins) - // this system will run once every update (it should match your screen's refresh rate) - .add_system(frame_update) - // add our system to the fixed timestep schedule - .add_system(fixed_update.in_schedule(CoreSchedule::FixedUpdate)) + .add_systems(( + // this system will run once every update (it should match your screen's refresh rate) + frame_update, + // add our system to the fixed timestep schedule + fixed_update.in_schedule(CoreSchedule::FixedUpdate), + )) // configure our fixed timestep schedule to run twice a second .insert_resource(FixedTime::new_from_secs(FIXED_TIMESTEP)) .run(); diff --git a/examples/ecs/generic_system.rs b/examples/ecs/generic_system.rs index aa63428f669f1..dec66ba07bd2a 100644 --- a/examples/ecs/generic_system.rs +++ b/examples/ecs/generic_system.rs @@ -42,11 +42,11 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .add_state::() - .add_system(setup_system.on_startup()) - .add_system(print_text_system) - .add_system(transition_to_in_game_system.in_set(OnUpdate(AppState::MainMenu))) - // add the cleanup systems .add_systems(( + setup_system.on_startup(), + print_text_system, + transition_to_in_game_system.in_set(OnUpdate(AppState::MainMenu)), + // Cleanup systems. // Pass in the types your system should operate on using the :: (turbofish) syntax cleanup_system::.in_schedule(OnExit(AppState::MainMenu)), cleanup_system::.in_schedule(OnExit(AppState::InGame)), diff --git a/examples/ecs/hierarchy.rs b/examples/ecs/hierarchy.rs index fc1aa353244b3..34ef08c3eafbd 100644 --- a/examples/ecs/hierarchy.rs +++ b/examples/ecs/hierarchy.rs @@ -7,8 +7,7 @@ use bevy::prelude::*; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(rotate) + .add_systems((setup.on_startup(), rotate)) .run(); } diff --git a/examples/ecs/nondeterministic_system_order.rs b/examples/ecs/nondeterministic_system_order.rs index e28cc103b47b3..c467e05c1bed2 100644 --- a/examples/ecs/nondeterministic_system_order.rs +++ b/examples/ecs/nondeterministic_system_order.rs @@ -28,24 +28,26 @@ fn main() { }) .init_resource::() .init_resource::() - // This pair of systems has an ambiguous order, - // as their data access conflicts, and there's no order between them. - .add_system(reads_a) - .add_system(writes_a) - // This pair of systems has conflicting data access, - // but it's resolved with an explicit ordering: - // the .after relationship here means that we will always double after adding. - .add_system(adds_one_to_b) - .add_system(doubles_b.after(adds_one_to_b)) - // This system isn't ambiguous with adds_one_to_b, - // due to the transitive ordering created by our constraints: - // if A is before B is before C, then A must be before C as well. - .add_system(reads_b.after(doubles_b)) - // This system will conflict with all of our writing systems - // but we've silenced its ambiguity with adds_one_to_b. - // This should only be done in the case of clear false positives: - // leave a comment in your code justifying the decision! - .add_system(reads_a_and_b.ambiguous_with(adds_one_to_b)) + .add_systems(( + // This pair of systems has an ambiguous order, + // as their data access conflicts, and there's no order between them. + reads_a, + writes_a, + // This pair of systems has conflicting data access, + // but it's resolved with an explicit ordering: + // the .after relationship here means that we will always double after adding. + adds_one_to_b, + doubles_b.after(adds_one_to_b), + // This system isn't ambiguous with adds_one_to_b, + // due to the transitive ordering created by our constraints: + // if A is before B is before C, then A must be before C as well. + reads_b.after(doubles_b), + // This system will conflict with all of our writing systems + // but we've silenced its ambiguity with adds_one_to_b. + // This should only be done in the case of clear false positives: + // leave a comment in your code justifying the decision! + reads_a_and_b.ambiguous_with(adds_one_to_b), + )) // Be mindful, internal ambiguities are reported too! // If there are any ambiguities due solely to DefaultPlugins, // or between DefaultPlugins and any of your third party plugins, diff --git a/examples/ecs/parallel_query.rs b/examples/ecs/parallel_query.rs index ca0557320e5a8..987962a16489e 100644 --- a/examples/ecs/parallel_query.rs +++ b/examples/ecs/parallel_query.rs @@ -69,8 +69,6 @@ fn bounce_system(windows: Query<&Window>, mut sprites: Query<(&Transform, &mut V fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(spawn_system) - .add_system(move_system) - .add_system(bounce_system) + .add_systems((spawn_system.on_startup(), move_system, bounce_system)) .run(); } diff --git a/examples/ecs/removal_detection.rs b/examples/ecs/removal_detection.rs index 87c4f2c7c4ef8..96f0c6e1caea3 100644 --- a/examples/ecs/removal_detection.rs +++ b/examples/ecs/removal_detection.rs @@ -14,9 +14,11 @@ fn main() { // `CoreSet::Update', and the system that reacts on the removal in `CoreSet::PostUpdate`. App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(remove_component) - .add_system(react_on_removal.in_base_set(CoreSet::PostUpdate)) + .add_systems(( + setup.on_startup(), + remove_component, + react_on_removal.in_base_set(CoreSet::PostUpdate), + )) .run(); } diff --git a/examples/ecs/run_conditions.rs b/examples/ecs/run_conditions.rs index 76a13319b8881..557aa4b50b2d7 100644 --- a/examples/ecs/run_conditions.rs +++ b/examples/ecs/run_conditions.rs @@ -11,7 +11,7 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .init_resource::() - .add_system( + .add_systems(( increment_input_counter // The common_conditions module has a few useful run conditions // for checking resources and states. These are included in the prelude. @@ -21,8 +21,6 @@ fn main() { // Both run conditions must return `true` in order for the system to run. // Note that this second run condition will be evaluated even if the first returns `false`. .run_if(has_user_input), - ) - .add_system( print_input_counter // `.and_then()` is a run condition combinator that only evaluates the second condition // if the first condition returns `true`. This behavior is known as "short-circuiting", @@ -35,8 +33,6 @@ fn main() { // All the normal rules still apply: all parameters must be read only except for local parameters. |counter: Res| counter.is_changed() && !counter.is_added(), )), - ) - .add_system( print_time_message // This function returns a custom run condition, much like the common conditions module. // It will only return true once 2 seconds have passed. @@ -45,7 +41,7 @@ fn main() { // to inverse a run condition. In this case it will return true if // less than 2.5 seconds have elapsed since the app started. .run_if(not(time_passed(2.5))), - ) + )) .run(); } diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs index 438410a9e1082..ae7f9d9950820 100644 --- a/examples/ecs/state.rs +++ b/examples/ecs/state.rs @@ -18,9 +18,11 @@ fn main() { .add_system(setup_menu.in_schedule(OnEnter(AppState::Menu))) // By contrast, on_update systems are stored in the main schedule, during CoreSet::Update, // and simply check the value of the `State` resource to see if they should run each frame. - .add_system(menu.in_set(OnUpdate(AppState::Menu))) - .add_system(cleanup_menu.in_schedule(OnExit(AppState::Menu))) - .add_system(setup_game.in_schedule(OnEnter(AppState::InGame))) + .add_systems(( + menu.in_set(OnUpdate(AppState::Menu)), + cleanup_menu.in_schedule(OnExit(AppState::Menu)), + setup_game.in_schedule(OnEnter(AppState::InGame)), + )) .add_systems((movement, change_color).in_set(OnUpdate(AppState::InGame))) .run(); } diff --git a/examples/ecs/system_param.rs b/examples/ecs/system_param.rs index 09e3d4245fa18..4304ec16994a0 100644 --- a/examples/ecs/system_param.rs +++ b/examples/ecs/system_param.rs @@ -5,8 +5,7 @@ use bevy::{ecs::system::SystemParam, prelude::*}; fn main() { App::new() .insert_resource(PlayerCount(0)) - .add_startup_system(spawn) - .add_system(count_players) + .add_systems((spawn.on_startup(), count_players)) .run(); } diff --git a/examples/ecs/system_piping.rs b/examples/ecs/system_piping.rs index cff592ff16361..c0a772d6a4dd9 100644 --- a/examples/ecs/system_piping.rs +++ b/examples/ecs/system_piping.rs @@ -15,12 +15,14 @@ fn main() { level: Level::TRACE, filter: "".to_string(), }) - .add_system(parse_message_system.pipe(handler_system)) - .add_system(data_pipe_system.pipe(info)) - .add_system(parse_message_system.pipe(dbg)) - .add_system(warning_pipe_system.pipe(warn)) - .add_system(parse_error_message_system.pipe(error)) - .add_system(parse_message_system.pipe(ignore)) + .add_systems(( + parse_message_system.pipe(handler_system), + data_pipe_system.pipe(info), + parse_message_system.pipe(dbg), + warning_pipe_system.pipe(warn), + parse_error_message_system.pipe(error), + parse_message_system.pipe(ignore), + )) .run(); } diff --git a/examples/ecs/timers.rs b/examples/ecs/timers.rs index b2a3374ba965e..8376f39a0b231 100644 --- a/examples/ecs/timers.rs +++ b/examples/ecs/timers.rs @@ -6,9 +6,7 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .init_resource::() - .add_startup_system(setup) - .add_system(countdown) - .add_system(print_when_completed) + .add_systems((setup.on_startup(), countdown, print_when_completed)) .run(); } diff --git a/examples/games/alien_cake_addict.rs b/examples/games/alien_cake_addict.rs index e9c27a6e928bf..138186acaa46b 100644 --- a/examples/games/alien_cake_addict.rs +++ b/examples/games/alien_cake_addict.rs @@ -43,8 +43,8 @@ fn main() { display_score.in_schedule(OnEnter(GameState::GameOver)), gameover_keyboard.in_set(OnUpdate(GameState::GameOver)), teardown.in_schedule(OnExit(GameState::GameOver)), + bevy::window::close_on_esc, )) - .add_system(bevy::window::close_on_esc) .run(); } diff --git a/examples/games/contributors.rs b/examples/games/contributors.rs index 86afff1822eae..f18ae839f1463 100644 --- a/examples/games/contributors.rs +++ b/examples/games/contributors.rs @@ -11,12 +11,13 @@ use std::{ fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup_contributor_selection) - .add_startup_system(setup) - .add_system(velocity_system) - .add_system(move_system) - .add_system(collision_system) - .add_system(select_system) + .add_startup_systems((setup_contributor_selection, setup)) + .add_systems(( + velocity_system, + move_system, + collision_system, + select_system, + )) .init_resource::() .run(); } diff --git a/examples/games/game_menu.rs b/examples/games/game_menu.rs index 972aa93ffbf16..64710c5e2aee7 100644 --- a/examples/games/game_menu.rs +++ b/examples/games/game_menu.rs @@ -58,15 +58,14 @@ mod splash { impl Plugin for SplashPlugin { fn build(&self, app: &mut App) { // As this plugin is managing the splash screen, it will focus on the state `GameState::Splash` - app + app.add_systems(( // When entering the state, spawn everything needed for this screen - .add_system(splash_setup.in_schedule(OnEnter(GameState::Splash))) + splash_setup.in_schedule(OnEnter(GameState::Splash)), // While in this state, run the `countdown` system - .add_system(countdown.in_set(OnUpdate(GameState::Splash))) + countdown.in_set(OnUpdate(GameState::Splash)), // When exiting the state, despawn everything that was spawned for this screen - .add_system( - despawn_screen::.in_schedule(OnExit(GameState::Splash)), - ); + despawn_screen::.in_schedule(OnExit(GameState::Splash)), + )); } } diff --git a/examples/input/gamepad_input_events.rs b/examples/input/gamepad_input_events.rs index d4d9725d0c444..a53976b1966a0 100644 --- a/examples/input/gamepad_input_events.rs +++ b/examples/input/gamepad_input_events.rs @@ -10,8 +10,7 @@ use bevy::{ fn main() { App::new() .add_plugins(DefaultPlugins) - .add_system(gamepad_events) - .add_system(gamepad_ordered_events) + .add_systems((gamepad_events, gamepad_ordered_events)) .run(); } diff --git a/examples/input/text_input.rs b/examples/input/text_input.rs index 0861ddb8e05d4..4263bfc42e6aa 100644 --- a/examples/input/text_input.rs +++ b/examples/input/text_input.rs @@ -9,12 +9,14 @@ use bevy::{input::keyboard::KeyboardInput, prelude::*}; fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup_scene) - .add_system(toggle_ime) - .add_system(listen_ime_events) - .add_system(listen_received_character_events) - .add_system(listen_keyboard_input_events) - .add_system(bubbling_text) + .add_systems(( + setup_scene.on_startup(), + toggle_ime, + listen_ime_events, + listen_received_character_events, + listen_keyboard_input_events, + bubbling_text, + )) .run(); } diff --git a/examples/mobile/src/lib.rs b/examples/mobile/src/lib.rs index 398ea2969fae1..366c933162e81 100644 --- a/examples/mobile/src/lib.rs +++ b/examples/mobile/src/lib.rs @@ -12,10 +12,8 @@ fn main() { }), ..default() })) - .add_startup_system(setup_scene) - .add_startup_system(setup_music) - .add_system(touch_camera) - .add_system(button_handler) + .add_startup_systems((setup_scene, setup_music)) + .add_systems((touch_camera, button_handler)) .run(); } diff --git a/examples/scene/scene.rs b/examples/scene/scene.rs index a3210214ad7b9..33a6c426efb19 100644 --- a/examples/scene/scene.rs +++ b/examples/scene/scene.rs @@ -14,9 +14,7 @@ fn main() { })) .register_type::() .register_type::() - .add_startup_system(save_scene_system) - .add_startup_system(load_scene_system) - .add_startup_system(infotext_system) + .add_startup_systems((save_scene_system, load_scene_system, infotext_system)) .add_system(log_system) .run(); } diff --git a/examples/shader/array_texture.rs b/examples/shader/array_texture.rs index 4f935369a00d2..5066779818ec8 100644 --- a/examples/shader/array_texture.rs +++ b/examples/shader/array_texture.rs @@ -11,8 +11,7 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .add_plugin(MaterialPlugin::::default()) - .add_startup_system(setup) - .add_system(create_array_texture) + .add_systems((setup.on_startup(), create_array_texture)) .run(); } diff --git a/examples/shader/post_processing.rs b/examples/shader/post_processing.rs index 71eb37851c179..ce62816fca26a 100644 --- a/examples/shader/post_processing.rs +++ b/examples/shader/post_processing.rs @@ -23,8 +23,7 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .add_plugin(Material2dPlugin::::default()) - .add_startup_system(setup) - .add_system(main_camera_cube_rotator_system) + .add_systems((setup.on_startup(), main_camera_cube_rotator_system)) .run(); } diff --git a/examples/shader/shader_instancing.rs b/examples/shader/shader_instancing.rs index b6d0f29d1187f..902860aaa7d8c 100644 --- a/examples/shader/shader_instancing.rs +++ b/examples/shader/shader_instancing.rs @@ -85,8 +85,10 @@ impl Plugin for CustomMaterialPlugin { .add_render_command::() .init_resource::() .init_resource::>() - .add_system(queue_custom.in_set(RenderSet::Queue)) - .add_system(prepare_instance_buffers.in_set(RenderSet::Prepare)); + .add_systems(( + queue_custom.in_set(RenderSet::Queue), + prepare_instance_buffers.in_set(RenderSet::Prepare), + )); } } diff --git a/examples/shader/shader_material_screenspace_texture.rs b/examples/shader/shader_material_screenspace_texture.rs index f0fec91b198e3..71b73ae998266 100644 --- a/examples/shader/shader_material_screenspace_texture.rs +++ b/examples/shader/shader_material_screenspace_texture.rs @@ -10,8 +10,7 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .add_plugin(MaterialPlugin::::default()) - .add_startup_system(setup) - .add_system(rotate_camera) + .add_systems((setup.on_startup(), rotate_camera)) .run(); } diff --git a/examples/shader/shader_prepass.rs b/examples/shader/shader_prepass.rs index 688152c5a935a..9770d9f46a48e 100644 --- a/examples/shader/shader_prepass.rs +++ b/examples/shader/shader_prepass.rs @@ -28,9 +28,7 @@ fn main() { prepass_enabled: false, ..default() }) - .add_startup_system(setup) - .add_system(rotate) - .add_system(toggle_prepass_view) + .add_systems((setup.on_startup(), rotate, toggle_prepass_view)) .run(); } diff --git a/examples/stress_tests/bevymark.rs b/examples/stress_tests/bevymark.rs index 4c446ff231fe6..876ef68fa54fe 100644 --- a/examples/stress_tests/bevymark.rs +++ b/examples/stress_tests/bevymark.rs @@ -43,12 +43,14 @@ fn main() { count: 0, color: Color::WHITE, }) - .add_startup_system(setup) - .add_system(mouse_handler) - .add_system(movement_system) - .add_system(collision_system) - .add_system(counter_system) - .add_system(scheduled_spawner.in_schedule(CoreSchedule::FixedUpdate)) + .add_systems(( + setup.on_startup(), + mouse_handler, + movement_system, + collision_system, + counter_system, + scheduled_spawner.in_schedule(CoreSchedule::FixedUpdate), + )) .insert_resource(FixedTime::new_from_secs(0.2)) .run(); } diff --git a/examples/stress_tests/many_animated_sprites.rs b/examples/stress_tests/many_animated_sprites.rs index d1911b9723e79..a5d6b4e938595 100644 --- a/examples/stress_tests/many_animated_sprites.rs +++ b/examples/stress_tests/many_animated_sprites.rs @@ -32,10 +32,12 @@ fn main() { }), ..default() })) - .add_startup_system(setup) - .add_system(animate_sprite) - .add_system(print_sprite_count) - .add_system(move_camera.after(print_sprite_count)) + .add_systems(( + setup.on_startup(), + animate_sprite, + print_sprite_count, + move_camera.after(print_sprite_count), + )) .run(); } diff --git a/examples/stress_tests/many_buttons.rs b/examples/stress_tests/many_buttons.rs index 79c761277e834..d39cfb38810e5 100644 --- a/examples/stress_tests/many_buttons.rs +++ b/examples/stress_tests/many_buttons.rs @@ -21,8 +21,7 @@ fn main() { .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_plugin(LogDiagnosticsPlugin::default()) .init_resource::() - .add_startup_system(setup) - .add_system(button_system) + .add_systems((setup.on_startup(), button_system)) .run(); } diff --git a/examples/stress_tests/many_cubes.rs b/examples/stress_tests/many_cubes.rs index ab9336c63ff28..4a87d6f4dc6d7 100644 --- a/examples/stress_tests/many_cubes.rs +++ b/examples/stress_tests/many_cubes.rs @@ -30,9 +30,7 @@ fn main() { })) .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_plugin(LogDiagnosticsPlugin::default()) - .add_startup_system(setup) - .add_system(move_camera) - .add_system(print_mesh_count) + .add_systems((setup.on_startup(), move_camera, print_mesh_count)) .run(); } diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs index 5980bb3587c22..2b42d8602fced 100644 --- a/examples/stress_tests/many_foxes.rs +++ b/examples/stress_tests/many_foxes.rs @@ -41,10 +41,12 @@ fn main() { color: Color::WHITE, brightness: 1.0, }) - .add_startup_system(setup) - .add_system(setup_scene_once_loaded) - .add_system(keyboard_animation_control) - .add_system(update_fox_rings.after(keyboard_animation_control)) + .add_systems(( + setup.on_startup(), + setup_scene_once_loaded, + keyboard_animation_control, + update_fox_rings.after(keyboard_animation_control), + )) .run(); } diff --git a/examples/stress_tests/many_lights.rs b/examples/stress_tests/many_lights.rs index b722100e7cfe4..0060ab354d8f4 100644 --- a/examples/stress_tests/many_lights.rs +++ b/examples/stress_tests/many_lights.rs @@ -26,9 +26,7 @@ fn main() { })) .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_plugin(LogDiagnosticsPlugin::default()) - .add_startup_system(setup) - .add_system(move_camera) - .add_system(print_light_count) + .add_systems((setup.on_startup(), move_camera, print_light_count)) .add_plugin(LogVisibleLights) .run(); } diff --git a/examples/stress_tests/many_sprites.rs b/examples/stress_tests/many_sprites.rs index 4f2a466f07a93..f22359d6d9a39 100644 --- a/examples/stress_tests/many_sprites.rs +++ b/examples/stress_tests/many_sprites.rs @@ -40,9 +40,11 @@ fn main() { }), ..default() })) - .add_startup_system(setup) - .add_system(print_sprite_count) - .add_system(move_camera.after(print_sprite_count)) + .add_systems(( + setup.on_startup(), + print_sprite_count, + move_camera.after(print_sprite_count), + )) .run(); } diff --git a/examples/stress_tests/text_pipeline.rs b/examples/stress_tests/text_pipeline.rs index a2782a97a9c36..f5396ca90cfb5 100644 --- a/examples/stress_tests/text_pipeline.rs +++ b/examples/stress_tests/text_pipeline.rs @@ -20,8 +20,7 @@ fn main() { })) .add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_plugin(LogDiagnosticsPlugin::default()) - .add_startup_system(spawn) - .add_system(update_text_bounds) + .add_systems((spawn.on_startup(), update_text_bounds)) .run(); } diff --git a/examples/tools/gamepad_viewer.rs b/examples/tools/gamepad_viewer.rs index ae912192cbfdd..7d549dca49332 100644 --- a/examples/tools/gamepad_viewer.rs +++ b/examples/tools/gamepad_viewer.rs @@ -127,14 +127,13 @@ fn main() { .init_resource::() .init_resource::() .init_resource::() - .add_startup_system(setup) - .add_startup_system(setup_sticks) - .add_startup_system(setup_triggers) - .add_startup_system(setup_connected) - .add_system(update_buttons) - .add_system(update_button_values) - .add_system(update_axes) - .add_system(update_connected) + .add_startup_systems((setup, setup_sticks, setup_triggers, setup_connected)) + .add_systems(( + update_buttons, + update_button_values, + update_axes, + update_connected, + )) .run(); } diff --git a/examples/tools/scene_viewer/scene_viewer_plugin.rs b/examples/tools/scene_viewer/scene_viewer_plugin.rs index 33277e6e55b3c..f4df150a18f53 100644 --- a/examples/tools/scene_viewer/scene_viewer_plugin.rs +++ b/examples/tools/scene_viewer/scene_viewer_plugin.rs @@ -56,14 +56,14 @@ pub struct SceneViewerPlugin; impl Plugin for SceneViewerPlugin { fn build(&self, app: &mut App) { - app.init_resource::() - .add_system(scene_load_check.in_base_set(CoreSet::PreUpdate)) - .add_system(update_lights) - .add_system(camera_tracker); + app.init_resource::().add_systems(( + scene_load_check.in_base_set(CoreSet::PreUpdate), + update_lights, + camera_tracker, + )); #[cfg(feature = "animation")] - app.add_system(start_animation) - .add_system(keyboard_animation_control); + app.add_systems((start_animation, keyboard_animation_control)); } } diff --git a/examples/transforms/3d_rotation.rs b/examples/transforms/3d_rotation.rs index 97e217b215080..d30addb24c9b1 100644 --- a/examples/transforms/3d_rotation.rs +++ b/examples/transforms/3d_rotation.rs @@ -13,8 +13,7 @@ struct Rotatable { fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(rotate_cube) + .add_systems((setup.on_startup(), rotate_cube)) .run(); } diff --git a/examples/transforms/scale.rs b/examples/transforms/scale.rs index b716cd33cc319..8c247598958e6 100644 --- a/examples/transforms/scale.rs +++ b/examples/transforms/scale.rs @@ -29,9 +29,7 @@ impl Scaling { fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(change_scale_direction) - .add_system(scale_cube) + .add_systems((setup.on_startup(), change_scale_direction, scale_cube)) .run(); } diff --git a/examples/transforms/transform.rs b/examples/transforms/transform.rs index 429f154e90bef..4154a207713a9 100644 --- a/examples/transforms/transform.rs +++ b/examples/transforms/transform.rs @@ -24,10 +24,12 @@ struct Center { fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(move_cube) - .add_system(rotate_cube) - .add_system(scale_down_sphere_proportional_to_cube_travel_distance) + .add_systems(( + setup.on_startup(), + move_cube, + rotate_cube, + scale_down_sphere_proportional_to_cube_travel_distance, + )) .run(); } diff --git a/examples/transforms/translation.rs b/examples/transforms/translation.rs index ce1c29fe73fc1..8c6f408c1d1ae 100644 --- a/examples/transforms/translation.rs +++ b/examples/transforms/translation.rs @@ -25,8 +25,7 @@ impl Movable { fn main() { App::new() .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(move_cube) + .add_systems((setup.on_startup(), move_cube)) .run(); } diff --git a/examples/ui/button.rs b/examples/ui/button.rs index aa364baf8bc55..ba5f569e79188 100644 --- a/examples/ui/button.rs +++ b/examples/ui/button.rs @@ -8,8 +8,7 @@ fn main() { .add_plugins(DefaultPlugins) // Only run the app when there is user input. This will significantly reduce CPU/GPU use. .insert_resource(WinitSettings::desktop_app()) - .add_startup_system(setup) - .add_system(button_system) + .add_systems((setup.on_startup(), button_system)) .run(); } diff --git a/examples/ui/font_atlas_debug.rs b/examples/ui/font_atlas_debug.rs index 8dd72311c48f6..a732baca7c366 100644 --- a/examples/ui/font_atlas_debug.rs +++ b/examples/ui/font_atlas_debug.rs @@ -8,9 +8,7 @@ fn main() { .init_resource::() .insert_resource(ClearColor(Color::BLACK)) .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(text_update_system) - .add_system(atlas_render_system) + .add_systems((setup.on_startup(), text_update_system, atlas_render_system)) .run(); } diff --git a/examples/ui/relative_cursor_position.rs b/examples/ui/relative_cursor_position.rs index 54e9c527c6a84..25a8abbbf860c 100644 --- a/examples/ui/relative_cursor_position.rs +++ b/examples/ui/relative_cursor_position.rs @@ -7,8 +7,7 @@ fn main() { .add_plugins(DefaultPlugins) // Only run the app when there is user input. This will significantly reduce CPU/GPU use. .insert_resource(WinitSettings::desktop_app()) - .add_startup_system(setup) - .add_system(relative_cursor_position_system) + .add_systems((setup.on_startup(), relative_cursor_position_system)) .run(); } diff --git a/examples/ui/text.rs b/examples/ui/text.rs index a25da20132d02..3e73c847af3a9 100644 --- a/examples/ui/text.rs +++ b/examples/ui/text.rs @@ -12,9 +12,7 @@ fn main() { App::new() .add_plugins(DefaultPlugins) .add_plugin(FrameTimeDiagnosticsPlugin::default()) - .add_startup_system(setup) - .add_system(text_update_system) - .add_system(text_color_system) + .add_systems((setup.on_startup(), text_update_system, text_color_system)) .run(); } diff --git a/examples/ui/text_debug.rs b/examples/ui/text_debug.rs index 012affe9528ca..286558bcbbc00 100644 --- a/examples/ui/text_debug.rs +++ b/examples/ui/text_debug.rs @@ -16,8 +16,7 @@ fn main() { ..default() })) .add_plugin(FrameTimeDiagnosticsPlugin) - .add_startup_system(infotext_system) - .add_system(change_text_system) + .add_systems((infotext_system.on_startup(), change_text_system)) .run(); } diff --git a/examples/ui/ui.rs b/examples/ui/ui.rs index f06b5c161bf10..954708c6335d9 100644 --- a/examples/ui/ui.rs +++ b/examples/ui/ui.rs @@ -15,8 +15,7 @@ fn main() { .add_plugins(DefaultPlugins) // Only run the app when there is user input. This will significantly reduce CPU/GPU use. .insert_resource(WinitSettings::desktop_app()) - .add_startup_system(setup) - .add_system(mouse_scroll) + .add_systems((setup.on_startup(), mouse_scroll)) .run(); } diff --git a/examples/ui/ui_scaling.rs b/examples/ui/ui_scaling.rs index 5452f70abfb33..877857a352867 100644 --- a/examples/ui/ui_scaling.rs +++ b/examples/ui/ui_scaling.rs @@ -16,9 +16,11 @@ fn main() { target_scale: 1.0, target_time: Timer::new(Duration::from_millis(SCALE_TIME), TimerMode::Once), }) - .add_startup_system(setup) - .add_system(change_scaling) - .add_system(apply_scaling.after(change_scaling)) + .add_systems(( + setup.on_startup(), + change_scaling, + apply_scaling.after(change_scaling), + )) .run(); } diff --git a/examples/window/clear_color.rs b/examples/window/clear_color.rs index ecd4c1558de53..4e2c8f2fb74d7 100644 --- a/examples/window/clear_color.rs +++ b/examples/window/clear_color.rs @@ -8,8 +8,7 @@ fn main() { App::new() .insert_resource(ClearColor(Color::rgb(0.5, 0.5, 0.9))) .add_plugins(DefaultPlugins) - .add_startup_system(setup) - .add_system(change_clear_color) + .add_systems((setup.on_startup(), change_clear_color)) .run(); } diff --git a/examples/window/low_power.rs b/examples/window/low_power.rs index 0e8ba1e8e3a1d..cf90ef863cf82 100644 --- a/examples/window/low_power.rs +++ b/examples/window/low_power.rs @@ -33,11 +33,13 @@ fn main() { }), ..default() })) - .add_startup_system(test_setup::setup) - .add_system(test_setup::cycle_modes) - .add_system(test_setup::rotate_cube) - .add_system(test_setup::update_text) - .add_system(update_winit) + .add_Systems(( + test_setup::setup.on_startup(), + test_setup::cycle_modes, + test_setup::rotate_cube, + test_setup::update_text, + update_winit, + )) .run(); } diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs index 5af87dd416cb8..ae983ad46289b 100644 --- a/examples/window/scale_factor_override.rs +++ b/examples/window/scale_factor_override.rs @@ -12,10 +12,12 @@ fn main() { }), ..default() })) - .add_startup_system(setup) - .add_system(display_override) - .add_system(toggle_override) - .add_system(change_scale_factor) + .add_systems(( + setup.on_startup(), + display_override, + toggle_override, + change_scale_factor, + )) .run(); } diff --git a/examples/window/window_resizing.rs b/examples/window/window_resizing.rs index 277397a010442..436d6b2eba8ff 100644 --- a/examples/window/window_resizing.rs +++ b/examples/window/window_resizing.rs @@ -9,10 +9,8 @@ fn main() { small: Vec2::new(640.0, 360.0), }) .add_plugins(DefaultPlugins) - .add_startup_system(setup_camera) - .add_startup_system(setup_ui) - .add_system(on_resize_system) - .add_system(toggle_resolution) + .add_startup_systems((setup_camera, setup_ui)) + .add_systems((on_resize_system, toggle_resolution)) .run(); } diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs index 47867e4f7dc8c..8cb298cd32f12 100644 --- a/examples/window/window_settings.rs +++ b/examples/window/window_settings.rs @@ -24,11 +24,13 @@ fn main() { })) .add_plugin(LogDiagnosticsPlugin::default()) .add_plugin(FrameTimeDiagnosticsPlugin) - .add_system(change_title) - .add_system(toggle_cursor) - .add_system(toggle_vsync) - .add_system(cycle_cursor_icon) - .add_system(switch_level) + .add_systems(( + change_title, + toggle_cursor, + toggle_vsync, + cycle_cursor_icon, + switch_level, + )) .run(); } diff --git a/tests/how_to_test_systems.rs b/tests/how_to_test_systems.rs index 5e43c8ac2fc58..4103269668268 100644 --- a/tests/how_to_test_systems.rs +++ b/tests/how_to_test_systems.rs @@ -57,8 +57,7 @@ fn did_hurt_enemy() { app.add_event::(); // Add our two systems - app.add_system(hurt_enemies.before(despawn_dead_enemies)); - app.add_system(despawn_dead_enemies); + app.add_systems((hurt_enemies, despawn_dead_enemies).chain()); // Setup test entities let enemy_id = app @@ -89,8 +88,7 @@ fn did_despawn_enemy() { app.add_event::(); // Add our two systems - app.add_system(hurt_enemies.before(despawn_dead_enemies)); - app.add_system(despawn_dead_enemies); + app.add_systems((hurt_enemies, despawn_dead_enemies).chain()); // Setup test entities let enemy_id = app diff --git a/tests/window/minimising.rs b/tests/window/minimising.rs index 217228dbd8fb0..eb7ee33b09375 100644 --- a/tests/window/minimising.rs +++ b/tests/window/minimising.rs @@ -14,8 +14,7 @@ fn main() { ..default() })) .add_system(minimise_automatically) - .add_startup_system(setup_3d) - .add_startup_system(setup_2d) + .add_startup_systems((setup_3d, setup_2d)) .run(); } diff --git a/tests/window/resizing.rs b/tests/window/resizing.rs index 20ba42133a63b..5e6bdcb4b5e92 100644 --- a/tests/window/resizing.rs +++ b/tests/window/resizing.rs @@ -35,11 +35,12 @@ fn main() { }), ) .insert_resource(Phase::ContractingY) - .add_system(change_window_size) - .add_system(sync_dimensions) - .add_system(bevy::window::close_on_esc) - .add_startup_system(setup_3d) - .add_startup_system(setup_2d) + .add_systems(( + change_window_size, + sync_dimensions, + bevy::window::close_on_esc, + )) + .add_startup_systems((setup_3d, setup_2d)) .run(); } From 9ca930bc7a667b91b7c945fba8bce96f1bc82669 Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Wed, 8 Mar 2023 23:32:55 -0500 Subject: [PATCH 02/11] use `distributive_run_if` --- benches/benches/bevy_ecs/scheduling/run_condition.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/benches/benches/bevy_ecs/scheduling/run_condition.rs b/benches/benches/bevy_ecs/scheduling/run_condition.rs index 21af1786d4e39..9e3ad7589ccc4 100644 --- a/benches/benches/bevy_ecs/scheduling/run_condition.rs +++ b/benches/benches/bevy_ecs/scheduling/run_condition.rs @@ -21,13 +21,7 @@ pub fn run_condition_yes(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(yes)); for _ in 0..amount { - schedule.add_systems(( - empty.run_if(yes), - empty.run_if(yes), - empty.run_if(yes), - empty.run_if(yes), - empty.run_if(yes), - )); + schedule.add_systems((empty, empty, empty, empty, empty).distributive_run_if(yes)); } // run once to initialize systems schedule.run(&mut world); From 165147d5f96483878ba5b3e07ebdd4ea53380d69 Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Wed, 8 Mar 2023 23:35:37 -0500 Subject: [PATCH 03/11] use more distributive run if --- .../bevy_ecs/scheduling/run_condition.rs | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/benches/benches/bevy_ecs/scheduling/run_condition.rs b/benches/benches/bevy_ecs/scheduling/run_condition.rs index 9e3ad7589ccc4..367cd7839e394 100644 --- a/benches/benches/bevy_ecs/scheduling/run_condition.rs +++ b/benches/benches/bevy_ecs/scheduling/run_condition.rs @@ -44,13 +44,7 @@ pub fn run_condition_no(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(no)); for _ in 0..amount { - schedule.add_systems(( - empty.run_if(no), - empty.run_if(no), - empty.run_if(no), - empty.run_if(no), - empty.run_if(no), - )); + schedule.add_systems((empty, empty, empty, empty, empty).distributive_run_if(no)); } // run once to initialize systems schedule.run(&mut world); @@ -80,13 +74,9 @@ pub fn run_condition_yes_with_query(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(yes_with_query)); for _ in 0..amount { - schedule.add_systems(( - empty.run_if(yes_with_query), - empty.run_if(yes_with_query), - empty.run_if(yes_with_query), - empty.run_if(yes_with_query), - empty.run_if(yes_with_query), - )); + schedule.add_systems( + (empty, empty, empty, empty, empty).distributive_run_if(yes_with_query), + ); } // run once to initialize systems schedule.run(&mut world); @@ -113,13 +103,9 @@ pub fn run_condition_yes_with_resource(criterion: &mut Criterion) { let mut schedule = Schedule::new(); schedule.add_system(empty.run_if(yes_with_resource)); for _ in 0..amount { - schedule.add_systems(( - empty.run_if(yes_with_resource), - empty.run_if(yes_with_resource), - empty.run_if(yes_with_resource), - empty.run_if(yes_with_resource), - empty.run_if(yes_with_resource), - )); + schedule.add_systems( + (empty, empty, empty, empty, empty).distributive_run_if(yes_with_resource), + ); } // run once to initialize systems schedule.run(&mut world); From e16e11e805b747b1b81ca07d1664ef846f6cd2d5 Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Wed, 8 Mar 2023 23:38:45 -0500 Subject: [PATCH 04/11] fix formatting in a doc example --- crates/bevy_ecs/src/system/mod.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index 753788cad22d1..9ccefa35734a3 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -57,12 +57,11 @@ //! # use bevy_ecs::prelude::*; //! # let mut app = Schedule::new(); //! // Prints "Hello, World!" each frame. -//! app -//! .add_systems(( -//! print_first.before(print_mid), -//! print_mid, -//! print_last.after(print_mid), -//! )); +//! app.add_systems(( +//! print_first.before(print_mid), +//! print_mid, +//! print_last.after(print_mid), +//! )); //! # let mut world = World::new(); //! # app.run(&mut world); //! From c204e737319cb6d108a359db3c85739f3ee225fe Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Thu, 9 Mar 2023 09:55:58 -0500 Subject: [PATCH 05/11] fix a typo in an example --- examples/window/low_power.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/window/low_power.rs b/examples/window/low_power.rs index cf90ef863cf82..f57183cc8be36 100644 --- a/examples/window/low_power.rs +++ b/examples/window/low_power.rs @@ -33,7 +33,7 @@ fn main() { }), ..default() })) - .add_Systems(( + .add_systems(( test_setup::setup.on_startup(), test_setup::cycle_modes, test_setup::rotate_cube, From 4e62f799168b5067e1a8d278377187bec8967d5c Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Thu, 9 Mar 2023 10:07:58 -0500 Subject: [PATCH 06/11] use chaining to order systems --- crates/bevy_ecs/src/system/mod.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index 9ccefa35734a3..810553dda88b2 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -335,11 +335,7 @@ mod tests { let mut schedule = Schedule::default(); - schedule.add_systems(( - incr_e_on_flip, - apply_system_buffers.after(incr_e_on_flip), - World::clear_trackers.after(apply_system_buffers), - )); + schedule.add_systems((incr_e_on_flip, apply_system_buffers, World::clear_trackers).chain()); schedule.run(&mut world); assert_eq!(world.resource::().0, 1); From 1b7c2d0a92cc050c5a156219270017a92793e23d Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Thu, 9 Mar 2023 10:21:04 -0500 Subject: [PATCH 07/11] import `IntoSystemConfigs` --- crates/bevy_ecs/src/system/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index 810553dda88b2..998cefa7d40db 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -163,7 +163,7 @@ mod tests { prelude::AnyOf, query::{Added, Changed, Or, With, Without}, removal_detection::RemovedComponents, - schedule::{apply_system_buffers, IntoSystemConfig, Schedule}, + schedule::{apply_system_buffers, IntoSystemConfigs, Schedule}, system::{ Commands, IntoSystem, Local, NonSend, NonSendMut, ParamSet, Query, QueryComponentError, Res, ResMut, Resource, System, SystemState, From 819ebe3474657153591f85565fc1f58f3f06b416 Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Thu, 9 Mar 2023 10:38:04 -0500 Subject: [PATCH 08/11] bless a compile fail test --- .../tests/ui/world_query_derive.stderr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_ecs_compile_fail_tests/tests/ui/world_query_derive.stderr b/crates/bevy_ecs_compile_fail_tests/tests/ui/world_query_derive.stderr index b762ac275fce3..158be3f9d7e05 100644 --- a/crates/bevy_ecs_compile_fail_tests/tests/ui/world_query_derive.stderr +++ b/crates/bevy_ecs_compile_fail_tests/tests/ui/world_query_derive.stderr @@ -18,7 +18,7 @@ note: required by a bound in `_::assert_readonly` --> tests/ui/world_query_derive.rs:7:10 | 7 | #[derive(WorldQuery)] - | ^^^^^^^^^^ required by this bound in `_::assert_readonly` + | ^^^^^^^^^^ required by this bound in `assert_readonly` = note: this error originates in the derive macro `WorldQuery` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0277]: the trait bound `MutableMarked: ReadOnlyWorldQuery` is not satisfied @@ -41,5 +41,5 @@ note: required by a bound in `_::assert_readonly` --> tests/ui/world_query_derive.rs:18:10 | 18 | #[derive(WorldQuery)] - | ^^^^^^^^^^ required by this bound in `_::assert_readonly` + | ^^^^^^^^^^ required by this bound in `assert_readonly` = note: this error originates in the derive macro `WorldQuery` (in Nightly builds, run with -Z macro-backtrace for more info) From eb9c933d640953e790546389d88fdad8fc4a456d Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Thu, 9 Mar 2023 16:13:20 -0500 Subject: [PATCH 09/11] demonstrate `chain()` in the basic system ordering example --- crates/bevy_ecs/src/system/mod.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index 998cefa7d40db..a2be268911496 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -55,15 +55,18 @@ //! //! ``` //! # use bevy_ecs::prelude::*; -//! # let mut app = Schedule::new(); -//! // Prints "Hello, World!" each frame. -//! app.add_systems(( -//! print_first.before(print_mid), -//! print_mid, -//! print_last.after(print_mid), -//! )); +//! # let mut schedule = Schedule::new(); //! # let mut world = World::new(); -//! # app.run(&mut world); +//! // Configure these systems to run in order using `chain()`. +//! schedule.add_systems((print_first, print_last).chain()); +//! // Prints "HelloWorld!" +//! schedule.run(&mut world); +//! +//! // Configure this system to run in between the other two systems +//! // using explicit dependencies. +//! schedule.add_system(print_mid.after(print_first).before(print_last)); +//! // Prints "Hello, World!" +//! schedule.run(&mut world); //! //! fn print_first() { //! print!("Hello"); From 2aca9a58aa6aed287c6e44d2a362b1dfc4245251 Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Thu, 9 Mar 2023 19:36:22 -0500 Subject: [PATCH 10/11] chain configured sets --- crates/bevy_app/src/lib.rs | 16 +++++++++++----- crates/bevy_render/src/lib.rs | 24 ++++++++++++++++-------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/crates/bevy_app/src/lib.rs b/crates/bevy_app/src/lib.rs index c09e6002f3e96..7f49dba71cee6 100644 --- a/crates/bevy_app/src/lib.rs +++ b/crates/bevy_app/src/lib.rs @@ -205,11 +205,17 @@ impl StartupSet { apply_system_buffers.in_base_set(PostStartupFlush), )); - schedule.configure_sets(( - PreStartup.before(PreStartupFlush), - Startup.after(PreStartupFlush).before(StartupFlush), - PostStartup.after(StartupFlush).before(PostStartupFlush), - )); + schedule.configure_sets( + ( + PreStartup, + PreStartupFlush, + Startup, + StartupFlush, + PostStartup, + PostStartupFlush, + ) + .chain(), + ); schedule } diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs index 583858cf17fb9..1f4c1a2a90adb 100644 --- a/crates/bevy_render/src/lib.rs +++ b/crates/bevy_render/src/lib.rs @@ -120,14 +120,22 @@ impl RenderSet { apply_system_buffers.in_set(CleanupFlush), )); - schedule.configure_sets(( - ExtractCommands.before(Prepare), - Prepare.after(ExtractCommands).before(PrepareFlush), - Queue.after(PrepareFlush).before(QueueFlush), - PhaseSort.after(QueueFlush).before(PhaseSortFlush), - Render.after(PhaseSortFlush).before(RenderFlush), - Cleanup.after(RenderFlush).before(CleanupFlush), - )); + schedule.configure_sets( + ( + ExtractCommands, + Prepare, + PrepareFlush, + Queue, + QueueFlush, + PhaseSort, + PhaseSortFlush, + Render, + RenderFlush, + Cleanup, + CleanupFlush, + ) + .chain(), + ); schedule } From 9069274e73c267a9bc0e7649fde28b97f7c4ef5e Mon Sep 17 00:00:00 2001 From: JoJoJet <21144246+JoJoJet@users.noreply.github.com> Date: Thu, 9 Mar 2023 19:54:48 -0500 Subject: [PATCH 11/11] remove an unused import --- crates/bevy_app/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_app/src/lib.rs b/crates/bevy_app/src/lib.rs index 7f49dba71cee6..165e9ebd70e07 100644 --- a/crates/bevy_app/src/lib.rs +++ b/crates/bevy_app/src/lib.rs @@ -33,8 +33,8 @@ pub mod prelude { use bevy_ecs::{ schedule::{ - apply_system_buffers, IntoSystemConfig, IntoSystemSetConfig, IntoSystemSetConfigs, - Schedule, ScheduleLabel, SystemSet, + apply_system_buffers, IntoSystemConfig, IntoSystemSetConfigs, Schedule, ScheduleLabel, + SystemSet, }, system::Local, world::World,