
Updating dependencies; adopted version of #15696. (Supercedes #15696.) Long answer: hashbrown is no longer using ahash by default, meaning that we can't use the default-hasher methods with ahasher. So, we have to use the longer-winded versions instead. This takes the opportunity to also switch our default hasher as well, but without actually enabling the default-hasher feature for hashbrown, meaning that we'll be able to change our hasher more easily at the cost of all of these method calls being obnoxious forever. One large change from 0.15 is that `insert_unique_unchecked` is now `unsafe`, and for cases where unsafe code was denied at the crate level, I replaced it with `insert`. ## Migration Guide `bevy_utils` has updated its version of `hashbrown` to 0.15 and now defaults to `foldhash` instead of `ahash`. This means that if you've hard-coded your hasher to `bevy_utils::AHasher` or separately used the `ahash` crate in your code, you may need to switch to `foldhash` to ensure that everything works like it does in Bevy.
219 lines
7.4 KiB
Rust
219 lines
7.4 KiB
Rust
//! This module contains systems that update the UI when something changes
|
|
|
|
use crate::{
|
|
experimental::{UiChildren, UiRootNodes},
|
|
CalculatedClip, Display, Node, OverflowAxis, TargetCamera,
|
|
};
|
|
|
|
use super::ComputedNode;
|
|
use bevy_ecs::{
|
|
entity::Entity,
|
|
query::{Changed, With},
|
|
system::{Commands, Query},
|
|
};
|
|
use bevy_math::Rect;
|
|
use bevy_sprite::BorderRect;
|
|
use bevy_transform::components::GlobalTransform;
|
|
use bevy_utils::HashSet;
|
|
|
|
/// Updates clipping for all nodes
|
|
pub fn update_clipping_system(
|
|
mut commands: Commands,
|
|
root_nodes: UiRootNodes,
|
|
mut node_query: Query<(
|
|
&Node,
|
|
&ComputedNode,
|
|
&GlobalTransform,
|
|
Option<&mut CalculatedClip>,
|
|
)>,
|
|
ui_children: UiChildren,
|
|
) {
|
|
for root_node in root_nodes.iter() {
|
|
update_clipping(
|
|
&mut commands,
|
|
&ui_children,
|
|
&mut node_query,
|
|
root_node,
|
|
None,
|
|
);
|
|
}
|
|
}
|
|
|
|
fn update_clipping(
|
|
commands: &mut Commands,
|
|
ui_children: &UiChildren,
|
|
node_query: &mut Query<(
|
|
&Node,
|
|
&ComputedNode,
|
|
&GlobalTransform,
|
|
Option<&mut CalculatedClip>,
|
|
)>,
|
|
entity: Entity,
|
|
mut maybe_inherited_clip: Option<Rect>,
|
|
) {
|
|
let Ok((node, computed_node, global_transform, maybe_calculated_clip)) =
|
|
node_query.get_mut(entity)
|
|
else {
|
|
return;
|
|
};
|
|
|
|
// If `display` is None, clip the entire node and all its descendants by replacing the inherited clip with a default rect (which is empty)
|
|
if node.display == Display::None {
|
|
maybe_inherited_clip = Some(Rect::default());
|
|
}
|
|
|
|
// Update this node's CalculatedClip component
|
|
if let Some(mut calculated_clip) = maybe_calculated_clip {
|
|
if let Some(inherited_clip) = maybe_inherited_clip {
|
|
// Replace the previous calculated clip with the inherited clipping rect
|
|
if calculated_clip.clip != inherited_clip {
|
|
*calculated_clip = CalculatedClip {
|
|
clip: inherited_clip,
|
|
};
|
|
}
|
|
} else {
|
|
// No inherited clipping rect, remove the component
|
|
commands.entity(entity).remove::<CalculatedClip>();
|
|
}
|
|
} else if let Some(inherited_clip) = maybe_inherited_clip {
|
|
// No previous calculated clip, add a new CalculatedClip component with the inherited clipping rect
|
|
commands.entity(entity).try_insert(CalculatedClip {
|
|
clip: inherited_clip,
|
|
});
|
|
}
|
|
|
|
// Calculate new clip rectangle for children nodes
|
|
let children_clip = if node.overflow.is_visible() {
|
|
// When `Visible`, children might be visible even when they are outside
|
|
// the current node's boundaries. In this case they inherit the current
|
|
// node's parent clip. If an ancestor is set as `Hidden`, that clip will
|
|
// be used; otherwise this will be `None`.
|
|
maybe_inherited_clip
|
|
} else {
|
|
// If `maybe_inherited_clip` is `Some`, use the intersection between
|
|
// current node's clip and the inherited clip. This handles the case
|
|
// of nested `Overflow::Hidden` nodes. If parent `clip` is not
|
|
// defined, use the current node's clip.
|
|
|
|
let mut clip_rect = Rect::from_center_size(
|
|
global_transform.translation().truncate(),
|
|
computed_node.size(),
|
|
);
|
|
|
|
// Content isn't clipped at the edges of the node but at the edges of the region specified by [`Node::overflow_clip_margin`].
|
|
//
|
|
// `clip_inset` should always fit inside `node_rect`.
|
|
// Even if `clip_inset` were to overflow, we won't return a degenerate result as `Rect::intersect` will clamp the intersection, leaving it empty.
|
|
let clip_inset = match node.overflow_clip_margin.visual_box {
|
|
crate::OverflowClipBox::BorderBox => BorderRect::ZERO,
|
|
crate::OverflowClipBox::ContentBox => computed_node.content_inset(),
|
|
crate::OverflowClipBox::PaddingBox => computed_node.border(),
|
|
};
|
|
|
|
clip_rect.min.x += clip_inset.left;
|
|
clip_rect.min.y += clip_inset.top;
|
|
clip_rect.max.x -= clip_inset.right;
|
|
clip_rect.max.y -= clip_inset.bottom;
|
|
|
|
clip_rect = clip_rect
|
|
.inflate(node.overflow_clip_margin.margin.max(0.) / computed_node.inverse_scale_factor);
|
|
|
|
if node.overflow.x == OverflowAxis::Visible {
|
|
clip_rect.min.x = -f32::INFINITY;
|
|
clip_rect.max.x = f32::INFINITY;
|
|
}
|
|
if node.overflow.y == OverflowAxis::Visible {
|
|
clip_rect.min.y = -f32::INFINITY;
|
|
clip_rect.max.y = f32::INFINITY;
|
|
}
|
|
Some(maybe_inherited_clip.map_or(clip_rect, |c| c.intersect(clip_rect)))
|
|
};
|
|
|
|
for child in ui_children.iter_ui_children(entity) {
|
|
update_clipping(commands, ui_children, node_query, child, children_clip);
|
|
}
|
|
}
|
|
|
|
pub fn update_target_camera_system(
|
|
mut commands: Commands,
|
|
changed_root_nodes_query: Query<
|
|
(Entity, Option<&TargetCamera>),
|
|
(With<Node>, Changed<TargetCamera>),
|
|
>,
|
|
node_query: Query<(Entity, Option<&TargetCamera>), With<Node>>,
|
|
ui_root_nodes: UiRootNodes,
|
|
ui_children: UiChildren,
|
|
) {
|
|
// Track updated entities to prevent redundant updates, as `Commands` changes are deferred,
|
|
// and updates done for changed_children_query can overlap with itself or with root_node_query
|
|
let mut updated_entities = <HashSet<_>>::default();
|
|
|
|
// Assuming that TargetCamera is manually set on the root node only,
|
|
// update root nodes first, since it implies the biggest change
|
|
for (root_node, target_camera) in changed_root_nodes_query.iter_many(ui_root_nodes.iter()) {
|
|
update_children_target_camera(
|
|
root_node,
|
|
target_camera,
|
|
&node_query,
|
|
&ui_children,
|
|
&mut commands,
|
|
&mut updated_entities,
|
|
);
|
|
}
|
|
|
|
// If the root node TargetCamera was changed, then every child is updated
|
|
// by this point, and iteration will be skipped.
|
|
// Otherwise, update changed children
|
|
for (parent, target_camera) in &node_query {
|
|
if !ui_children.is_changed(parent) {
|
|
continue;
|
|
}
|
|
|
|
update_children_target_camera(
|
|
parent,
|
|
target_camera,
|
|
&node_query,
|
|
&ui_children,
|
|
&mut commands,
|
|
&mut updated_entities,
|
|
);
|
|
}
|
|
}
|
|
|
|
fn update_children_target_camera(
|
|
entity: Entity,
|
|
camera_to_set: Option<&TargetCamera>,
|
|
node_query: &Query<(Entity, Option<&TargetCamera>), With<Node>>,
|
|
ui_children: &UiChildren,
|
|
commands: &mut Commands,
|
|
updated_entities: &mut HashSet<Entity>,
|
|
) {
|
|
for child in ui_children.iter_ui_children(entity) {
|
|
// Skip if the child has already been updated or update is not needed
|
|
if updated_entities.contains(&child)
|
|
|| camera_to_set == node_query.get(child).ok().and_then(|(_, camera)| camera)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
match camera_to_set {
|
|
Some(camera) => {
|
|
commands.entity(child).try_insert(camera.clone());
|
|
}
|
|
None => {
|
|
commands.entity(child).remove::<TargetCamera>();
|
|
}
|
|
}
|
|
updated_entities.insert(child);
|
|
|
|
update_children_target_camera(
|
|
child,
|
|
camera_to_set,
|
|
node_query,
|
|
ui_children,
|
|
commands,
|
|
updated_entities,
|
|
);
|
|
}
|
|
}
|