mirror of
https://github.com/bevyengine/bevy
synced 2024-11-22 20:53:53 +00:00
5af2f022d8
# Rename `WorldQueryData` & `WorldQueryFilter` to `QueryData` & `QueryFilter` Fixes #10776 ## Solution Traits `WorldQueryData` & `WorldQueryFilter` were renamed to `QueryData` and `QueryFilter`, respectively. Related Trait types were also renamed. --- ## Changelog - Trait `WorldQueryData` has been renamed to `QueryData`. Derive macro's `QueryData` attribute `world_query_data` has been renamed to `query_data`. - Trait `WorldQueryFilter` has been renamed to `QueryFilter`. Derive macro's `QueryFilter` attribute `world_query_filter` has been renamed to `query_filter`. - Trait's `ExtractComponent` type `Query` has been renamed to `Data`. - Trait's `GetBatchData` types `Query` & `QueryFilter` has been renamed to `Data` & `Filter`, respectively. - Trait's `ExtractInstance` type `Query` has been renamed to `Data`. - Trait's `ViewNode` type `ViewQuery` has been renamed to `ViewData`. - Trait's `RenderCommand` types `ViewWorldQuery` & `ItemWorldQuery` has been renamed to `ViewData` & `ItemData`, respectively. ## Migration Guide Note: if merged before 0.13 is released, this should instead modify the migration guide of #10776 with the updated names. - Rename `WorldQueryData` & `WorldQueryFilter` trait usages to `QueryData` & `QueryFilter` and their respective derive macro attributes `world_query_data` & `world_query_filter` to `query_data` & `query_filter`. - Rename the following trait type usages: - Trait's `ExtractComponent` type `Query` to `Data`. - Trait's `GetBatchData` type `Query` to `Data`. - Trait's `ExtractInstance` type `Query` to `Data`. - Trait's `ViewNode` type `ViewQuery` to `ViewData`' - Trait's `RenderCommand` types `ViewWolrdQuery` & `ItemWorldQuery` to `ViewData` & `ItemData`, respectively. ```rust // Before #[derive(WorldQueryData)] #[world_query_data(derive(Debug))] struct EmptyQuery { empty: (), } // After #[derive(QueryData)] #[query_data(derive(Debug))] struct EmptyQuery { empty: (), } // Before #[derive(WorldQueryFilter)] struct CustomQueryFilter<T: Component, P: Component> { _c: With<ComponentC>, _d: With<ComponentD>, _or: Or<(Added<ComponentC>, Changed<ComponentD>, Without<ComponentZ>)>, _generic_tuple: (With<T>, With<P>), } // After #[derive(QueryFilter)] struct CustomQueryFilter<T: Component, P: Component> { _c: With<ComponentC>, _d: With<ComponentD>, _or: Or<(Added<ComponentC>, Changed<ComponentD>, Without<ComponentZ>)>, _generic_tuple: (With<T>, With<P>), } // Before impl ExtractComponent for ContrastAdaptiveSharpeningSettings { type Query = &'static Self; type Filter = With<Camera>; type Out = (DenoiseCAS, CASUniform); fn extract_component(item: QueryItem<Self::Query>) -> Option<Self::Out> { //... } } // After impl ExtractComponent for ContrastAdaptiveSharpeningSettings { type Data = &'static Self; type Filter = With<Camera>; type Out = (DenoiseCAS, CASUniform); fn extract_component(item: QueryItem<Self::Data>) -> Option<Self::Out> { //... } } // Before impl GetBatchData for MeshPipeline { type Param = SRes<RenderMeshInstances>; type Query = Entity; type QueryFilter = With<Mesh3d>; type CompareData = (MaterialBindGroupId, AssetId<Mesh>); type BufferData = MeshUniform; fn get_batch_data( mesh_instances: &SystemParamItem<Self::Param>, entity: &QueryItem<Self::Query>, ) -> (Self::BufferData, Option<Self::CompareData>) { // .... } } // After impl GetBatchData for MeshPipeline { type Param = SRes<RenderMeshInstances>; type Data = Entity; type Filter = With<Mesh3d>; type CompareData = (MaterialBindGroupId, AssetId<Mesh>); type BufferData = MeshUniform; fn get_batch_data( mesh_instances: &SystemParamItem<Self::Param>, entity: &QueryItem<Self::Data>, ) -> (Self::BufferData, Option<Self::CompareData>) { // .... } } // Before impl<A> ExtractInstance for AssetId<A> where A: Asset, { type Query = Read<Handle<A>>; type Filter = (); fn extract(item: QueryItem<'_, Self::Query>) -> Option<Self> { Some(item.id()) } } // After impl<A> ExtractInstance for AssetId<A> where A: Asset, { type Data = Read<Handle<A>>; type Filter = (); fn extract(item: QueryItem<'_, Self::Data>) -> Option<Self> { Some(item.id()) } } // Before impl ViewNode for PostProcessNode { type ViewQuery = ( &'static ViewTarget, &'static PostProcessSettings, ); fn run( &self, _graph: &mut RenderGraphContext, render_context: &mut RenderContext, (view_target, _post_process_settings): QueryItem<Self::ViewQuery>, world: &World, ) -> Result<(), NodeRunError> { // ... } } // After impl ViewNode for PostProcessNode { type ViewData = ( &'static ViewTarget, &'static PostProcessSettings, ); fn run( &self, _graph: &mut RenderGraphContext, render_context: &mut RenderContext, (view_target, _post_process_settings): QueryItem<Self::ViewData>, world: &World, ) -> Result<(), NodeRunError> { // ... } } // Before impl<P: CachedRenderPipelinePhaseItem> RenderCommand<P> for SetItemPipeline { type Param = SRes<PipelineCache>; type ViewWorldQuery = (); type ItemWorldQuery = (); #[inline] fn render<'w>( item: &P, _view: (), _entity: (), pipeline_cache: SystemParamItem<'w, '_, Self::Param>, pass: &mut TrackedRenderPass<'w>, ) -> RenderCommandResult { // ... } } // After impl<P: CachedRenderPipelinePhaseItem> RenderCommand<P> for SetItemPipeline { type Param = SRes<PipelineCache>; type ViewData = (); type ItemData = (); #[inline] fn render<'w>( item: &P, _view: (), _entity: (), pipeline_cache: SystemParamItem<'w, '_, Self::Param>, pass: &mut TrackedRenderPass<'w>, ) -> RenderCommandResult { // ... } } ```
194 lines
6.1 KiB
Rust
194 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::{QueryData, QueryFilter},
|
|
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(QueryData)]
|
|
#[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>,
|
|
CustomQueryFilter<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(QueryData)]
|
|
#[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(QueryData)]
|
|
#[query_data(derive(Debug))]
|
|
struct EmptyQuery {
|
|
empty: (),
|
|
}
|
|
|
|
#[derive(QueryData)]
|
|
#[query_data(derive(Debug))]
|
|
struct NestedQuery {
|
|
c: &'static ComponentC,
|
|
d: Option<&'static ComponentD>,
|
|
}
|
|
|
|
#[derive(QueryData)]
|
|
#[query_data(derive(Debug))]
|
|
struct GenericQuery<T: Component, P: Component> {
|
|
generic: (&'static T, &'static P),
|
|
}
|
|
|
|
#[derive(QueryFilter)]
|
|
struct CustomQueryFilter<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>,
|
|
CustomQueryFilter<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>, CustomQueryFilter<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:?}");
|
|
}
|
|
}
|