mirror of
https://github.com/bevyengine/bevy
synced 2025-01-08 03:08:55 +00:00
d3e020a1e7
I'm opening this prematurely; consider this an RFC that predates RFCs and therefore not super-RFC-like. This PR does two "big" things: decouple run criteria from system sets, reimagine system sets as weapons of mass system description. ### What it lets us do: * Reuse run criteria within a stage. * Pipe output of one run criteria as input to another. * Assign labels, dependencies, run criteria, and ambiguity sets to many systems at the same time. ### Things already done: * Decoupled run criteria from system sets. * Mass system description superpowers to `SystemSet`. * Implemented `RunCriteriaDescriptor`. * Removed `VirtualSystemSet`. * Centralized all run criteria of `SystemStage`. * Extended system descriptors with per-system run criteria. * `.before()` and `.after()` for run criteria. * Explicit order between state driver and related run criteria. Fixes #1672. * Opt-in run criteria deduplication; default behavior is to panic. * Labels (not exposed) for state run criteria; state run criteria are deduplicated. ### API issues that need discussion: * [`FixedTimestep::step(1.0).label("my label")`](eaccf857cd/crates/bevy_ecs/src/schedule/run_criteria.rs (L120-L122)
) and [`FixedTimestep::step(1.0).with_label("my label")`](eaccf857cd/crates/bevy_core/src/time/fixed_timestep.rs (L86-L89)
) are both valid but do very different things. --- I will try to maintain this post up-to-date as things change. Do check the diffs in "edited" thingy from time to time. Co-authored-by: Carter Anderson <mcanders1@gmail.com>
231 lines
6.6 KiB
Rust
231 lines
6.6 KiB
Rust
mod executor;
|
|
mod executor_parallel;
|
|
pub mod graph_utils;
|
|
mod label;
|
|
mod run_criteria;
|
|
mod stage;
|
|
mod state;
|
|
mod system_container;
|
|
mod system_descriptor;
|
|
mod system_set;
|
|
|
|
pub use executor::*;
|
|
pub use executor_parallel::*;
|
|
pub use graph_utils::GraphNode;
|
|
pub use label::*;
|
|
pub use run_criteria::*;
|
|
pub use stage::*;
|
|
pub use state::*;
|
|
pub use system_container::*;
|
|
pub use system_descriptor::*;
|
|
pub use system_set::*;
|
|
|
|
use crate::{
|
|
system::{IntoSystem, System},
|
|
world::World,
|
|
};
|
|
use bevy_utils::HashMap;
|
|
|
|
#[derive(Default)]
|
|
pub struct Schedule {
|
|
stages: HashMap<BoxedStageLabel, Box<dyn Stage>>,
|
|
stage_order: Vec<BoxedStageLabel>,
|
|
run_criteria: BoxedRunCriteria,
|
|
}
|
|
|
|
impl Schedule {
|
|
pub fn with_stage<S: Stage>(mut self, label: impl StageLabel, stage: S) -> Self {
|
|
self.add_stage(label, stage);
|
|
self
|
|
}
|
|
|
|
pub fn with_stage_after<S: Stage>(
|
|
mut self,
|
|
target: impl StageLabel,
|
|
label: impl StageLabel,
|
|
stage: S,
|
|
) -> Self {
|
|
self.add_stage_after(target, label, stage);
|
|
self
|
|
}
|
|
|
|
pub fn with_stage_before<S: Stage>(
|
|
mut self,
|
|
target: impl StageLabel,
|
|
label: impl StageLabel,
|
|
stage: S,
|
|
) -> Self {
|
|
self.add_stage_before(target, label, stage);
|
|
self
|
|
}
|
|
|
|
pub fn with_run_criteria<S: System<In = (), Out = ShouldRun>>(mut self, system: S) -> Self {
|
|
self.set_run_criteria(system);
|
|
self
|
|
}
|
|
|
|
pub fn with_system_in_stage(
|
|
mut self,
|
|
stage_label: impl StageLabel,
|
|
system: impl Into<SystemDescriptor>,
|
|
) -> Self {
|
|
self.add_system_to_stage(stage_label, system);
|
|
self
|
|
}
|
|
|
|
pub fn set_run_criteria<S: System<In = (), Out = ShouldRun>>(
|
|
&mut self,
|
|
system: S,
|
|
) -> &mut Self {
|
|
self.run_criteria.set(Box::new(system.system()));
|
|
self
|
|
}
|
|
|
|
pub fn add_stage<S: Stage>(&mut self, label: impl StageLabel, stage: S) -> &mut Self {
|
|
let label: Box<dyn StageLabel> = Box::new(label);
|
|
self.stage_order.push(label.clone());
|
|
let prev = self.stages.insert(label.clone(), Box::new(stage));
|
|
if prev.is_some() {
|
|
panic!("Stage already exists: {:?}.", label);
|
|
}
|
|
self
|
|
}
|
|
|
|
pub fn add_stage_after<S: Stage>(
|
|
&mut self,
|
|
target: impl StageLabel,
|
|
label: impl StageLabel,
|
|
stage: S,
|
|
) -> &mut Self {
|
|
let label: Box<dyn StageLabel> = Box::new(label);
|
|
let target = &target as &dyn StageLabel;
|
|
let target_index = self
|
|
.stage_order
|
|
.iter()
|
|
.enumerate()
|
|
.find(|(_i, stage_label)| &***stage_label == target)
|
|
.map(|(i, _)| i)
|
|
.unwrap_or_else(|| panic!("Target stage does not exist: {:?}.", target));
|
|
|
|
self.stage_order.insert(target_index + 1, label.clone());
|
|
let prev = self.stages.insert(label.clone(), Box::new(stage));
|
|
if prev.is_some() {
|
|
panic!("Stage already exists: {:?}.", label);
|
|
}
|
|
self
|
|
}
|
|
|
|
pub fn add_stage_before<S: Stage>(
|
|
&mut self,
|
|
target: impl StageLabel,
|
|
label: impl StageLabel,
|
|
stage: S,
|
|
) -> &mut Self {
|
|
let label: Box<dyn StageLabel> = Box::new(label);
|
|
let target = &target as &dyn StageLabel;
|
|
let target_index = self
|
|
.stage_order
|
|
.iter()
|
|
.enumerate()
|
|
.find(|(_i, stage_label)| &***stage_label == target)
|
|
.map(|(i, _)| i)
|
|
.unwrap_or_else(|| panic!("Target stage does not exist: {:?}.", target));
|
|
|
|
self.stage_order.insert(target_index, label.clone());
|
|
let prev = self.stages.insert(label.clone(), Box::new(stage));
|
|
if prev.is_some() {
|
|
panic!("Stage already exists: {:?}.", label);
|
|
}
|
|
self
|
|
}
|
|
|
|
pub fn add_system_to_stage(
|
|
&mut self,
|
|
stage_label: impl StageLabel,
|
|
system: impl Into<SystemDescriptor>,
|
|
) -> &mut Self {
|
|
let stage = self
|
|
.get_stage_mut::<SystemStage>(&stage_label)
|
|
.unwrap_or_else(move || {
|
|
panic!(
|
|
"Stage '{:?}' does not exist or is not a SystemStage",
|
|
stage_label
|
|
)
|
|
});
|
|
stage.add_system(system);
|
|
self
|
|
}
|
|
|
|
pub fn add_system_set_to_stage(
|
|
&mut self,
|
|
stage_label: impl StageLabel,
|
|
system_set: SystemSet,
|
|
) -> &mut Self {
|
|
self.stage(stage_label, |stage: &mut SystemStage| {
|
|
stage.add_system_set(system_set)
|
|
})
|
|
}
|
|
|
|
pub fn stage<T: Stage, F: FnOnce(&mut T) -> &mut T>(
|
|
&mut self,
|
|
label: impl StageLabel,
|
|
func: F,
|
|
) -> &mut Self {
|
|
let stage = self.get_stage_mut::<T>(&label).unwrap_or_else(move || {
|
|
panic!("stage '{:?}' does not exist or is the wrong type", label)
|
|
});
|
|
func(stage);
|
|
self
|
|
}
|
|
|
|
pub fn get_stage<T: Stage>(&self, label: &dyn StageLabel) -> Option<&T> {
|
|
self.stages
|
|
.get(label)
|
|
.and_then(|stage| stage.downcast_ref::<T>())
|
|
}
|
|
|
|
pub fn get_stage_mut<T: Stage>(&mut self, label: &dyn StageLabel) -> Option<&mut T> {
|
|
self.stages
|
|
.get_mut(label)
|
|
.and_then(|stage| stage.downcast_mut::<T>())
|
|
}
|
|
|
|
pub fn run_once(&mut self, world: &mut World) {
|
|
for label in self.stage_order.iter() {
|
|
#[cfg(feature = "trace")]
|
|
let stage_span =
|
|
bevy_utils::tracing::info_span!("stage", name = &format!("{:?}", label) as &str);
|
|
#[cfg(feature = "trace")]
|
|
let _stage_guard = stage_span.enter();
|
|
let stage = self.stages.get_mut(label).unwrap();
|
|
stage.run(world);
|
|
}
|
|
}
|
|
|
|
/// Iterates over all of schedule's stages and their labels, in execution order.
|
|
pub fn iter_stages(&self) -> impl Iterator<Item = (&dyn StageLabel, &dyn Stage)> {
|
|
self.stage_order
|
|
.iter()
|
|
.map(move |label| (&**label, &*self.stages[label]))
|
|
}
|
|
}
|
|
|
|
impl Stage for Schedule {
|
|
fn run(&mut self, world: &mut World) {
|
|
loop {
|
|
match self.run_criteria.should_run(world) {
|
|
ShouldRun::No => return,
|
|
ShouldRun::Yes => {
|
|
self.run_once(world);
|
|
return;
|
|
}
|
|
ShouldRun::YesAndCheckAgain => {
|
|
self.run_once(world);
|
|
}
|
|
ShouldRun::NoAndCheckAgain => {
|
|
panic!("`NoAndCheckAgain` would loop infinitely in this situation.")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|