Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove FetchState #4802

Closed
wants to merge 14 commits into from
Closed

Remove FetchState #4802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4e5ae27
Parallelize transform propagation
james7132 May 16, 2022
ff0f0bc
build fixes
james7132 May 16, 2022
e9a485e
Yeet Fetch State
james7132 May 17, 2022
ae0b2d2
Fix WorldQuery derive macro
james7132 May 18, 2022
43289d3
Merge branch 'main' into yeet-fetch-state
james7132 May 21, 2022
9ffb07c
Fix docs
james7132 May 21, 2022
f4f8243
Use better references
james7132 May 21, 2022
110356a
Merge branch 'main' into yeet-fetch-state
james7132 May 30, 2022
caeb378
Review comments
james7132 May 31, 2022
24385af
Merge branch 'main' into yeet-fetch-state
james7132 Jun 19, 2022
48f8640
Fix up CI
james7132 Jun 19, 2022
42abc95
Avoid the fish
james7132 Jun 19, 2022
52a217e
Update init_state to WorldQuery
james7132 Jun 19, 2022
9ca044f
Revert "Update init_state to WorldQuery"
james7132 Jun 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions crates/bevy_ecs/macros/src/fetch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,19 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
true #(&& self.#field_idents.archetype_filter_fetch(_archetype_index))*
}

fn init_state(world: &mut #path::world::World) -> Self::State {
#state_struct_name {
#(#field_idents: #path::query::#fetch_type_alias::<'static, #field_types>::init_state(world),)*
#(#ignored_field_idents: Default::default(),)*
}
}

fn update_component_access(state: &Self::State, _access: &mut #path::query::FilteredAccess<#path::component::ComponentId>) {
#( #path::query::#fetch_type_alias::<'static, #field_types> :: update_component_access(&state.#field_idents, _access); )*
#(#path::query::#fetch_type_alias::<'static, #field_types>::update_component_access(&state.#field_idents, _access);)*
}

fn matches_component_set(state: &Self::State, _set_contains_id: &impl Fn(#path::component::ComponentId) -> bool) -> bool {
true #(&& #path::query::#fetch_type_alias::<'static, #field_types>::matches_component_set(&state.#field_idents, _set_contains_id))*
}

fn update_archetype_component_access(state: &Self::State, _archetype: &#path::archetype::Archetype, _access: &mut #path::query::Access<#path::archetype::ArchetypeComponentId>) {
Expand All @@ -274,24 +285,9 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
let state_impl = quote! {
#[doc(hidden)]
#visibility struct #state_struct_name #user_impl_generics #user_where_clauses {

#(#field_idents: <#field_types as #path::query::WorldQuery>::State,)*
#(#ignored_field_idents: #ignored_field_types,)*
}

impl #user_impl_generics #path::query::FetchState for #state_struct_name #user_ty_generics #user_where_clauses {
fn init(world: &mut #path::world::World) -> Self {
#state_struct_name {
#(#field_idents: <<#field_types as #path::query::WorldQuery>::State as #path::query::FetchState>::init(world),)*
#(#ignored_field_idents: Default::default(),)*
}
}

fn matches_component_set(&self, _set_contains_id: &impl Fn(#path::component::ComponentId) -> bool) -> bool {
true #(&& self.#field_idents.matches_component_set(_set_contains_id))*

}
}
};

let read_only_fetch_impl = if fetch_struct_attributes.is_mutable {
Expand Down
Loading