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

Fix missing paths in ECS SystemParam derive macro (#1434)

Browse Source
This commit is contained in:
Wouter Buckens 2021-02-12 00:59:11 +01:00 committed by GitHub
parent 3a32a21fe9
commit b39df9a8d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -450,7 +450,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
impl #impl_generics #path::FetchSystemParam<'a> for #fetch_struct_name<#punctuated_generic_idents> { impl #impl_generics #path::FetchSystemParam<'a> for #fetch_struct_name<#punctuated_generic_idents> {
type Item = #struct_name#ty_generics; type Item = #struct_name#ty_generics;
fn init(system_state: &mut #path::SystemState, world: &#path::World, resources: &mut #path::Resources) { fn init(system_state: &mut #path::SystemState, world: &#path::World, resources: &mut #path::Resources) {
#(<<#field_types as SystemParam>::Fetch as #path::FetchSystemParam>::init(system_state, world, resources);)* #(<<#field_types as #path::SystemParam>::Fetch as #path::FetchSystemParam>::init(system_state, world, resources);)*
} }
unsafe fn get_param( unsafe fn get_param(
@ -459,7 +459,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
resources: &'a #path::Resources, resources: &'a #path::Resources,
) -> Option<Self::Item> { ) -> Option<Self::Item> {
Some(#struct_name { Some(#struct_name {
#(#fields: <<#field_types as SystemParam>::Fetch as #path::FetchSystemParam>::get_param(system_state, world, resources)?,)* #(#fields: <<#field_types as #path::SystemParam>::Fetch as #path::FetchSystemParam>::get_param(system_state, world, resources)?,)*
#(#ignored_fields: <#ignored_field_types>::default(),)* #(#ignored_fields: <#ignored_field_types>::default(),)*
}) })
} }