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

Jump to bottom

Add configure_schedules to App and Schedules to apply ScheduleBuildSettings to all schedules #9514

Merged
merged 4 commits into from
Aug 28, 2023
Merged

Add configure_schedules to App and Schedules to apply ScheduleBuildSettings to all schedules #9514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0a7d6f
Add configure_schedules to Schedules
DevinLeamy Aug 20, 2023
9d46572
Add configure_schedules to App
DevinLeamy Aug 20, 2023
59fa767
Return &mut Self from App::configure_schedules to allow for chaining
DevinLeamy Aug 22, 2023
65241a5
Add ScheduleBuildSettings accessor to Schedule
DevinLeamy Aug 22, 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: 12 additions & 1 deletion crates/bevy_app/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use bevy_ecs::{
schedule::{
apply_state_transition, common_conditions::run_once as run_once_condition,
run_enter_schedule, BoxedScheduleLabel, IntoSystemConfigs, IntoSystemSetConfigs,
ScheduleLabel,
ScheduleBuildSettings, ScheduleLabel,
},
};
use bevy_utils::{tracing::debug, HashMap, HashSet};
Expand Down Expand Up @@ -848,6 +848,17 @@ impl App {

self
}

/// Applies the provided [`ScheduleBuildSettings`] to all schedules.
pub fn configure_schedules(
&mut self,
schedule_build_settings: ScheduleBuildSettings,
) -> &mut Self {
self.world
.resource_mut::<Schedules>()
.configure_schedules(schedule_build_settings);
self
}
}

fn run_once(mut app: App) {
Expand Down
12 changes: 12 additions & 0 deletions crates/bevy_ecs/src/schedule/schedule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ impl Schedules {
schedule.check_change_ticks(change_tick);
}
}

/// Applies the provided [`ScheduleBuildSettings`] to all schedules.
pub fn configure_schedules(&mut self, schedule_build_settings: ScheduleBuildSettings) {
for (_, schedule) in self.inner.iter_mut() {
schedule.set_build_settings(schedule_build_settings.clone());
}
}
}

fn make_executor(kind: ExecutorKind) -> Box<dyn SystemExecutor> {
Expand Down Expand Up @@ -198,6 +205,11 @@ impl Schedule {
self
}

/// Returns the schedule's current `ScheduleBuildSettings`.
pub fn get_build_settings(&self) -> ScheduleBuildSettings {
self.graph.settings.clone()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clone because it's a light struct and we're not mutating the return value.

}

/// Returns the schedule's current execution strategy.
pub fn get_executor_kind(&self) -> ExecutorKind {
self.executor.kind()
Expand Down