 ba6b74ba20
			
		
	
	
		ba6b74ba20
		
	
	
	
	
		
			
			# Objective - Closes #786 - Closes #2252 - Closes #2588 This PR implements a derive macro that allows users to define their queries as structs with named fields. ## Example ```rust #[derive(WorldQuery)] #[world_query(derive(Debug))] struct NumQuery<'w, T: Component, P: Component> { entity: Entity, u: UNumQuery<'w>, generic: GenericQuery<'w, T, P>, } #[derive(WorldQuery)] #[world_query(derive(Debug))] struct UNumQuery<'w> { u_16: &'w u16, u_32_opt: Option<&'w u32>, } #[derive(WorldQuery)] #[world_query(derive(Debug))] struct GenericQuery<'w, T: Component, P: Component> { generic: (&'w T, &'w P), } #[derive(WorldQuery)] #[world_query(filter)] struct NumQueryFilter<T: Component, P: Component> { _u_16: With<u16>, _u_32: With<u32>, _or: Or<(With<i16>, Changed<u16>, Added<u32>)>, _generic_tuple: (With<T>, With<P>), _without: Without<Option<u16>>, _tp: PhantomData<(T, P)>, } fn print_nums_readonly(query: Query<NumQuery<u64, i64>, NumQueryFilter<u64, i64>>) { for num in query.iter() { println!("{:#?}", num); } } #[derive(WorldQuery)] #[world_query(mutable, derive(Debug))] struct MutNumQuery<'w, T: Component, P: Component> { i_16: &'w mut i16, i_32_opt: Option<&'w mut i32>, } fn print_nums(mut query: Query<MutNumQuery, NumQueryFilter<u64, i64>>) { for num in query.iter_mut() { println!("{:#?}", num); } } ``` ## TODOs: - [x] Add support for `&T` and `&mut T` - [x] Test - [x] Add support for optional types - [x] Test - [x] Add support for `Entity` - [x] Test - [x] Add support for nested `WorldQuery` - [x] Test - [x] Add support for tuples - [x] Test - [x] Add support for generics - [x] Test - [x] Add support for query filters - [x] Test - [x] Add support for `PhantomData` - [x] Test - [x] Refactor `read_world_query_field_type_info` - [x] Properly document `readonly` attribute for nested queries and the static assertions that guarantee safety - [x] Test that we never implement `ReadOnlyFetch` for types that need mutable access - [x] Test that we insert static assertions for nested `WorldQuery` that a user marked as readonly
		
			
				
	
	
		
			201 lines
		
	
	
		
			6.7 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			201 lines
		
	
	
		
			6.7 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use bevy::{
 | |
|     ecs::{component::Component, query::WorldQuery},
 | |
|     prelude::*,
 | |
| };
 | |
| use std::{fmt::Debug, marker::PhantomData};
 | |
| 
 | |
| /// This examples illustrates the usage of the `WorldQuery` derive macro, which allows
 | |
| /// defining custom query and filter types.
 | |
| ///
 | |
| /// While regular tuple queries work great in most of simple scenarios, using custom queries
 | |
| /// declared as named structs can bring the following advantages:
 | |
| /// - They help to avoid destructuring or using `q.0, q.1, ...` access pattern.
 | |
| /// - Adding, removing components or changing items order with structs greatly reduces maintenance
 | |
| ///   burden, as you don't need to update statements that destructure tuples, care about order
 | |
| ///   of elements, etc. Instead, you can just add or remove places where a certain element is used.
 | |
| /// - Named structs enable the composition pattern, that makes query types easier to re-use.
 | |
| /// - You can bypass the limit of 15 components that exists for query tuples.
 | |
| ///
 | |
| /// For more details on the `WorldQuery` derive macro, see the trait documentation.
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_startup_system(spawn)
 | |
|         .add_system(print_components_read_only.label("print_components_read_only"))
 | |
|         .add_system(
 | |
|             print_components_iter_mut
 | |
|                 .label("print_components_iter_mut")
 | |
|                 .after("print_components_read_only"),
 | |
|         )
 | |
|         .add_system(
 | |
|             print_components_iter
 | |
|                 .label("print_components_iter")
 | |
|                 .after("print_components_iter_mut"),
 | |
|         )
 | |
|         .add_system(print_components_tuple.after("print_components_iter"))
 | |
|         .run();
 | |
| }
 | |
| 
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentA;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentB;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentC;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentD;
 | |
| #[derive(Component, Debug)]
 | |
| struct ComponentZ;
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct ReadOnlyCustomQuery<'w, T: Component + Debug, P: Component + Debug> {
 | |
|     entity: Entity,
 | |
|     a: &'w ComponentA,
 | |
|     b: Option<&'w ComponentB>,
 | |
|     nested: NestedQuery<'w>,
 | |
|     optional_nested: Option<NestedQuery<'w>>,
 | |
|     optional_tuple: Option<(&'w ComponentB, &'w ComponentZ)>,
 | |
|     generic: GenericQuery<'w, T, P>,
 | |
|     empty: EmptyQuery<'w>,
 | |
| }
 | |
| 
 | |
| fn print_components_read_only(
 | |
|     query: Query<ReadOnlyCustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (read_only):");
 | |
|     for e in query.iter() {
 | |
|         println!("Entity: {:?}", e.entity);
 | |
|         println!("A: {:?}", e.a);
 | |
|         println!("B: {:?}", e.b);
 | |
|         println!("Nested: {:?}", e.nested);
 | |
|         println!("Optional nested: {:?}", e.optional_nested);
 | |
|         println!("Optional tuple: {:?}", e.optional_tuple);
 | |
|         println!("Generic: {:?}", e.generic);
 | |
|     }
 | |
|     println!();
 | |
| }
 | |
