 f0a8994f55
			
		
	
	
		f0a8994f55
		
			
		
	
	
	
	
		
			
			# Objective - Fixes #7680 - This is an updated for https://github.com/bevyengine/bevy/pull/8899 which had the same objective but fell a long way behind the latest changes ## Solution The traits `WorldQueryData : WorldQuery` and `WorldQueryFilter : WorldQuery` have been added and some of the types and functions from `WorldQuery` has been moved into them. `ReadOnlyWorldQuery` has been replaced with `ReadOnlyWorldQueryData`. `WorldQueryFilter` is safe (as long as `WorldQuery` is implemented safely). `WorldQueryData` is unsafe - safely implementing it requires that `Self::ReadOnly` is a readonly version of `Self` (this used to be a safety requirement of `WorldQuery`) The type parameters `Q` and `F` of `Query` must now implement `WorldQueryData` and `WorldQueryFilter` respectively. This makes it impossible to accidentally use a filter in the data position or vice versa which was something that could lead to bugs. ~~Compile failure tests have been added to check this.~~ It was previously sometimes useful to use `Option<With<T>>` in the data position. Use `Has<T>` instead in these cases. The `WorldQuery` derive macro has been split into separate derive macros for `WorldQueryData` and `WorldQueryFilter`. Previously it was possible to derive both `WorldQuery` for a struct that had a mixture of data and filter items. This would not work correctly in some cases but could be a useful pattern in others. *This is no longer possible.* --- ## Notes - The changes outside of `bevy_ecs` are all changing type parameters to the new types, updating the macro use, or replacing `Option<With<T>>` with `Has<T>`. - All `WorldQueryData` types always returned `true` for `IS_ARCHETYPAL` so I moved it to `WorldQueryFilter` and replaced all calls to it with `true`. That should be the only logic change outside of the macro generation code. - `Changed<T>` and `Added<T>` were being generated by a macro that I have expanded. Happy to revert that if desired. - The two derive macros share some functions for implementing `WorldQuery` but the tidiest way I could find to implement them was to give them a ton of arguments and ask clippy to ignore that. ## Changelog ### Changed - Split `WorldQuery` into `WorldQueryData` and `WorldQueryFilter` which now have separate derive macros. It is not possible to derive both for the same type. - `Query` now requires that the first type argument implements `WorldQueryData` and the second implements `WorldQueryFilter` ## Migration Guide - Update derives ```rust // old #[derive(WorldQuery)] #[world_query(mutable, derive(Debug))] struct CustomQuery { entity: Entity, a: &'static mut ComponentA } #[derive(WorldQuery)] struct QueryFilter { _c: With<ComponentC> } // new #[derive(WorldQueryData)] #[world_query_data(mutable, derive(Debug))] struct CustomQuery { entity: Entity, a: &'static mut ComponentA, } #[derive(WorldQueryFilter)] struct QueryFilter { _c: With<ComponentC> } ``` - Replace `Option<With<T>>` with `Has<T>` ```rust /// old fn my_system(query: Query<(Entity, Option<With<ComponentA>>)>) { for (entity, has_a_option) in query.iter(){ let has_a:bool = has_a_option.is_some(); //todo!() } } /// new fn my_system(query: Query<(Entity, Has<ComponentA>)>) { for (entity, has_a) in query.iter(){ //todo!() } } ``` - Fix queries which had filters in the data position or vice versa. ```rust // old fn my_system(query: Query<(Entity, With<ComponentA>)>) { for (entity, _) in query.iter(){ //todo!() } } // new fn my_system(query: Query<Entity, With<ComponentA>>) { for entity in query.iter(){ //todo!() } } // old fn my_system(query: Query<AnyOf<(&ComponentA, With<ComponentB>)>>) { for (entity, _) in query.iter(){ //todo!() } } // new fn my_system(query: Query<Option<&ComponentA>, Or<(With<ComponentA>, With<ComponentB>)>>) { for entity in query.iter(){ //todo!() } } ``` --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
		
			
				
	
	
		
			189 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			189 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! This example 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.
 | |
