
# 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) { } } ```
134 lines
3.9 KiB
Rust
134 lines
3.9 KiB
Rust
use crate::MainWorld;
|
|
use bevy_ecs::{
|
|
prelude::*,
|
|
system::{
|
|
ReadOnlySystemParamFetch, ResState, SystemMeta, SystemParam, SystemParamFetch,
|
|
SystemParamItem, SystemParamState, SystemState,
|
|
},
|
|
};
|
|
use std::ops::{Deref, DerefMut};
|
|
|
|
/// A helper for accessing [`MainWorld`] content using a system parameter.
|
|
///
|
|
/// A [`SystemParam`] adapter which applies the contained `SystemParam` to the [`World`]
|
|
/// contained in [`MainWorld`]. This parameter only works for systems run
|
|
/// during [`RenderStage::Extract`].
|
|
///
|
|
/// This requires that the contained [`SystemParam`] does not mutate the world, as it
|
|
/// uses a read-only reference to [`MainWorld`] internally.
|
|
///
|
|
/// ## Context
|
|
///
|
|
/// [`RenderStage::Extract`] is used to extract (move) data from the simulation world ([`MainWorld`]) to the
|
|
/// render world. The render world drives rendering each frame (generally to a [Window]).
|
|
/// This design is used to allow performing calculations related to rendering a prior frame at the same
|
|
/// time as the next frame is simulated, which increases throughput (FPS).
|
|
///
|
|
/// [`Extract`] is used to get data from the main world during [`RenderStage::Extract`].
|
|
///
|
|
/// ## Examples
|
|
///
|
|
/// ```rust
|
|
/// use bevy_ecs::prelude::*;
|
|
/// use bevy_render::Extract;
|
|
/// # #[derive(Component)]
|
|
/// # struct Cloud;
|
|
/// fn extract_clouds(mut commands: Commands, clouds: Extract<Query<Entity, With<Cloud>>>) {
|
|
/// for cloud in &clouds {
|
|
/// commands.get_or_spawn(cloud).insert(Cloud);
|
|
/// }
|
|
/// }
|
|
/// ```
|
|
///
|
|
/// [`RenderStage::Extract`]: crate::RenderStage::Extract
|
|
/// [Window]: bevy_window::Window
|
|
pub struct Extract<'w, 's, P: SystemParam + 'static>
|
|
where
|
|
P::Fetch: ReadOnlySystemParamFetch,
|
|
{
|
|
item: <P::Fetch as SystemParamFetch<'w, 's>>::Item,
|
|
}
|
|
|
|
impl<'w, 's, P: SystemParam> SystemParam for Extract<'w, 's, P>
|
|
where
|
|
P::Fetch: ReadOnlySystemParamFetch,
|
|
{
|
|
type Fetch = ExtractState<P>;
|
|
}
|
|
|
|
#[doc(hidden)]
|
|
pub struct ExtractState<P: SystemParam + 'static> {
|
|
state: SystemState<P>,
|
|
main_world_state: ResState<MainWorld>,
|
|
}
|
|
|
|
// SAFETY: only accesses MainWorld resource with read only system params using ResState,
|
|
// which is initialized in init()
|
|
unsafe impl<P: SystemParam + 'static> SystemParamState for ExtractState<P> {
|
|
fn init(world: &mut World, system_meta: &mut SystemMeta) -> Self {
|
|
let mut main_world = world.resource_mut::<MainWorld>();
|
|
Self {
|
|
state: SystemState::new(&mut main_world),
|
|
main_world_state: ResState::init(world, system_meta),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'w, 's, P: SystemParam + 'static> SystemParamFetch<'w, 's> for ExtractState<P>
|
|
where
|
|
P::Fetch: ReadOnlySystemParamFetch,
|
|
{
|
|
type Item = Extract<'w, 's, P>;
|
|
|
|
unsafe fn get_param(
|
|
state: &'s mut Self,
|
|
system_meta: &SystemMeta,
|
|
world: &'w World,
|
|
change_tick: u32,
|
|
) -> Self::Item {
|
|
let main_world = ResState::<MainWorld>::get_param(
|
|
&mut state.main_world_state,
|
|
system_meta,
|
|
world,
|
|
change_tick,
|
|
);
|
|
let item = state.state.get(main_world.into_inner());
|
|
Extract { item }
|
|
}
|
|
}
|
|
|
|
impl<'w, 's, P: SystemParam> Deref for Extract<'w, 's, P>
|
|
where
|
|
P::Fetch: ReadOnlySystemParamFetch,
|
|
{
|
|
type Target = <P::Fetch as SystemParamFetch<'w, 's>>::Item;
|
|
|
|
#[inline]
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.item
|
|
}
|
|
}
|
|
|
|
impl<'w, 's, P: SystemParam> DerefMut for Extract<'w, 's, P>
|
|
where
|
|
P::Fetch: ReadOnlySystemParamFetch,
|
|
{
|
|
#[inline]
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.item
|
|
}
|
|
}
|
|
|
|
impl<'a, 'w, 's, P: SystemParam> IntoIterator for &'a Extract<'w, 's, P>
|
|
where
|
|
P::Fetch: ReadOnlySystemParamFetch,
|
|
&'a SystemParamItem<'w, 's, P>: IntoIterator,
|
|
{
|
|
type Item = <&'a SystemParamItem<'w, 's, P> as IntoIterator>::Item;
|
|
type IntoIter = <&'a SystemParamItem<'w, 's, P> as IntoIterator>::IntoIter;
|
|
|
|
fn into_iter(self) -> Self::IntoIter {
|
|
(&self.item).into_iter()
|
|
}
|
|
}
|