mirror of
https://github.com/bevyengine/bevy
synced 2025-02-19 15:38:36 +00:00
This adds support for one-to-many non-fragmenting relationships (with planned paths for fragmenting and non-fragmenting many-to-many relationships). "Non-fragmenting" means that entities with the same relationship type, but different relationship targets, are not forced into separate tables (which would cause "table fragmentation"). Functionally, this fills a similar niche as the current Parent/Children system. The biggest differences are: 1. Relationships have simpler internals and significantly improved performance and UX. Commands and specialized APIs are no longer necessary to keep everything in sync. Just spawn entities with the relationship components you want and everything "just works". 2. Relationships are generalized. Bevy can provide additional built in relationships, and users can define their own. **REQUEST TO REVIEWERS**: _please don't leave top level comments and instead comment on specific lines of code. That way we can take advantage of threaded discussions. Also dont leave comments simply pointing out CI failures as I can read those just fine._ ## Built on top of what we have Relationships are implemented on top of the Bevy ECS features we already have: components, immutability, and hooks. This makes them immediately compatible with all of our existing (and future) APIs for querying, spawning, removing, scenes, reflection, etc. The fewer specialized APIs we need to build, maintain, and teach, the better. ## Why focus on one-to-many non-fragmenting first? 1. This allows us to improve Parent/Children relationships immediately, in a way that is reasonably uncontroversial. Switching our hierarchy to fragmenting relationships would have significant performance implications. ~~Flecs is heavily considering a switch to non-fragmenting relations after careful considerations of the performance tradeoffs.~~ _(Correction from @SanderMertens: Flecs is implementing non-fragmenting storage specialized for asset hierarchies, where asset hierarchies are many instances of small trees that have a well defined structure)_ 2. Adding generalized one-to-many relationships is currently a priority for the [Next Generation Scene / UI effort](https://github.com/bevyengine/bevy/discussions/14437). Specifically, we're interested in building reactions and observers on top. ## The changes This PR does the following: 1. Adds a generic one-to-many Relationship system 3. Ports the existing Parent/Children system to Relationships, which now lives in `bevy_ecs::hierarchy`. The old `bevy_hierarchy` crate has been removed. 4. Adds on_despawn component hooks 5. Relationships can opt-in to "despawn descendants" behavior, meaning that the entire relationship hierarchy is despawned when `entity.despawn()` is called. The built in Parent/Children hierarchies enable this behavior, and `entity.despawn_recursive()` has been removed. 6. `world.spawn` now applies commands after spawning. This ensures that relationship bookkeeping happens immediately and removes the need to manually flush. This is in line with the equivalent behaviors recently added to the other APIs (ex: insert). 7. Removes the ValidParentCheckPlugin (system-driven / poll based) in favor of a `validate_parent_has_component` hook. ## Using Relationships The `Relationship` trait looks like this: ```rust pub trait Relationship: Component + Sized { type RelationshipSources: RelationshipSources<Relationship = Self>; fn get(&self) -> Entity; fn from(entity: Entity) -> Self; } ``` A relationship is a component that: 1. Is a simple wrapper over a "target" Entity. 2. Has a corresponding `RelationshipSources` component, which is a simple wrapper over a collection of entities. Every "target entity" targeted by a "source entity" with a `Relationship` has a `RelationshipSources` component, which contains every "source entity" that targets it. For example, the `Parent` component (as it currently exists in Bevy) is the `Relationship` component and the entity containing the Parent is the "source entity". The entity _inside_ the `Parent(Entity)` component is the "target entity". And that target entity has a `Children` component (which implements `RelationshipSources`). In practice, the Parent/Children relationship looks like this: ```rust #[derive(Relationship)] #[relationship(relationship_sources = Children)] pub struct Parent(pub Entity); #[derive(RelationshipSources)] #[relationship_sources(relationship = Parent)] pub struct Children(Vec<Entity>); ``` The Relationship and RelationshipSources derives automatically implement Component with the relevant configuration (namely, the hooks necessary to keep everything in sync). The most direct way to add relationships is to spawn entities with relationship components: ```rust let a = world.spawn_empty().id(); let b = world.spawn(Parent(a)).id(); assert_eq!(world.entity(a).get::<Children>().unwrap(), &[b]); ``` There are also convenience APIs for spawning more than one entity with the same relationship: ```rust world.spawn_empty().with_related::<Children>(|s| { s.spawn_empty(); s.spawn_empty(); }) ``` The existing `with_children` API is now a simpler wrapper over `with_related`. This makes this change largely non-breaking for existing spawn patterns. ```rust world.spawn_empty().with_children(|s| { s.spawn_empty(); s.spawn_empty(); }) ``` There are also other relationship APIs, such as `add_related` and `despawn_related`. ## Automatic recursive despawn via the new on_despawn hook `RelationshipSources` can opt-in to "despawn descendants" behavior, which will despawn all related entities in the relationship hierarchy: ```rust #[derive(RelationshipSources)] #[relationship_sources(relationship = Parent, despawn_descendants)] pub struct Children(Vec<Entity>); ``` This means that `entity.despawn_recursive()` is no longer required. Instead, just use `entity.despawn()` and the relevant related entities will also be despawned. To despawn an entity _without_ despawning its parent/child descendants, you should remove the `Children` component first, which will also remove the related `Parent` components: ```rust entity .remove::<Children>() .despawn() ``` This builds on the on_despawn hook introduced in this PR, which is fired when an entity is despawned (before other hooks). ## Relationships are the source of truth `Relationship` is the _single_ source of truth component. `RelationshipSources` is merely a reflection of what all the `Relationship` components say. By embracing this, we are able to significantly improve the performance of the system as a whole. We can rely on component lifecycles to protect us against duplicates, rather than needing to scan at runtime to ensure entities don't already exist (which results in quadratic runtime). A single source of truth gives us constant-time inserts. This does mean that we cannot directly spawn populated `Children` components (or directly add or remove entities from those components). I personally think this is a worthwhile tradeoff, both because it makes the performance much better _and_ because it means theres exactly one way to do things (which is a philosophy we try to employ for Bevy APIs). As an aside: treating both sides of the relationship as "equivalent source of truth relations" does enable building simple and flexible many-to-many relationships. But this introduces an _inherent_ need to scan (or hash) to protect against duplicates. [`evergreen_relations`](https://github.com/EvergreenNest/evergreen_relations) has a very nice implementation of the "symmetrical many-to-many" approach. Unfortunately I think the performance issues inherent to that approach make it a poor choice for Bevy's default relationship system. ## Followup Work * Discuss renaming `Parent` to `ChildOf`. I refrained from doing that in this PR to keep the diff reasonable, but I'm personally biased toward this change (and using that naming pattern generally for relationships). * [Improved spawning ergonomics](https://github.com/bevyengine/bevy/discussions/16920) * Consider adding relationship observers/triggers for "relationship targets" whenever a source is added or removed. This would replace the current "hierarchy events" system, which is unused upstream but may have existing users downstream. I think triggers are the better fit for this than a buffered event queue, and would prefer not to add that back. * Fragmenting relations: My current idea hinges on the introduction of "value components" (aka: components whose type _and_ value determines their ComponentId, via something like Hashing / PartialEq). By labeling a Relationship component such as `ChildOf(Entity)` as a "value component", `ChildOf(e1)` and `ChildOf(e2)` would be considered "different components". This makes the transition between fragmenting and non-fragmenting a single flag, and everything else continues to work as expected. * Many-to-many support * Non-fragmenting: We can expand Relationship to be a list of entities instead of a single entity. I have largely already written the code for this. * Fragmenting: With the "value component" impl mentioned above, we get many-to-many support "for free", as it would allow inserting multiple copies of a Relationship component with different target entities. Fixes #3742 (If this PR is merged, I think we should open more targeted followup issues for the work above, with a fresh tracking issue free of the large amount of less-directed historical context) Fixes #17301 Fixes #12235 Fixes #15299 Fixes #15308 ## Migration Guide * Replace `ChildBuilder` with `ChildSpawnerCommands`. * Replace calls to `.set_parent(parent_id)` with `.insert(Parent(parent_id))`. * Replace calls to `.replace_children()` with `.remove::<Children>()` followed by `.add_children()`. Note that you'll need to manually despawn any children that are not carried over. * Replace calls to `.despawn_recursive()` with `.despawn()`. * Replace calls to `.despawn_descendants()` with `.despawn_related::<Children>()`. * If you have any calls to `.despawn()` which depend on the children being preserved, you'll need to remove the `Children` component first. --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
197 lines
6.7 KiB
Rust
197 lines
6.7 KiB
Rust
//! Shows how to use animation clips to animate UI properties.
|
|
|
|
use bevy::{
|
|
animation::{
|
|
animated_field, AnimationEntityMut, AnimationEvaluationError, AnimationTarget,
|
|
AnimationTargetId,
|
|
},
|
|
prelude::*,
|
|
};
|
|
use std::any::TypeId;
|
|
|
|
// Holds information about the animation we programmatically create.
|
|
struct AnimationInfo {
|
|
// The name of the animation target (in this case, the text).
|
|
target_name: Name,
|
|
// The ID of the animation target, derived from the name.
|
|
target_id: AnimationTargetId,
|
|
// The animation graph asset.
|
|
graph: Handle<AnimationGraph>,
|
|
// The index of the node within that graph.
|
|
node_index: AnimationNodeIndex,
|
|
}
|
|
|
|
// The entry point.
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
// Note that we don't need any systems other than the setup system,
|
|
// because Bevy automatically updates animations every frame.
|
|
.add_systems(Startup, setup)
|
|
.run();
|
|
}
|
|
|
|
impl AnimationInfo {
|
|
// Programmatically creates the UI animation.
|
|
fn create(
|
|
animation_graphs: &mut Assets<AnimationGraph>,
|
|
animation_clips: &mut Assets<AnimationClip>,
|
|
) -> AnimationInfo {
|
|
// Create an ID that identifies the text node we're going to animate.
|
|
let animation_target_name = Name::new("Text");
|
|
let animation_target_id = AnimationTargetId::from_name(&animation_target_name);
|
|
|
|
// Allocate an animation clip.
|
|
let mut animation_clip = AnimationClip::default();
|
|
|
|
// Create a curve that animates font size.
|
|
animation_clip.add_curve_to_target(
|
|
animation_target_id,
|
|
AnimatableCurve::new(
|
|
animated_field!(TextFont::font_size),
|
|
AnimatableKeyframeCurve::new(
|
|
[0.0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0]
|
|
.into_iter()
|
|
.zip([24.0, 80.0, 24.0, 80.0, 24.0, 80.0, 24.0]),
|
|
)
|
|
.expect(
|
|
"should be able to build translation curve because we pass in valid samples",
|
|
),
|
|
),
|
|
);
|
|
|
|
// Create a curve that animates font color. Note that this should have
|
|
// the same time duration as the previous curve.
|
|
//
|
|
// This time we use a "custom property", which in this case animates TextColor under the assumption
|
|
// that it is in the "srgba" format.
|
|
animation_clip.add_curve_to_target(
|
|
animation_target_id,
|
|
AnimatableCurve::new(
|
|
TextColorProperty,
|
|
AnimatableKeyframeCurve::new([0.0, 1.0, 2.0, 3.0].into_iter().zip([
|
|
Srgba::RED,
|
|
Srgba::GREEN,
|
|
Srgba::BLUE,
|
|
Srgba::RED,
|
|
]))
|
|
.expect(
|
|
"should be able to build translation curve because we pass in valid samples",
|
|
),
|
|
),
|
|
);
|
|
|
|
// Save our animation clip as an asset.
|
|
let animation_clip_handle = animation_clips.add(animation_clip);
|
|
|
|
// Create an animation graph with that clip.
|
|
let (animation_graph, animation_node_index) =
|
|
AnimationGraph::from_clip(animation_clip_handle);
|
|
let animation_graph_handle = animation_graphs.add(animation_graph);
|
|
|
|
AnimationInfo {
|
|
target_name: animation_target_name,
|
|
target_id: animation_target_id,
|
|
graph: animation_graph_handle,
|
|
node_index: animation_node_index,
|
|
}
|
|
}
|
|
}
|
|
|
|
// Creates all the entities in the scene.
|
|
fn setup(
|
|
mut commands: Commands,
|
|
asset_server: Res<AssetServer>,
|
|
mut animation_graphs: ResMut<Assets<AnimationGraph>>,
|
|
mut animation_clips: ResMut<Assets<AnimationClip>>,
|
|
) {
|
|
// Create the animation.
|
|
let AnimationInfo {
|
|
target_name: animation_target_name,
|
|
target_id: animation_target_id,
|
|
graph: animation_graph,
|
|
node_index: animation_node_index,
|
|
} = AnimationInfo::create(&mut animation_graphs, &mut animation_clips);
|
|
|
|
// Build an animation player that automatically plays the UI animation.
|
|
let mut animation_player = AnimationPlayer::default();
|
|
animation_player.play(animation_node_index).repeat();
|
|
|
|
// Add a camera.
|
|
commands.spawn(Camera2d);
|
|
|
|
// Build the UI. We have a parent node that covers the whole screen and
|
|
// contains the `AnimationPlayer`, as well as a child node that contains the
|
|
// text to be animated.
|
|
commands
|
|
.spawn((
|
|
// Cover the whole screen, and center contents.
|
|
Node {
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(0.0),
|
|
left: Val::Px(0.0),
|
|
right: Val::Px(0.0),
|
|
bottom: Val::Px(0.0),
|
|
justify_content: JustifyContent::Center,
|
|
align_items: AlignItems::Center,
|
|
..default()
|
|
},
|
|
animation_player,
|
|
AnimationGraphHandle(animation_graph),
|
|
))
|
|
.with_children(|builder| {
|
|
// Build the text node.
|
|
let player = builder.target_entity();
|
|
builder
|
|
.spawn((
|
|
Text::new("Bevy"),
|
|
TextFont {
|
|
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
|
|
font_size: 24.0,
|
|
..default()
|
|
},
|
|
TextColor(Color::Srgba(Srgba::RED)),
|
|
TextLayout::new_with_justify(JustifyText::Center),
|
|
))
|
|
// Mark as an animation target.
|
|
.insert(AnimationTarget {
|
|
id: animation_target_id,
|
|
player,
|
|
})
|
|
.insert(animation_target_name);
|
|
});
|
|
}
|
|
|
|
// A type that represents the color of the first text section.
|
|
//
|
|
// We implement `AnimatableProperty` on this to define custom property accessor logic
|
|
#[derive(Clone)]
|
|
struct TextColorProperty;
|
|
|
|
impl AnimatableProperty for TextColorProperty {
|
|
type Property = Srgba;
|
|
|
|
fn evaluator_id(&self) -> EvaluatorId {
|
|
EvaluatorId::Type(TypeId::of::<Self>())
|
|
}
|
|
|
|
fn get_mut<'a>(
|
|
&self,
|
|
entity: &'a mut AnimationEntityMut,
|
|
) -> Result<&'a mut Self::Property, AnimationEvaluationError> {
|
|
let text_color = entity
|
|
.get_mut::<TextColor>()
|
|
.ok_or(AnimationEvaluationError::ComponentNotPresent(TypeId::of::<
|
|
TextColor,
|
|
>(
|
|
)))?
|
|
.into_inner();
|
|
match text_color.0 {
|
|
Color::Srgba(ref mut color) => Ok(color),
|
|
_ => Err(AnimationEvaluationError::PropertyNotPresent(TypeId::of::<
|
|
Srgba,
|
|
>(
|
|
))),
|
|
}
|
|
}
|
|
}
|