Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace IntoSystemSetConfig with IntoSystemSetConfigs #9247

Merged
merged 11 commits into from
Sep 5, 2023
Merged

Replace IntoSystemSetConfig with IntoSystemSetConfigs #9247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a34915b
Deprecate `configure_set` & make `configure_sets` work for single par…
geieredgar Aug 14, 2023
6ab72bd
Update crates/bevy_ecs/src/schedule/schedule.rs
geieredgar Aug 14, 2023
89a4608
Update crates/bevy_ecs/src/schedule/schedule.rs
geieredgar Aug 14, 2023
deb9333
Update crates/bevy_ecs/src/schedule/schedule.rs
geieredgar Aug 14, 2023
edf41c1
Update crates/bevy_ecs/src/schedule/schedule.rs
geieredgar Aug 14, 2023
87f5261
Improve documentation
geieredgar Aug 14, 2023
369ec9e
Fix documentation
geieredgar Aug 26, 2023
c7cbbdc
Rename `ItemConfig` to `NodeConfig`
geieredgar Sep 1, 2023
0347364
Use trait instead of passing a closure
geieredgar Sep 1, 2023
fbf69fd
Merge main
geieredgar Sep 1, 2023
95f94b4
Remove `configure_sets_inner` and `add_systems_inner`
geieredgar Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions crates/bevy_app/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,21 +393,14 @@ impl App {
}

/// Configures a system set in the default schedule, adding the set if it does not exist.
#[deprecated(since = "0.12.0", note = "Please use `configure_sets` instead.")]
#[track_caller]
pub fn configure_set(
&mut self,
schedule: impl ScheduleLabel,
set: impl IntoSystemSetConfig,
set: impl IntoSystemSetConfigs,
) -> &mut Self {
let mut schedules = self.world.resource_mut::<Schedules>();
if let Some(schedule) = schedules.get_mut(&schedule) {
schedule.configure_set(set);
} else {
let mut new_schedule = Schedule::new(schedule);
new_schedule.configure_set(set);
schedules.insert(new_schedule);
}
self
self.configure_sets(schedule, set)
}

/// Configures a collection of system sets in the default schedule, adding any sets that do not exist.
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_audio/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub struct AudioPlugin {
impl Plugin for AudioPlugin {
fn build(&self, app: &mut App) {
app.insert_resource(self.global_volume)
.configure_set(PostUpdate, AudioPlaySet.run_if(audio_output_available))
.configure_sets(PostUpdate, AudioPlaySet.run_if(audio_output_available))
.init_resource::<AudioOutput>();

#[cfg(any(feature = "mp3", feature = "flac", feature = "wav", feature = "vorbis"))]
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_ecs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ pub mod prelude {
removal_detection::RemovedComponents,
schedule::{
apply_deferred, apply_state_transition, common_conditions::*, Condition,
IntoSystemConfigs, IntoSystemSet, IntoSystemSetConfig, IntoSystemSetConfigs, NextState,
OnEnter, OnExit, OnTransition, Schedule, Schedules, State, States, SystemSet,
IntoSystemConfigs, IntoSystemSet, IntoSystemSetConfigs, NextState, OnEnter, OnExit,
OnTransition, Schedule, Schedules, State, States, SystemSet,
},
system::{
Commands, Deferred, In, IntoSystem, Local, NonSend, NonSendMut, ParallelCommands,
Expand Down
Loading