forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow deriving SystemParam on private types (#1936)

Browse Source 
Examples creating a public type to derive `SystemParam` on were updated
to create a private type where a public one is no longer needed.

Resolves #1869
This commit is contained in:
Logan Magee 2021-04-16 18:40:49 +00:00
parent cf221f9659
commit d508923eb7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/bevy_ecs/macros/src/lib.rs
View File

@ -373,13 +373,14 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
let struct_name = &ast.ident; let struct_name = &ast.ident;
let fetch_struct_name = Ident::new(&format!("{}State", struct_name), Span::call_site()); let fetch_struct_name = Ident::new(&format!("{}State", struct_name), Span::call_site());
let fetch_struct_visibility = &ast.vis;
TokenStream::from(quote! { TokenStream::from(quote! {
impl #impl_generics #path::system::SystemParam for #struct_name#ty_generics #where_clause { impl #impl_generics #path::system::SystemParam for #struct_name#ty_generics #where_clause {
type Fetch = #fetch_struct_name <(#(<#field_types as SystemParam>::Fetch,)*), #punctuated_generic_idents>; type Fetch = #fetch_struct_name <(#(<#field_types as SystemParam>::Fetch,)*), #punctuated_generic_idents>;
} }
pub struct #fetch_struct_name<TSystemParamState, #punctuated_generic_idents> { #fetch_struct_visibility struct #fetch_struct_name<TSystemParamState, #punctuated_generic_idents> {
state: TSystemParamState, state: TSystemParamState,
marker: std::marker::PhantomData<(#punctuated_generic_idents)> marker: std::marker::PhantomData<(#punctuated_generic_idents)>
} }

2
crates/bevy_ecs/src/system/system_param.rs
View File

@ -25,7 +25,7 @@ use std::{
/// use bevy_ecs::system::SystemParam; /// use bevy_ecs::system::SystemParam;
/// ///
/// #[derive(SystemParam)] /// #[derive(SystemParam)]
/// pub struct MyParam<'a> { /// struct MyParam<'a> {
/// foo: Res<'a, usize>, /// foo: Res<'a, usize>,
/// } /// }
/// ///

2
examples/ecs/system_param.rs
View File

@ -17,7 +17,7 @@ pub struct PlayerCount(usize);
/// ///
/// In this example, it includes a query and a mutable resource. /// In this example, it includes a query and a mutable resource.
#[derive(SystemParam)] #[derive(SystemParam)]
pub struct PlayerCounter<'a> { struct PlayerCounter<'a> {
players: Query<'a, &'static Player>, players: Query<'a, &'static Player>,
count: ResMut<'a, PlayerCount>, count: ResMut<'a, PlayerCount>,
} }