
# Objective - Fixes #16339 ## Solution - Replaced `component_reads_and_writes` and `component_writes` with `try_iter_component_access`. ## Testing - Ran `dynamic` example to confirm behaviour is unchanged. - CI --- ## Migration Guide The following methods (some removed in previous PRs) are now replaced by `Access::try_iter_component_access`: * `Access::component_reads_and_writes` * `Access::component_reads` * `Access::component_writes` As `try_iter_component_access` returns a `Result`, you'll now need to handle the failing case (e.g., `unwrap()`). There is currently a single failure mode, `UnboundedAccess`, which occurs when the `Access` is for all `Components` _except_ certain exclusions. Since this list is infinite, there is no meaningful way for `Access` to provide an iterator. Instead, get a list of components (e.g., from the `Components` structure) and iterate over that instead, filtering using `Access::has_component_read`, `Access::has_component_write`, etc. Additionally, you'll need to `filter_map` the accesses based on which method you're attempting to replace: * `Access::component_reads_and_writes` -> `Exclusive(_) | Shared(_)` * `Access::component_reads` -> `Shared(_)` * `Access::component_writes` -> `Exclusive(_)` To ease migration, please consider the below extension trait which you can include in your project: ```rust pub trait AccessCompatibilityExt { /// Returns the indices of the components this has access to. fn component_reads_and_writes(&self) -> impl Iterator<Item = T> + '_; /// Returns the indices of the components this has non-exclusive access to. fn component_reads(&self) -> impl Iterator<Item = T> + '_; /// Returns the indices of the components this has exclusive access to. fn component_writes(&self) -> impl Iterator<Item = T> + '_; } impl<T: SparseSetIndex> AccessCompatibilityExt for Access<T> { fn component_reads_and_writes(&self) -> impl Iterator<Item = T> + '_ { self .try_iter_component_access() .expect("Access is unbounded. Please refactor the usage of this method to directly use try_iter_component_access") .filter_map(|component_access| { let index = component_access.index().sparse_set_index(); match component_access { ComponentAccessKind::Archetypal(_) => None, ComponentAccessKind::Shared(_) => Some(index), ComponentAccessKind::Exclusive(_) => Some(index), } }) } fn component_reads(&self) -> impl Iterator<Item = T> + '_ { self .try_iter_component_access() .expect("Access is unbounded. Please refactor the usage of this method to directly use try_iter_component_access") .filter_map(|component_access| { let index = component_access.index().sparse_set_index(); match component_access { ComponentAccessKind::Archetypal(_) => None, ComponentAccessKind::Shared(_) => Some(index), ComponentAccessKind::Exclusive(_) => None, } }) } fn component_writes(&self) -> impl Iterator<Item = T> + '_ { self .try_iter_component_access() .expect("Access is unbounded. Please refactor the usage of this method to directly use try_iter_component_access") .filter_map(|component_access| { let index = component_access.index().sparse_set_index(); match component_access { ComponentAccessKind::Archetypal(_) => None, ComponentAccessKind::Shared(_) => None, ComponentAccessKind::Exclusive(_) => Some(index), } }) } } ``` Please take note of the use of `expect(...)` in these methods. You should consider using these as a starting point for a more appropriate migration based on your specific needs. ## Notes - This new method is fallible based on whether the `Access` is bounded or unbounded (unbounded occurring with inverted component sets). If bounded, will return an iterator of every item and its access level. I believe this makes sense without exposing implementation details around `Access`. - The access level is defined by an `enum` `ComponentAccessKind<T>`, either `Archetypical`, `Shared`, or `Exclusive`. As a convenience, this `enum` has a method `index` to get the inner `T` value without a match statement. It does add more code, but the API is clearer. - Within `QueryBuilder` this new method simplifies several pieces of logic without changing behaviour. - Within `QueryState` the logic is simplified and the amount of iteration is reduced, potentially improving performance. - Within the `dynamic` example it has identical behaviour, with the inversion footgun explicitly highlighted by an `unwrap`. --------- Co-authored-by: Chris Russell <8494645+chescock@users.noreply.github.com> Co-authored-by: Mike <2180432+hymm@users.noreply.github.com>
279 lines
10 KiB
Rust
279 lines
10 KiB
Rust
#![expect(
|
|
unsafe_code,
|
|
reason = "Unsafe code is needed to work with dynamic components"
|
|
)]
|
|
|
|
//! This example show how you can create components dynamically, spawn entities with those components
|
|
//! as well as query for entities with those components.
|
|
|
|
use std::{alloc::Layout, collections::HashMap, io::Write, ptr::NonNull};
|
|
|
|
use bevy::{
|
|
ecs::{
|
|
component::{
|
|
ComponentCloneBehavior, ComponentDescriptor, ComponentId, ComponentInfo, StorageType,
|
|
},
|
|
query::{ComponentAccessKind, QueryData},
|
|
world::FilteredEntityMut,
|
|
},
|
|
prelude::*,
|
|
ptr::{Aligned, OwningPtr},
|
|
};
|
|
|
|
const PROMPT: &str = "
|
|
Commands:
|
|
comp, c Create new components
|
|
spawn, s Spawn entities
|
|
query, q Query for entities
|
|
Enter a command with no parameters for usage.";
|
|
|
|
const COMPONENT_PROMPT: &str = "
|
|
comp, c Create new components
|
|
Enter a comma separated list of type names optionally followed by a size in u64s.
|
|
e.g. CompA 3, CompB, CompC 2";
|
|
|
|
const ENTITY_PROMPT: &str = "
|
|
spawn, s Spawn entities
|
|
Enter a comma separated list of components optionally followed by values.
|
|
e.g. CompA 0 1 0, CompB, CompC 1";
|
|
|
|
const QUERY_PROMPT: &str = "
|
|
query, q Query for entities
|
|
Enter a query to fetch and update entities
|
|
Components with read or write access will be displayed with their values
|
|
Components with write access will have their fields incremented by one
|
|
|
|
Accesses: 'A' with, '&A' read, '&mut A' write
|
|
Operators: '||' or, ',' and, '?' optional
|
|
|
|
e.g. &A || &B, &mut C, D, ?E";
|
|
|
|
fn main() {
|
|
let mut world = World::new();
|
|
let mut lines = std::io::stdin().lines();
|
|
let mut component_names = HashMap::<String, ComponentId>::new();
|
|
let mut component_info = HashMap::<ComponentId, ComponentInfo>::new();
|
|
|
|
println!("{PROMPT}");
|
|
loop {
|
|
print!("\n> ");
|
|
let _ = std::io::stdout().flush();
|
|
let Some(Ok(line)) = lines.next() else {
|
|
return;
|
|
};
|
|
|
|
if line.is_empty() {
|
|
return;
|
|
};
|
|
|
|
let Some((first, rest)) = line.trim().split_once(|c: char| c.is_whitespace()) else {
|
|
match &line.chars().next() {
|
|
Some('c') => println!("{COMPONENT_PROMPT}"),
|
|
Some('s') => println!("{ENTITY_PROMPT}"),
|
|
Some('q') => println!("{QUERY_PROMPT}"),
|
|
_ => println!("{PROMPT}"),
|
|
}
|
|
continue;
|
|
};
|
|
|
|
match &first[0..1] {
|
|
"c" => {
|
|
rest.split(',').for_each(|component| {
|
|
let mut component = component.split_whitespace();
|
|
let Some(name) = component.next() else {
|
|
return;
|
|
};
|
|
let size = match component.next().map(str::parse) {
|
|
Some(Ok(size)) => size,
|
|
_ => 0,
|
|
};
|
|
// Register our new component to the world with a layout specified by it's size
|
|
// SAFETY: [u64] is Send + Sync
|
|
let id = world.register_component_with_descriptor(unsafe {
|
|
ComponentDescriptor::new_with_layout(
|
|
name.to_string(),
|
|
StorageType::Table,
|
|
Layout::array::<u64>(size).unwrap(),
|
|
None,
|
|
true,
|
|
ComponentCloneBehavior::Default,
|
|
)
|
|
});
|
|
let Some(info) = world.components().get_info(id) else {
|
|
return;
|
|
};
|
|
component_names.insert(name.to_string(), id);
|
|
component_info.insert(id, info.clone());
|
|
println!("Component {} created with id: {}", name, id.index());
|
|
});
|
|
}
|
|
"s" => {
|
|
let mut to_insert_ids = Vec::new();
|
|
let mut to_insert_data = Vec::new();
|
|
rest.split(',').for_each(|component| {
|
|
let mut component = component.split_whitespace();
|
|
let Some(name) = component.next() else {
|
|
return;
|
|
};
|
|
|
|
// Get the id for the component with the given name
|
|
let Some(&id) = component_names.get(name) else {
|
|
println!("Component {name} does not exist");
|
|
return;
|
|
};
|
|
|
|
// Calculate the length for the array based on the layout created for this component id
|
|
let info = world.components().get_info(id).unwrap();
|
|
let len = info.layout().size() / size_of::<u64>();
|
|
let mut values: Vec<u64> = component
|
|
.take(len)
|
|
.filter_map(|value| value.parse::<u64>().ok())
|
|
.collect();
|
|
values.resize(len, 0);
|
|
|
|
// Collect the id and array to be inserted onto our entity
|
|
to_insert_ids.push(id);
|
|
to_insert_data.push(values);
|
|
});
|
|
|
|
let mut entity = world.spawn_empty();
|
|
|
|
// Construct an `OwningPtr` for each component in `to_insert_data`
|
|
let to_insert_ptr = to_owning_ptrs(&mut to_insert_data);
|
|
|
|
// SAFETY:
|
|
// - Component ids have been taken from the same world
|
|
// - Each array is created to the layout specified in the world
|
|
unsafe {
|
|
entity.insert_by_ids(&to_insert_ids, to_insert_ptr.into_iter());
|
|
}
|
|
|
|
println!("Entity spawned with id: {}", entity.id());
|
|
}
|
|
"q" => {
|
|
let mut builder = QueryBuilder::<FilteredEntityMut>::new(&mut world);
|
|
parse_query(rest, &mut builder, &component_names);
|
|
let mut query = builder.build();
|
|
query.iter_mut(&mut world).for_each(|filtered_entity| {
|
|
let terms = filtered_entity
|
|
.access()
|
|
.try_iter_component_access()
|
|
.unwrap()
|
|
.map(|component_access| {
|
|
let id = *component_access.index();
|
|
let ptr = filtered_entity.get_by_id(id).unwrap();
|
|
let info = component_info.get(&id).unwrap();
|
|
let len = info.layout().size() / size_of::<u64>();
|
|
|
|
// SAFETY:
|
|
// - All components are created with layout [u64]
|
|
// - len is calculated from the component descriptor
|
|
let data = unsafe {
|
|
std::slice::from_raw_parts_mut(
|
|
ptr.assert_unique().as_ptr().cast::<u64>(),
|
|
len,
|
|
)
|
|
};
|
|
|
|
// If we have write access, increment each value once
|
|
if matches!(component_access, ComponentAccessKind::Exclusive(_)) {
|
|
data.iter_mut().for_each(|data| {
|
|
*data += 1;
|
|
});
|
|
}
|
|
|
|
format!("{}: {:?}", info.name(), data[0..len].to_vec())
|
|
})
|
|
.collect::<Vec<_>>()
|
|
.join(", ");
|
|
|
|
println!("{}: {}", filtered_entity.id(), terms);
|
|
});
|
|
}
|
|
_ => continue,
|
|
}
|
|
}
|
|
}
|
|
|
|
// Constructs `OwningPtr` for each item in `components`
|
|
// By sharing the lifetime of `components` with the resulting ptrs we ensure we don't drop the data before use
|
|
fn to_owning_ptrs(components: &mut [Vec<u64>]) -> Vec<OwningPtr<Aligned>> {
|
|
components
|
|
.iter_mut()
|
|
.map(|data| {
|
|
let ptr = data.as_mut_ptr();
|
|
// SAFETY:
|
|
// - Pointers are guaranteed to be non-null
|
|
// - Memory pointed to won't be dropped until `components` is dropped
|
|
unsafe {
|
|
let non_null = NonNull::new_unchecked(ptr.cast());
|
|
OwningPtr::new(non_null)
|
|
}
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
fn parse_term<Q: QueryData>(
|
|
str: &str,
|
|
builder: &mut QueryBuilder<Q>,
|
|
components: &HashMap<String, ComponentId>,
|
|
) {
|
|
let mut matched = false;
|
|
let str = str.trim();
|
|
match str.chars().next() {
|
|
// Optional term
|
|
Some('?') => {
|
|
builder.optional(|b| parse_term(&str[1..], b, components));
|
|
matched = true;
|
|
}
|
|
// Reference term
|
|
Some('&') => {
|
|
let mut parts = str.split_whitespace();
|
|
let first = parts.next().unwrap();
|
|
if first == "&mut" {
|
|
if let Some(str) = parts.next() {
|
|
if let Some(&id) = components.get(str) {
|
|
builder.mut_id(id);
|
|
matched = true;
|
|
}
|
|
};
|
|
} else if let Some(&id) = components.get(&first[1..]) {
|
|
builder.ref_id(id);
|
|
matched = true;
|
|
}
|
|
}
|
|
// With term
|
|
Some(_) => {
|
|
if let Some(&id) = components.get(str) {
|
|
builder.with_id(id);
|
|
matched = true;
|
|
}
|
|
}
|
|
None => {}
|
|
};
|
|
|
|
if !matched {
|
|
println!("Unable to find component: {str}");
|
|
}
|
|
}
|
|
|
|
fn parse_query<Q: QueryData>(
|
|
str: &str,
|
|
builder: &mut QueryBuilder<Q>,
|
|
components: &HashMap<String, ComponentId>,
|
|
) {
|
|
let str = str.split(',');
|
|
str.for_each(|term| {
|
|
let sub_terms: Vec<_> = term.split("||").collect();
|
|
if sub_terms.len() == 1 {
|
|
parse_term(sub_terms[0], builder, components);
|
|
} else {
|
|
builder.or(|b| {
|
|
sub_terms
|
|
.iter()
|
|
.for_each(|term| parse_term(term, b, components));
|
|
});
|
|
}
|
|
});
|
|
}
|