mirror of
https://github.com/bevyengine/bevy
synced 2024-12-23 03:23:20 +00:00
f6dbc25bd9
# Objective - Continue work of #2398 and friends. - Make `.system()` optional in chaining. ## Solution - Slight change to `IntoChainSystem` signature and implementation. - Remove some usages of `.system()` in the chaining example, to verify the implementation. --- I swear, I'm not splitting these up on purpose, I just legit forgot about most of the things where `System` appears in public API, and my trait usage explorer mingles that with the gajillion internal uses. In case you're wondering what happened to part 5, #2446 ate it.
149 lines
4.9 KiB
Rust
149 lines
4.9 KiB
Rust
use crate::{
|
|
archetype::{Archetype, ArchetypeComponentId},
|
|
component::ComponentId,
|
|
query::Access,
|
|
system::{IntoSystem, System, SystemId},
|
|
world::World,
|
|
};
|
|
use std::borrow::Cow;
|
|
|
|
/// A [`System`] that chains two systems together, creating a new system that routes the output of
|
|
/// the first system into the input of the second system, yielding the output of the second system.
|
|
///
|
|
/// Given two systems A and B, A may be chained with B as `A.chain(B)` if the output type of A is
|
|
/// equal to the input type of B.
|
|
///
|
|
/// Note that for [`FunctionSystem`](crate::system::FunctionSystem)s the output is the return value
|
|
/// of the function and the input is the first [`SystemParam`](crate::system::SystemParam) if it is
|
|
/// tagged with [`In`](crate::system::In) or `()` if the function has no designated input parameter.
|
|
///
|
|
/// # Examples
|
|
///
|
|
/// ```
|
|
/// use std::num::ParseIntError;
|
|
///
|
|
/// use bevy_ecs::prelude::*;
|
|
///
|
|
/// fn main() {
|
|
/// let mut world = World::default();
|
|
/// world.insert_resource(Message("42".to_string()));
|
|
///
|
|
/// // chain the `parse_message_system`'s output into the `filter_system`s input
|
|
/// let mut chained_system = parse_message_system.chain(filter_system);
|
|
/// chained_system.initialize(&mut world);
|
|
/// assert_eq!(chained_system.run((), &mut world), Some(42));
|
|
/// }
|
|
///
|
|
/// struct Message(String);
|
|
///
|
|
/// fn parse_message_system(message: Res<Message>) -> Result<usize, ParseIntError> {
|
|
/// message.0.parse::<usize>()
|
|
/// }
|
|
///
|
|
/// fn filter_system(In(result): In<Result<usize, ParseIntError>>) -> Option<usize> {
|
|
/// result.ok().filter(|&n| n < 100)
|
|
/// }
|
|
/// ```
|
|
pub struct ChainSystem<SystemA, SystemB> {
|
|
system_a: SystemA,
|
|
system_b: SystemB,
|
|
name: Cow<'static, str>,
|
|
id: SystemId,
|
|
component_access: Access<ComponentId>,
|
|
archetype_component_access: Access<ArchetypeComponentId>,
|
|
}
|
|
|
|
impl<SystemA: System, SystemB: System<In = SystemA::Out>> System for ChainSystem<SystemA, SystemB> {
|
|
type In = SystemA::In;
|
|
type Out = SystemB::Out;
|
|
|
|
fn name(&self) -> Cow<'static, str> {
|
|
self.name.clone()
|
|
}
|
|
|
|
fn id(&self) -> SystemId {
|
|
self.id
|
|
}
|
|
|
|
fn new_archetype(&mut self, archetype: &Archetype) {
|
|
self.system_a.new_archetype(archetype);
|
|
self.system_b.new_archetype(archetype);
|
|
|
|
self.archetype_component_access
|
|
.extend(self.system_a.archetype_component_access());
|
|
self.archetype_component_access
|
|
.extend(self.system_b.archetype_component_access());
|
|
}
|
|
|
|
fn archetype_component_access(&self) -> &Access<ArchetypeComponentId> {
|
|
&self.archetype_component_access
|
|
}
|
|
|
|
fn component_access(&self) -> &Access<ComponentId> {
|
|
&self.component_access
|
|
}
|
|
|
|
fn is_send(&self) -> bool {
|
|
self.system_a.is_send() && self.system_b.is_send()
|
|
}
|
|
|
|
unsafe fn run_unsafe(&mut self, input: Self::In, world: &World) -> Self::Out {
|
|
let out = self.system_a.run_unsafe(input, world);
|
|
self.system_b.run_unsafe(out, world)
|
|
}
|
|
|
|
fn apply_buffers(&mut self, world: &mut World) {
|
|
self.system_a.apply_buffers(world);
|
|
self.system_b.apply_buffers(world);
|
|
}
|
|
|
|
fn initialize(&mut self, world: &mut World) {
|
|
self.system_a.initialize(world);
|
|
self.system_b.initialize(world);
|
|
self.component_access
|
|
.extend(self.system_a.component_access());
|
|
self.component_access
|
|
.extend(self.system_b.component_access());
|
|
}
|
|
|
|
fn check_change_tick(&mut self, change_tick: u32) {
|
|
self.system_a.check_change_tick(change_tick);
|
|
self.system_b.check_change_tick(change_tick);
|
|
}
|
|
}
|
|
|
|
/// An extension trait providing the [`IntoChainSystem::chain`] method for convenient [`System`]
|
|
/// chaining.
|
|
///
|
|
/// This trait is blanket implemented for all system pairs that fulfill the chaining requirement.
|
|
///
|
|
/// See [`ChainSystem`].
|
|
pub trait IntoChainSystem<ParamA, Payload, SystemB, ParamB, Out>:
|
|
IntoSystem<(), Payload, ParamA> + Sized
|
|
where
|
|
SystemB: IntoSystem<Payload, Out, ParamB>,
|
|
{
|
|
/// Chain this system `A` with another system `B` creating a new system that feeds system A's
|
|
/// output into system `B`, returning the output of system `B`.
|
|
fn chain(self, system: SystemB) -> ChainSystem<Self::System, SystemB::System>;
|
|
}
|
|
|
|
impl<SystemA, ParamA, Payload, SystemB, ParamB, Out>
|
|
IntoChainSystem<ParamA, Payload, SystemB, ParamB, Out> for SystemA
|
|
where
|
|
SystemA: IntoSystem<(), Payload, ParamA>,
|
|
SystemB: IntoSystem<Payload, Out, ParamB>,
|
|
{
|
|
fn chain(self, system: SystemB) -> ChainSystem<SystemA::System, SystemB::System> {
|
|
let system_a = self.system();
|
|
let system_b = system.system();
|
|
ChainSystem {
|
|
name: Cow::Owned(format!("Chain({}, {})", system_a.name(), system_b.name())),
|
|
system_a,
|
|
system_b,
|
|
archetype_component_access: Default::default(),
|
|
component_access: Default::default(),
|
|
id: SystemId::new(),
|
|
}
|
|
}
|
|
}
|