| 
 | |
| use bevy::{
 | |
|     ecs::query::{WorldQueryData, WorldQueryFilter},
 | |
|     prelude::*,
 | |
| };
 | |
| use std::fmt::Debug;
 | |
| 
 | |
| fn main() {
 | |
|     App::new()
 | |
|         .add_systems(Startup, spawn)
 | |
|         .add_systems(
 | |
|             Update,
 | |
|             (
 | |
|                 print_components_read_only,
 | |
|                 print_components_iter_mut,
 | |
|                 print_components_iter,
 | |
|                 print_components_tuple,
 | |
|             )
 | |
|                 .chain(),
 | |
|         )
 | |
|         .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(WorldQueryData)]
 | |
| #[world_query_data(derive(Debug))]
 | |
| struct ReadOnlyCustomQuery<T: Component + Debug, P: Component + Debug> {
 | |
|     entity: Entity,
 | |
|     a: &'static ComponentA,
 | |
|     b: Option<&'static ComponentB>,
 | |
|     nested: NestedQuery,
 | |
|     optional_nested: Option<NestedQuery>,
 | |
|     optional_tuple: Option<(&'static ComponentB, &'static ComponentZ)>,
 | |
|     generic: GenericQuery<T, P>,
 | |
|     empty: EmptyQuery,
 | |
| }
 | |
| 
 | |
| fn print_components_read_only(
 | |
|     query: Query<ReadOnlyCustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (read_only):");
 | |
|     for e in &query {
 | |
|         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(WorldQueryData)]
 | |
| #[world_query_data(mutable, derive(Debug))]
 | |
| struct CustomQuery<T: Component + Debug, P: Component + Debug> {
 | |
|     entity: Entity,
 | |
|     a: &'static mut ComponentA,
 | |
|     b: Option<&'static mut ComponentB>,
 | |
|     nested: NestedQuery,
 | |
|     optional_nested: Option<NestedQuery>,
 | |
|     optional_tuple: Option<(NestedQuery, &'static mut ComponentZ)>,
 | |
|     generic: GenericQuery<T, P>,
 | |
|     empty: EmptyQuery,
 | |
| }
 | |
| 
 | |
| // This is a valid query as well, which would iterate over every entity.
 | |
| #[derive(WorldQueryData)]
 | |
| #[world_query_data(derive(Debug))]
 | |
| struct EmptyQuery {
 | |
|     empty: (),
 | |
| }
 | |
| 
 | |
| #[derive(WorldQueryData)]
 | |
| #[world_query_data(derive(Debug))]
 | |
| struct NestedQuery {
 | |
|     c: &'static ComponentC,
 | |
|     d: Option<&'static ComponentD>,
 | |
| }
 | |
| 
 | |
| #[derive(WorldQueryData)]
 | |
| #[world_query_data(derive(Debug))]
 | |
| struct GenericQuery<T: Component, P: Component> {
 | |
|     generic: (&'static T, &'static P),
 | |
| }
 | |
| 
 | |
| #[derive(WorldQueryFilter)]
 | |
| 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>),
 | |
| }
 | |
| 
 | |
| fn spawn(mut commands: Commands) {
 | |
|     commands.spawn((ComponentA, ComponentB, ComponentC, ComponentD));
 | |
| }
 | |
| 
 | |
| fn print_components_iter_mut(
 | |
|     mut query: Query<CustomQuery<ComponentC, ComponentD>, QueryFilter<ComponentC, ComponentD>>,
 | |
| ) {
 | |
|     println!("Print components (iter_mut):");
 | |
|     for e in &mut query {
 | |
|         // 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 {
 | |
|         // 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 {
 | |
|         println!("Entity: {entity:?}");
 | |
|         println!("A: {a:?}");
 | |
|         println!("B: {b:?}");
 | |
|         println!("Nested: {:?} {:?}", nested.0, nested.1);
 | |
|         println!("Generic: {generic_c:?} {generic_d:?}");
 | |
|     }
 | |
| }
 |