mirror of
https://github.com/bevyengine/bevy
synced 2024-12-23 11:33:06 +00:00
dc3f801239
# Objective The [Stageless RFC](https://github.com/bevyengine/rfcs/pull/45) involves allowing exclusive systems to be referenced and ordered relative to parallel systems. We've agreed that unifying systems under `System` is the right move. This is an alternative to #4166 (see rationale in the comments I left there). Note that this builds on the learnings established there (and borrows some patterns). ## Solution This unifies parallel and exclusive systems under the shared `System` trait, removing the old `ExclusiveSystem` trait / impls. This is accomplished by adding a new `ExclusiveFunctionSystem` impl similar to `FunctionSystem`. It is backed by `ExclusiveSystemParam`, which is similar to `SystemParam`. There is a new flattened out SystemContainer api (which cuts out a lot of trait and type complexity). This means you can remove all cases of `exclusive_system()`: ```rust // before commands.add_system(some_system.exclusive_system()); // after commands.add_system(some_system); ``` I've also implemented `ExclusiveSystemParam` for `&mut QueryState` and `&mut SystemState`, which makes this possible in exclusive systems: ```rust fn some_exclusive_system( world: &mut World, transforms: &mut QueryState<&Transform>, state: &mut SystemState<(Res<Time>, Query<&Player>)>, ) { for transform in transforms.iter(world) { println!("{transform:?}"); } let (time, players) = state.get(world); for player in players.iter() { println!("{player:?}"); } } ``` Note that "exclusive function systems" assume `&mut World` is present (and the first param). I think this is a fair assumption, given that the presence of `&mut World` is what defines the need for an exclusive system. I added some targeted SystemParam `static` constraints, which removed the need for this: ``` rust fn some_exclusive_system(state: &mut SystemState<(Res<'static, Time>, Query<&'static Player>)>) {} ``` ## Related - #2923 - #3001 - #3946 ## Changelog - `ExclusiveSystem` trait (and implementations) has been removed in favor of sharing the `System` trait. - `ExclusiveFunctionSystem` and `ExclusiveSystemParam` were added, enabling flexible exclusive function systems - `&mut SystemState` and `&mut QueryState` now implement `ExclusiveSystemParam` - Exclusive and parallel System configuration is now done via a unified `SystemDescriptor`, `IntoSystemDescriptor`, and `SystemContainer` api. ## Migration Guide Calling `.exclusive_system()` is no longer required (or supported) for converting exclusive system functions to exclusive systems: ```rust // Old (0.8) app.add_system(some_exclusive_system.exclusive_system()); // New (0.9) app.add_system(some_exclusive_system); ``` Converting "normal" parallel systems to exclusive systems is done by calling the exclusive ordering apis: ```rust // Old (0.8) app.add_system(some_system.exclusive_system().at_end()); // New (0.9) app.add_system(some_system.at_end()); ``` Query state in exclusive systems can now be cached via ExclusiveSystemParams, which should be preferred for clarity and performance reasons: ```rust // Old (0.8) fn some_system(world: &mut World) { let mut transforms = world.query::<&Transform>(); for transform in transforms.iter(world) { } } // New (0.9) fn some_system(world: &mut World, transforms: &mut QueryState<&Transform>) { for transform in transforms.iter(world) { } } ```
130 lines
4.1 KiB
Rust
130 lines
4.1 KiB
Rust
use crate::{
|
|
prelude::{FromWorld, QueryState},
|
|
query::{ReadOnlyWorldQuery, WorldQuery},
|
|
system::{Local, LocalState, SystemMeta, SystemParam, SystemState},
|
|
world::World,
|
|
};
|
|
use bevy_ecs_macros::all_tuples;
|
|
use bevy_utils::synccell::SyncCell;
|
|
|
|
pub trait ExclusiveSystemParam: Sized {
|
|
type Fetch: for<'s> ExclusiveSystemParamFetch<'s>;
|
|
}
|
|
|
|
pub type ExclusiveSystemParamItem<'s, P> =
|
|
<<P as ExclusiveSystemParam>::Fetch as ExclusiveSystemParamFetch<'s>>::Item;
|
|
|
|
/// The state of a [`SystemParam`].
|
|
pub trait ExclusiveSystemParamState: Send + Sync {
|
|
fn init(world: &mut World, system_meta: &mut SystemMeta) -> Self;
|
|
#[inline]
|
|
fn apply(&mut self, _world: &mut World) {}
|
|
}
|
|
|
|
pub trait ExclusiveSystemParamFetch<'state>: ExclusiveSystemParamState {
|
|
type Item: ExclusiveSystemParam<Fetch = Self>;
|
|
fn get_param(state: &'state mut Self, system_meta: &SystemMeta) -> Self::Item;
|
|
}
|
|
|
|
impl<'a, Q: WorldQuery + 'static, F: ReadOnlyWorldQuery + 'static> ExclusiveSystemParam
|
|
for &'a mut QueryState<Q, F>
|
|
{
|
|
type Fetch = QueryState<Q, F>;
|
|
}
|
|
|
|
impl<'s, Q: WorldQuery + 'static, F: ReadOnlyWorldQuery + 'static> ExclusiveSystemParamFetch<'s>
|
|
for QueryState<Q, F>
|
|
{
|
|
type Item = &'s mut QueryState<Q, F>;
|
|
|
|
fn get_param(state: &'s mut Self, _system_meta: &SystemMeta) -> Self::Item {
|
|
state
|
|
}
|
|
}
|
|
|
|
impl<Q: WorldQuery + 'static, F: ReadOnlyWorldQuery + 'static> ExclusiveSystemParamState
|
|
for QueryState<Q, F>
|
|
{
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self {
|
|
QueryState::new(world)
|
|
}
|
|
}
|
|
|
|
impl<'a, P: SystemParam + 'static> ExclusiveSystemParam for &'a mut SystemState<P> {
|
|
type Fetch = SystemState<P>;
|
|
}
|
|
|
|
impl<'s, P: SystemParam + 'static> ExclusiveSystemParamFetch<'s> for SystemState<P> {
|
|
type Item = &'s mut SystemState<P>;
|
|
|
|
fn get_param(state: &'s mut Self, _system_meta: &SystemMeta) -> Self::Item {
|
|
state
|
|
}
|
|
}
|
|
|
|
impl<P: SystemParam> ExclusiveSystemParamState for SystemState<P> {
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self {
|
|
SystemState::new(world)
|
|
}
|
|
}
|
|
|
|
impl<'s, T: FromWorld + Send + Sync + 'static> ExclusiveSystemParam for Local<'s, T> {
|
|
type Fetch = LocalState<T>;
|
|
}
|
|
|
|
impl<'s, T: FromWorld + Send + Sync + 'static> ExclusiveSystemParamFetch<'s> for LocalState<T> {
|
|
type Item = Local<'s, T>;
|
|
|
|
fn get_param(state: &'s mut Self, _system_meta: &SystemMeta) -> Self::Item {
|
|
Local(state.0.get())
|
|
}
|
|
}
|
|
|
|
impl<T: FromWorld + Send + Sync> ExclusiveSystemParamState for LocalState<T> {
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self {
|
|
Self(SyncCell::new(T::from_world(world)))
|
|
}
|
|
}
|
|
|
|
macro_rules! impl_exclusive_system_param_tuple {
|
|
($($param: ident),*) => {
|
|
impl<$($param: ExclusiveSystemParam),*> ExclusiveSystemParam for ($($param,)*) {
|
|
type Fetch = ($($param::Fetch,)*);
|
|
}
|
|
|
|
#[allow(unused_variables)]
|
|
#[allow(non_snake_case)]
|
|
impl<'s, $($param: ExclusiveSystemParamFetch<'s>),*> ExclusiveSystemParamFetch<'s> for ($($param,)*) {
|
|
type Item = ($($param::Item,)*);
|
|
|
|
#[inline]
|
|
#[allow(clippy::unused_unit)]
|
|
fn get_param(
|
|
state: &'s mut Self,
|
|
system_meta: &SystemMeta,
|
|
) -> Self::Item {
|
|
|
|
let ($($param,)*) = state;
|
|
($($param::get_param($param, system_meta),)*)
|
|
}
|
|
}
|
|
|
|
// SAFETY: implementors of each `ExclusiveSystemParamState` in the tuple have validated their impls
|
|
#[allow(clippy::undocumented_unsafe_blocks)] // false positive by clippy
|
|
#[allow(non_snake_case)]
|
|
impl<$($param: ExclusiveSystemParamState),*> ExclusiveSystemParamState for ($($param,)*) {
|
|
#[inline]
|
|
fn init(_world: &mut World, _system_meta: &mut SystemMeta) -> Self {
|
|
(($($param::init(_world, _system_meta),)*))
|
|
}
|
|
|
|
#[inline]
|
|
fn apply(&mut self, _world: &mut World) {
|
|
let ($($param,)*) = self;
|
|
$($param.apply(_world);)*
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
all_tuples!(impl_exclusive_system_param_tuple, 0, 16, P);
|