From a7ae5547a168d3b048c1bf76d8d27f1ed2841db4 Mon Sep 17 00:00:00 2001 From: eickern Date: Fri, 24 Feb 2023 22:23:45 +0100 Subject: [PATCH] Replace add_system_to_schedule to update to latest bevy commit --- bevy_asset_loader/examples/atlas_from_grid.rs | 2 +- .../examples/custom_dynamic_assets.rs | 2 +- bevy_asset_loader/examples/failure_state.rs | 4 +- bevy_asset_loader/examples/full_collection.rs | 2 +- bevy_asset_loader/examples/init_resource.rs | 2 +- .../examples/manual_dynamic_asset.rs | 6 +- .../examples/no_loading_state.rs | 2 +- .../examples/progress_tracking.rs | 2 +- .../examples/standard_material.rs | 2 +- bevy_asset_loader/src/loading_state.rs | 63 +++++++++---------- .../tests/continues_to_failure_state.rs | 4 +- .../tests/continues_without_collection.rs | 2 +- bevy_asset_loader/tests/init_resource.rs | 2 +- .../tests/multiple_asset_collections.rs | 2 +- .../tests/multiple_loading_states.rs | 17 +++-- 15 files changed, 61 insertions(+), 53 deletions(-) diff --git a/bevy_asset_loader/examples/atlas_from_grid.rs b/bevy_asset_loader/examples/atlas_from_grid.rs index 53c6438..98ae640 100644 --- a/bevy_asset_loader/examples/atlas_from_grid.rs +++ b/bevy_asset_loader/examples/atlas_from_grid.rs @@ -13,7 +13,7 @@ fn main() { .add_collection_to_loading_state::<_, MyAssets>(MyStates::AssetLoading) .insert_resource(Msaa::Off) .add_plugins(DefaultPlugins) - .add_system_to_schedule(OnEnter(MyStates::Next), draw_atlas) + .add_system(draw_atlas.in_schedule(OnEnter(MyStates::Next))) .add_system(animate_sprite_system.run_if(in_state(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/examples/custom_dynamic_assets.rs b/bevy_asset_loader/examples/custom_dynamic_assets.rs index 79f5427..7d7e21d 100644 --- a/bevy_asset_loader/examples/custom_dynamic_assets.rs +++ b/bevy_asset_loader/examples/custom_dynamic_assets.rs @@ -21,7 +21,7 @@ fn main() { "custom.my-assets.ron", ) .add_collection_to_loading_state::<_, MyAssets>(MyStates::AssetLoading) - .add_system_to_schedule(OnEnter(MyStates::Next), render_stuff) + .add_system(render_stuff.in_schedule(OnEnter(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/examples/failure_state.rs b/bevy_asset_loader/examples/failure_state.rs index 9383661..37993b9 100644 --- a/bevy_asset_loader/examples/failure_state.rs +++ b/bevy_asset_loader/examples/failure_state.rs @@ -13,8 +13,8 @@ fn main() { ) .add_collection_to_loading_state::<_, MyAssets>(MyStates::AssetLoading) .add_system(timeout.run_if(in_state(MyStates::AssetLoading))) - .add_system_to_schedule(OnEnter(MyStates::Next), fail) - .add_system_to_schedule(OnEnter(MyStates::ErrorScreen), ok) + .add_system(fail.in_schedule(OnEnter(MyStates::Next))) + .add_system(ok.in_schedule(OnEnter(MyStates::ErrorScreen))) .run(); } diff --git a/bevy_asset_loader/examples/full_collection.rs b/bevy_asset_loader/examples/full_collection.rs index 0c71a41..0724666 100644 --- a/bevy_asset_loader/examples/full_collection.rs +++ b/bevy_asset_loader/examples/full_collection.rs @@ -12,7 +12,7 @@ fn main() { LoadingState::new(MyStates::AssetLoading).continue_to_state(MyStates::Next), ) .add_collection_to_loading_state::<_, MyAssets>(MyStates::AssetLoading) - .add_system_to_schedule(OnEnter(MyStates::Next), expectations) + .add_system(expectations.in_schedule(OnEnter(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/examples/init_resource.rs b/bevy_asset_loader/examples/init_resource.rs index 2dc45e6..1d04037 100644 --- a/bevy_asset_loader/examples/init_resource.rs +++ b/bevy_asset_loader/examples/init_resource.rs @@ -16,7 +16,7 @@ fn main() { .init_resource_after_loading_state::<_, CombinedImage>(MyStates::AssetLoading) .insert_resource(Msaa::Off) .add_plugins(DefaultPlugins) - .add_system_to_schedule(OnEnter(MyStates::Next), draw) + .add_system(draw.in_schedule(OnEnter(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/examples/manual_dynamic_asset.rs b/bevy_asset_loader/examples/manual_dynamic_asset.rs index ff19b37..b214d7a 100644 --- a/bevy_asset_loader/examples/manual_dynamic_asset.rs +++ b/bevy_asset_loader/examples/manual_dynamic_asset.rs @@ -27,11 +27,11 @@ fn main() { OnEnter(MyStates::Next), (spawn_player_and_tree, play_background_audio), ) - .add_system_to_schedule(OnEnter(MyStates::Menu), menu) + .add_system(menu.in_schedule(OnEnter(MyStates::Menu))) .add_system(character_setup.run_if(in_state(MyStates::Menu))) .add_system(update_menu.run_if(in_state(MyStates::Menu))) - .add_system_to_schedule(OnExit(MyStates::Menu), exit_menu) - .add_system_to_schedule(OnEnter(MyStates::Next), render_optional_background) + .add_system(exit_menu.in_schedule(OnExit(MyStates::Menu))) + .add_system(render_optional_background.in_schedule(OnEnter(MyStates::Next))) .add_system(move_player.run_if(in_state(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/examples/no_loading_state.rs b/bevy_asset_loader/examples/no_loading_state.rs index c5d50fe..873a9aa 100644 --- a/bevy_asset_loader/examples/no_loading_state.rs +++ b/bevy_asset_loader/examples/no_loading_state.rs @@ -23,7 +23,7 @@ fn main() { .init_collection::() // This system listens for mouse clicks and then loads + inserts the AudioAssets collection .add_system(load_and_play_audio) - .add_startup_system(draw) + .add_system(draw.on_startup()) .run(); } diff --git a/bevy_asset_loader/examples/progress_tracking.rs b/bevy_asset_loader/examples/progress_tracking.rs index c8f85f0..283355f 100644 --- a/bevy_asset_loader/examples/progress_tracking.rs +++ b/bevy_asset_loader/examples/progress_tracking.rs @@ -22,7 +22,7 @@ fn main() { // track progress during `MyStates::AssetLoading` and continue to `MyStates::Next` when progress is completed .add_plugin(ProgressPlugin::new(MyStates::AssetLoading).continue_to(MyStates::Next)) // gracefully quit the app when `MyStates::Next` is reached - .add_system_to_schedule(OnEnter(MyStates::Next), expect) + .add_system(expect.in_schedule(OnEnter(MyStates::Next))) .add_system( track_fake_long_task .before(print_progress) diff --git a/bevy_asset_loader/examples/standard_material.rs b/bevy_asset_loader/examples/standard_material.rs index a62481c..bb0b7b2 100644 --- a/bevy_asset_loader/examples/standard_material.rs +++ b/bevy_asset_loader/examples/standard_material.rs @@ -17,7 +17,7 @@ fn main() { brightness: 0.2, }) .add_plugins(DefaultPlugins) - .add_system_to_schedule(OnEnter(MyStates::Next), spawn_player) + .add_system(spawn_player.in_schedule(OnEnter(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/src/loading_state.rs b/bevy_asset_loader/src/loading_state.rs index 8bfc6cd..e707105 100644 --- a/bevy_asset_loader/src/loading_state.rs +++ b/bevy_asset_loader/src/loading_state.rs @@ -1,7 +1,7 @@ mod dynamic_asset_systems; mod systems; -use bevy::app::{App, CoreSet}; +use bevy::app::{App, CoreSet, IntoSystemAppConfig}; use bevy::asset::{Asset, HandleUntyped}; use bevy::ecs::schedule::{ common_conditions::in_state, IntoSystemConfig, IntoSystemSetConfig, NextState, OnEnter, States, @@ -375,24 +375,21 @@ where )); if configure_loading_state { - app.add_system_to_schedule( - loading_state_schedule.clone(), + app.add_systems(( resume_to_loading_asset_collections:: + .in_schedule(loading_state_schedule.clone()) .in_set(InternalLoadingStateSet::ResumeDynamicAssetCollections), - ) - .add_system_to_schedule( - loading_state_schedule.clone(), - initialize_loading_state.in_set(InternalLoadingStateSet::Initialize), - ) - .add_system_to_schedule( - loading_state_schedule.clone(), - resume_to_finalize::.in_set(InternalLoadingStateSet::CheckAssets), - ) - .add_system_to_schedule( - loading_state_schedule.clone(), - finish_loading_state::.in_set(InternalLoadingStateSet::Finalize), - ) - .add_system_to_schedule(OnEnter(self.loading_state.clone()), reset_loading_state) + initialize_loading_state + .in_schedule(loading_state_schedule.clone()) + .in_set(InternalLoadingStateSet::Initialize), + resume_to_finalize:: + .in_schedule(loading_state_schedule.clone()) + .in_set(InternalLoadingStateSet::CheckAssets), + finish_loading_state:: + .in_schedule(loading_state_schedule.clone()) + .in_set(InternalLoadingStateSet::Finalize), + )) + .add_system(reset_loading_state.in_schedule(OnEnter(self.loading_state.clone()))) .configure_set( LoadingStateSet(self.loading_state.clone()) .after(CoreSet::StateTransitions) @@ -674,13 +671,16 @@ impl LoadingStateAppExt for App { &mut self, loading_state: S, ) -> &mut Self { - self.add_system_to_schedule( - OnEnterInternalLoadingState(loading_state.clone(), InternalLoadingState::LoadingAssets), - start_loading_collection::, + self.add_system( + start_loading_collection::.in_schedule(OnEnterInternalLoadingState( + loading_state.clone(), + InternalLoadingState::LoadingAssets, + )), ) - .add_system_to_schedule( - LoadingStateSchedule(loading_state), - check_loading_collection::.in_set(InternalLoadingStateSet::CheckAssets), + .add_system( + check_loading_collection:: + .in_schedule(LoadingStateSchedule(loading_state)) + .in_set(InternalLoadingStateSet::CheckAssets), ) } @@ -708,16 +708,15 @@ impl LoadingStateAppExt for App { .insert(loading_state.clone(), dynamic_collections_for_state); self.init_resource::>() - .add_system_to_schedule( + .add_system(load_dynamic_asset_collections::.in_schedule( OnEnterInternalLoadingState( loading_state.clone(), InternalLoadingState::LoadingDynamicAssetCollections, ), - load_dynamic_asset_collections::, - ) - .add_system_to_schedule( - LoadingStateSchedule(loading_state), + )) + .add_system( check_dynamic_asset_collections:: + .in_schedule(LoadingStateSchedule(loading_state)) .in_set(InternalLoadingStateSet::CheckDynamicAssetCollections), ) } @@ -726,9 +725,9 @@ impl LoadingStateAppExt for App { &mut self, loading_state: S, ) -> &mut Self { - self.add_system_to_schedule( - OnEnterInternalLoadingState(loading_state, InternalLoadingState::Finalize), - init_resource::, - ) + self.add_system(init_resource::.in_schedule(OnEnterInternalLoadingState( + loading_state, + InternalLoadingState::Finalize, + ))) } } diff --git a/bevy_asset_loader/tests/continues_to_failure_state.rs b/bevy_asset_loader/tests/continues_to_failure_state.rs index 3cde72c..6cbfbfb 100644 --- a/bevy_asset_loader/tests/continues_to_failure_state.rs +++ b/bevy_asset_loader/tests/continues_to_failure_state.rs @@ -24,8 +24,8 @@ fn continues_to_failure_state() { ) .add_collection_to_loading_state::<_, Audio>(MyStates::Load) .add_system(timeout.run_if(in_state(MyStates::Load))) - .add_system_to_schedule(OnEnter(MyStates::Next), fail) - .add_system_to_schedule(OnEnter(MyStates::Error), exit) + .add_system(fail.in_schedule(OnEnter(MyStates::Next))) + .add_system(exit.in_schedule(OnEnter(MyStates::Error))) .run(); } diff --git a/bevy_asset_loader/tests/continues_without_collection.rs b/bevy_asset_loader/tests/continues_without_collection.rs index 3e8e338..51e925d 100644 --- a/bevy_asset_loader/tests/continues_without_collection.rs +++ b/bevy_asset_loader/tests/continues_without_collection.rs @@ -19,7 +19,7 @@ fn continues_without_collection() { .add_loading_state(LoadingState::new(MyStates::Load).continue_to_state(MyStates::Next)) .init_resource::() .add_system(expect.run_if(in_state(MyStates::Load))) - .add_system_to_schedule(OnEnter(MyStates::Next), exit) + .add_system(exit.in_schedule(OnEnter(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/tests/init_resource.rs b/bevy_asset_loader/tests/init_resource.rs index 2f89667..7bfb51d 100644 --- a/bevy_asset_loader/tests/init_resource.rs +++ b/bevy_asset_loader/tests/init_resource.rs @@ -23,7 +23,7 @@ fn init_resource() { .add_collection_to_loading_state::<_, MyAssets>(MyStates::Load) .init_resource_after_loading_state::<_, PostProcessed>(MyStates::Load) .add_system(timeout.run_if(in_state(MyStates::Load))) - .add_system_to_schedule(OnEnter(MyStates::Next), expect) + .add_system(expect.in_schedule(OnEnter(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/tests/multiple_asset_collections.rs b/bevy_asset_loader/tests/multiple_asset_collections.rs index 911bfd6..57bb780 100644 --- a/bevy_asset_loader/tests/multiple_asset_collections.rs +++ b/bevy_asset_loader/tests/multiple_asset_collections.rs @@ -23,7 +23,7 @@ fn multiple_asset_collections() { .add_collection_to_loading_state::<_, PlopAudio>(MyStates::Load) .add_collection_to_loading_state::<_, BackgroundAudio>(MyStates::Load) .add_system(timeout.run_if(in_state(MyStates::Load))) - .add_system_to_schedule(OnEnter(MyStates::Next), expect) + .add_system(expect.in_schedule(OnEnter(MyStates::Next))) .run(); } diff --git a/bevy_asset_loader/tests/multiple_loading_states.rs b/bevy_asset_loader/tests/multiple_loading_states.rs index ac07b85..9d20f16 100644 --- a/bevy_asset_loader/tests/multiple_loading_states.rs +++ b/bevy_asset_loader/tests/multiple_loading_states.rs @@ -1,9 +1,16 @@ +#![allow(dead_code, unused_imports)] + use bevy::app::AppExit; use bevy::audio::AudioPlugin; use bevy::prelude::*; use bevy_asset_loader::asset_collection::AssetCollection; use bevy_asset_loader::loading_state::{LoadingState, LoadingStateAppExt}; +#[cfg(all( + not(feature = "2d"), + not(feature = "3d"), + not(feature = "progress_tracking") +))] #[test] fn multiple_loading_states() { App::new() @@ -13,16 +20,18 @@ fn multiple_loading_states() { .add_plugin(AudioPlugin::default()) .add_loading_state(LoadingState::new(MyStates::Splash).continue_to_state(MyStates::Load)) .add_collection_to_loading_state::<_, SplashAssets>(MyStates::Splash) + .add_loading_state(LoadingState::new(MyStates::Load).continue_to_state(MyStates::Play)) + .add_collection_to_loading_state::<_, MyAssets>(MyStates::Load) + .add_collection_to_loading_state::<_, MyOtherAssets>(MyStates::Load) .add_system(timeout) - .add_system_to_schedule(OnEnter(MyStates::Load), use_splash_assets) - .add_system_to_schedule(OnEnter(MyStates::Play), use_loading_assets) + .add_system(use_splash_assets.in_schedule(OnEnter(MyStates::Load))) + .add_system(use_loading_assets.in_schedule(OnEnter(MyStates::Play))) .add_system(quit.run_if(in_state(MyStates::Play))) .run(); } fn timeout(time: Res