| 
 | |
| // If you are going to mutate the data in a query, you must mark it with the `mutable` attribute.
 | |
| // The `WorldQuery` derive macro will still create a read-only version, which will be have `ReadOnly`
 | |
| // suffix.
 | |
| // Note: if you want to use derive macros with read-only query variants, you need to pass them with
 | |
| // using the `derive` attribute.
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(mutable, derive(Debug))]
 | |
| struct CustomQuery<'w, T: Component + Debug, P: Component + Debug> {
 | |
|     entity: Entity,
 | |
|     a: &'w mut ComponentA,
 | |
|     b: Option<&'w mut ComponentB>,
 | |
|     nested: NestedQuery<'w>,
 | |
|     optional_nested: Option<NestedQuery<'w>>,
 | |
|     optional_tuple: Option<(NestedQuery<'w>, &'w mut ComponentZ)>,
 | |
|     generic: GenericQuery<'w, T, P>,
 | |
|     empty: EmptyQuery<'w>,
 | |
| }
 | |
| 
 | |
| // This is a valid query as well, which would iterate over every entity.
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct EmptyQuery<'w> {
 | |
|     // The derive macro expect a lifetime. As Rust doesn't allow unused lifetimes, we need
 | |
|     // to use `PhantomData` as a work around.
 | |
|     #[world_query(ignore)]
 | |
|     _w: std::marker::PhantomData<&'w ()>,
 | |
| }
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct NestedQuery<'w> {
 | |
|     c: &'w ComponentC,
 | |
|     d: Option<&'w ComponentD>,
 | |
| }
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(derive(Debug))]
 | |
| struct GenericQuery<'w, T: Component, P: Component> {
 | |
|     generic: (&'w T, &'w P),
 | |
| }
 | |
| 
 | |
| #[derive(WorldQuery)]
 | |
| #[world_query(filter)]
 | |
| struct QueryFilter<T: Component, P: Component> {
 | |
|     _c: With<ComponentC>,
 | |
|     _d: With<ComponentD>,
 | |
|     _or: Or<(Added<ComponentC>, Changed<ComponentD>, Without<ComponentZ>)>,
 | |
|     _generic_tuple: (With<T>, With<P>),
 | |
|     #[world_query(ignore)]
 | |
|     _tp: PhantomData<(T, P)>,
 | |
| }
 | |
| 
 | |
| fn spawn(mut commands: Commands) {
 | |
|     commands
 | |
|         .spawn()
 | |
|         .insert(ComponentA)
 | |
|         .insert(ComponentB)
 | |
|         .insert(ComponentC)
 | |
|         .insert(ComponentD);
 | |
| }
 | |
| 
 | |
| fn print_components_iter_mut(
 | |
|     mut query: Query<CustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (iter_mut):");
 | |
|     for e in query.iter_mut() {
 | |
|         // Re-declaring the variable to illustrate the type of the actual iterator item.
 | |
|         let e: CustomQueryItem<'_, _, _> = e;
 | |
|         println!("Entity: {:?}", e.entity);
 | |
|         println!("A: {:?}", e.a);
 | |
|         println!("B: {:?}", e.b);
 | |
|         println!("Optional nested: {:?}", e.optional_nested);
 | |
|         println!("Optional tuple: {:?}", e.optional_tuple);
 | |
|         println!("Nested: {:?}", e.nested);
 | |
|         println!("Generic: {:?}", e.generic);
 | |
|     }
 | |
|     println!();
 | |
| }
 | |
| 
 | |
| fn print_components_iter(
 | |
|     query: Query<CustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (iter):");
 | |
|     for e in query.iter() {
 | |
|         // Re-declaring the variable to illustrate the type of the actual iterator item.
 | |
|         let e: CustomQueryReadOnlyItem<'_, _, _> = e;
 | |
|         println!("Entity: {:?}", e.entity);
 | |
|         println!("A: {:?}", e.a);
 | |
|         println!("B: {:?}", e.b);
 | |
|         println!("Nested: {:?}", e.nested);
 | |
|         println!("Generic: {:?}", e.generic);
 | |
|     }
 | |
|     println!();
 | |
| }
 | |
| 
 | |
| type NestedTupleQuery<'w> = (&'w ComponentC, &'w ComponentD);
 | |
| type GenericTupleQuery<'w, T, P> = (&'w T, &'w P);
 | |
| 
 | |
| fn print_components_tuple(
 | |
|     query: Query<
 | |
|         (
 | |
|             Entity,
 | |
|             &ComponentA,
 | |
|             &ComponentB,
 | |
|             NestedTupleQuery,
 | |
|             GenericTupleQuery<ComponentC, ComponentD>,
 | |
|         ),
 | |
|         (
 | |
|             With<ComponentC>,
 | |
|             With<ComponentD>,
 | |
|             Or<(Added<ComponentC>, Changed<ComponentD>, Without<ComponentZ>)>,
 | |
|         ),
 | |
|     >,
 | |
| ) {
 | |
|     println!("Print components (tuple):");
 | |
|     for (entity, a, b, nested, (generic_c, generic_d)) in query.iter() {
 | |
|         println!("Entity: {:?}", entity);
 | |
|         println!("A: {:?}", a);
 | |
|         println!("B: {:?}", b);
 | |
|         println!("Nested: {:?} {:?}", nested.0, nested.1);
 | |
|         println!("Generic: {:?} {:?}", generic_c, generic_d);
 | |
|     }
 | |
| }
 |