
# Objective Unlike for their helper typers, the import paths for `unique_array::UniqueEntityArray`, `unique_slice::UniqueEntitySlice`, `unique_vec::UniqueEntityVec`, `hash_set::EntityHashSet`, `hash_map::EntityHashMap`, `index_set::EntityIndexSet`, `index_map::EntityIndexMap` are quite redundant. When looking at the structure of `hashbrown`, we can also see that while both `HashSet` and `HashMap` have their own modules, the main types themselves are re-exported to the crate level. ## Solution Re-export the types in their shared `entity` parent module, and simplify the imports where they're used.
470 lines
18 KiB
Rust
470 lines
18 KiB
Rust
use core::fmt;
|
|
|
|
use bevy_platform_support::collections::hash_map::Entry;
|
|
use taffy::TaffyTree;
|
|
|
|
use bevy_ecs::{
|
|
entity::{Entity, EntityHashMap},
|
|
prelude::Resource,
|
|
};
|
|
use bevy_math::{UVec2, Vec2};
|
|
use bevy_utils::default;
|
|
|
|
use crate::{layout::convert, LayoutContext, LayoutError, Measure, MeasureArgs, Node, NodeMeasure};
|
|
use bevy_text::CosmicFontSystem;
|
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
|
pub struct LayoutNode {
|
|
// Implicit "viewport" node if this `LayoutNode` corresponds to a root UI node entity
|
|
pub(super) viewport_id: Option<taffy::NodeId>,
|
|
// The id of the node in the taffy tree
|
|
pub(super) id: taffy::NodeId,
|
|
}
|
|
|
|
impl From<taffy::NodeId> for LayoutNode {
|
|
fn from(value: taffy::NodeId) -> Self {
|
|
LayoutNode {
|
|
viewport_id: None,
|
|
id: value,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Resource)]
|
|
pub struct UiSurface {
|
|
pub root_entity_to_viewport_node: EntityHashMap<taffy::NodeId>,
|
|
pub(super) entity_to_taffy: EntityHashMap<LayoutNode>,
|
|
pub(super) taffy: TaffyTree<NodeMeasure>,
|
|
taffy_children_scratch: Vec<taffy::NodeId>,
|
|
}
|
|
|
|
fn _assert_send_sync_ui_surface_impl_safe() {
|
|
fn _assert_send_sync<T: Send + Sync>() {}
|
|
_assert_send_sync::<EntityHashMap<taffy::NodeId>>();
|
|
_assert_send_sync::<TaffyTree<NodeMeasure>>();
|
|
_assert_send_sync::<UiSurface>();
|
|
}
|
|
|
|
impl fmt::Debug for UiSurface {
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
f.debug_struct("UiSurface")
|
|
.field("entity_to_taffy", &self.entity_to_taffy)
|
|
.field("taffy_children_scratch", &self.taffy_children_scratch)
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
impl Default for UiSurface {
|
|
fn default() -> Self {
|
|
let taffy: TaffyTree<NodeMeasure> = TaffyTree::new();
|
|
Self {
|
|
root_entity_to_viewport_node: Default::default(),
|
|
entity_to_taffy: Default::default(),
|
|
taffy,
|
|
taffy_children_scratch: Vec::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl UiSurface {
|
|
/// Retrieves the Taffy node associated with the given UI node entity and updates its style.
|
|
/// If no associated Taffy node exists a new Taffy node is inserted into the Taffy layout.
|
|
pub fn upsert_node(
|
|
&mut self,
|
|
layout_context: &LayoutContext,
|
|
entity: Entity,
|
|
node: &Node,
|
|
mut new_node_context: Option<NodeMeasure>,
|
|
) {
|
|
let taffy = &mut self.taffy;
|
|
|
|
match self.entity_to_taffy.entry(entity) {
|
|
Entry::Occupied(entry) => {
|
|
let taffy_node = *entry.get();
|
|
let has_measure = if new_node_context.is_some() {
|
|
taffy
|
|
.set_node_context(taffy_node.id, new_node_context)
|
|
.unwrap();
|
|
true
|
|
} else {
|
|
taffy.get_node_context(taffy_node.id).is_some()
|
|
};
|
|
|
|
taffy
|
|
.set_style(
|
|
taffy_node.id,
|
|
convert::from_node(node, layout_context, has_measure),
|
|
)
|
|
.unwrap();
|
|
}
|
|
Entry::Vacant(entry) => {
|
|
let taffy_node = if let Some(measure) = new_node_context.take() {
|
|
taffy.new_leaf_with_context(
|
|
convert::from_node(node, layout_context, true),
|
|
measure,
|
|
)
|
|
} else {
|
|
taffy.new_leaf(convert::from_node(node, layout_context, false))
|
|
};
|
|
entry.insert(taffy_node.unwrap().into());
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Update the `MeasureFunc` of the taffy node corresponding to the given [`Entity`] if the node exists.
|
|
pub fn update_node_context(&mut self, entity: Entity, context: NodeMeasure) -> Option<()> {
|
|
let taffy_node = self.entity_to_taffy.get(&entity)?;
|
|
self.taffy
|
|
.set_node_context(taffy_node.id, Some(context))
|
|
.ok()
|
|
}
|
|
|
|
/// Update the children of the taffy node corresponding to the given [`Entity`].
|
|
pub fn update_children(&mut self, entity: Entity, children: impl Iterator<Item = Entity>) {
|
|
self.taffy_children_scratch.clear();
|
|
|
|
for child in children {
|
|
if let Some(taffy_node) = self.entity_to_taffy.get_mut(&child) {
|
|
self.taffy_children_scratch.push(taffy_node.id);
|
|
if let Some(viewport_id) = taffy_node.viewport_id.take() {
|
|
self.taffy.remove(viewport_id).ok();
|
|
}
|
|
}
|
|
}
|
|
|
|
let taffy_node = self.entity_to_taffy.get(&entity).unwrap();
|
|
self.taffy
|
|
.set_children(taffy_node.id, &self.taffy_children_scratch)
|
|
.unwrap();
|
|
}
|
|
|
|
/// Removes children from the entity's taffy node if it exists. Does nothing otherwise.
|
|
pub fn try_remove_children(&mut self, entity: Entity) {
|
|
if let Some(taffy_node) = self.entity_to_taffy.get(&entity) {
|
|
self.taffy.set_children(taffy_node.id, &[]).unwrap();
|
|
}
|
|
}
|
|
|
|
/// Removes the measure from the entity's taffy node if it exists. Does nothing otherwise.
|
|
pub fn try_remove_node_context(&mut self, entity: Entity) {
|
|
if let Some(taffy_node) = self.entity_to_taffy.get(&entity) {
|
|
self.taffy.set_node_context(taffy_node.id, None).unwrap();
|
|
}
|
|
}
|
|
|
|
/// Gets or inserts an implicit taffy viewport node corresponding to the given UI root entity
|
|
pub fn get_or_insert_taffy_viewport_node(&mut self, ui_root_entity: Entity) -> taffy::NodeId {
|
|
*self
|
|
.root_entity_to_viewport_node
|
|
.entry(ui_root_entity)
|
|
.or_insert_with(|| {
|
|
let root_node = self.entity_to_taffy.get_mut(&ui_root_entity).unwrap();
|
|
let implicit_root = self
|
|
.taffy
|
|
.new_leaf(taffy::style::Style {
|
|
display: taffy::style::Display::Grid,
|
|
// Note: Taffy percentages are floats ranging from 0.0 to 1.0.
|
|
// So this is setting width:100% and height:100%
|
|
size: taffy::geometry::Size {
|
|
width: taffy::style::Dimension::Percent(1.0),
|
|
height: taffy::style::Dimension::Percent(1.0),
|
|
},
|
|
align_items: Some(taffy::style::AlignItems::Start),
|
|
justify_items: Some(taffy::style::JustifyItems::Start),
|
|
..default()
|
|
})
|
|
.unwrap();
|
|
self.taffy.add_child(implicit_root, root_node.id).unwrap();
|
|
root_node.viewport_id = Some(implicit_root);
|
|
implicit_root
|
|
})
|
|
}
|
|
|
|
/// Compute the layout for the given implicit taffy viewport node
|
|
pub fn compute_layout<'a>(
|
|
&mut self,
|
|
ui_root_entity: Entity,
|
|
render_target_resolution: UVec2,
|
|
buffer_query: &'a mut bevy_ecs::prelude::Query<&mut bevy_text::ComputedTextBlock>,
|
|
font_system: &'a mut CosmicFontSystem,
|
|
) {
|
|
let implicit_viewport_node = self.get_or_insert_taffy_viewport_node(ui_root_entity);
|
|
|
|
let available_space = taffy::geometry::Size {
|
|
width: taffy::style::AvailableSpace::Definite(render_target_resolution.x as f32),
|
|
height: taffy::style::AvailableSpace::Definite(render_target_resolution.y as f32),
|
|
};
|
|
|
|
self.taffy
|
|
.compute_layout_with_measure(
|
|
implicit_viewport_node,
|
|
available_space,
|
|
|known_dimensions: taffy::Size<Option<f32>>,
|
|
available_space: taffy::Size<taffy::AvailableSpace>,
|
|
_node_id: taffy::NodeId,
|
|
context: Option<&mut NodeMeasure>,
|
|
style: &taffy::Style|
|
|
-> taffy::Size<f32> {
|
|
context
|
|
.map(|ctx| {
|
|
let buffer = get_text_buffer(
|
|
crate::widget::TextMeasure::needs_buffer(
|
|
known_dimensions.height,
|
|
available_space.width,
|
|
),
|
|
ctx,
|
|
buffer_query,
|
|
);
|
|
let size = ctx.measure(
|
|
MeasureArgs {
|
|
width: known_dimensions.width,
|
|
height: known_dimensions.height,
|
|
available_width: available_space.width,
|
|
available_height: available_space.height,
|
|
font_system,
|
|
buffer,
|
|
},
|
|
style,
|
|
);
|
|
taffy::Size {
|
|
width: size.x,
|
|
height: size.y,
|
|
}
|
|
})
|
|
.unwrap_or(taffy::Size::ZERO)
|
|
},
|
|
)
|
|
.unwrap();
|
|
}
|
|
|
|
/// Removes each entity from the internal map and then removes their associated nodes from taffy
|
|
pub fn remove_entities(&mut self, entities: impl IntoIterator<Item = Entity>) {
|
|
for entity in entities {
|
|
if let Some(node) = self.entity_to_taffy.remove(&entity) {
|
|
self.taffy.remove(node.id).unwrap();
|
|
if let Some(viewport_node) = node.viewport_id {
|
|
self.taffy.remove(viewport_node).ok();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Get the layout geometry for the taffy node corresponding to the ui node [`Entity`].
|
|
/// Does not compute the layout geometry, `compute_window_layouts` should be run before using this function.
|
|
/// On success returns a pair consisting of the final resolved layout values after rounding
|
|
/// and the size of the node after layout resolution but before rounding.
|
|
pub fn get_layout(
|
|
&mut self,
|
|
entity: Entity,
|
|
use_rounding: bool,
|
|
) -> Result<(taffy::Layout, Vec2), LayoutError> {
|
|
let Some(taffy_node) = self.entity_to_taffy.get(&entity) else {
|
|
return Err(LayoutError::InvalidHierarchy);
|
|
};
|
|
|
|
if use_rounding {
|
|
self.taffy.enable_rounding();
|
|
} else {
|
|
self.taffy.disable_rounding();
|
|
}
|
|
|
|
let out = match self.taffy.layout(taffy_node.id).cloned() {
|
|
Ok(layout) => {
|
|
self.taffy.disable_rounding();
|
|
let taffy_size = self.taffy.layout(taffy_node.id).unwrap().size;
|
|
let unrounded_size = Vec2::new(taffy_size.width, taffy_size.height);
|
|
Ok((layout, unrounded_size))
|
|
}
|
|
Err(taffy_error) => Err(LayoutError::TaffyError(taffy_error)),
|
|
};
|
|
|
|
self.taffy.enable_rounding();
|
|
out
|
|
}
|
|
}
|
|
|
|
pub fn get_text_buffer<'a>(
|
|
needs_buffer: bool,
|
|
ctx: &mut NodeMeasure,
|
|
query: &'a mut bevy_ecs::prelude::Query<&mut bevy_text::ComputedTextBlock>,
|
|
) -> Option<&'a mut bevy_text::ComputedTextBlock> {
|
|
// We avoid a query lookup whenever the buffer is not required.
|
|
if !needs_buffer {
|
|
return None;
|
|
}
|
|
let NodeMeasure::Text(crate::widget::TextMeasure { info }) = ctx else {
|
|
return None;
|
|
};
|
|
let Ok(computed) = query.get_mut(info.entity) else {
|
|
return None;
|
|
};
|
|
Some(computed.into_inner())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::{ContentSize, FixedMeasure};
|
|
use bevy_math::Vec2;
|
|
use taffy::TraversePartialTree;
|
|
|
|
#[test]
|
|
fn test_initialization() {
|
|
let ui_surface = UiSurface::default();
|
|
assert!(ui_surface.entity_to_taffy.is_empty());
|
|
assert_eq!(ui_surface.taffy.total_node_count(), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn test_upsert() {
|
|
let mut ui_surface = UiSurface::default();
|
|
let root_node_entity = Entity::from_raw(1);
|
|
let node = Node::default();
|
|
|
|
// standard upsert
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, root_node_entity, &node, None);
|
|
|
|
// should be inserted into taffy
|
|
assert_eq!(ui_surface.taffy.total_node_count(), 1);
|
|
assert!(ui_surface.entity_to_taffy.contains_key(&root_node_entity));
|
|
|
|
// test duplicate insert 1
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, root_node_entity, &node, None);
|
|
|
|
// node count should not have increased
|
|
assert_eq!(ui_surface.taffy.total_node_count(), 1);
|
|
|
|
// assign root node to camera
|
|
ui_surface.get_or_insert_taffy_viewport_node(root_node_entity);
|
|
|
|
// each root node will create 2 taffy nodes
|
|
assert_eq!(ui_surface.taffy.total_node_count(), 2);
|
|
|
|
// test duplicate insert 2
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, root_node_entity, &node, None);
|
|
|
|
// node count should not have increased
|
|
assert_eq!(ui_surface.taffy.total_node_count(), 2);
|
|
}
|
|
|
|
#[test]
|
|
fn test_remove_entities() {
|
|
let mut ui_surface = UiSurface::default();
|
|
let root_node_entity = Entity::from_raw(1);
|
|
let node = Node::default();
|
|
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, root_node_entity, &node, None);
|
|
|
|
ui_surface.get_or_insert_taffy_viewport_node(root_node_entity);
|
|
|
|
assert!(ui_surface.entity_to_taffy.contains_key(&root_node_entity));
|
|
|
|
ui_surface.remove_entities([root_node_entity]);
|
|
assert!(!ui_surface.entity_to_taffy.contains_key(&root_node_entity));
|
|
}
|
|
|
|
#[test]
|
|
fn test_try_update_measure() {
|
|
let mut ui_surface = UiSurface::default();
|
|
let root_node_entity = Entity::from_raw(1);
|
|
let node = Node::default();
|
|
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, root_node_entity, &node, None);
|
|
let mut content_size = ContentSize::default();
|
|
content_size.set(NodeMeasure::Fixed(FixedMeasure { size: Vec2::ONE }));
|
|
let measure_func = content_size.measure.take().unwrap();
|
|
assert!(ui_surface
|
|
.update_node_context(root_node_entity, measure_func)
|
|
.is_some());
|
|
}
|
|
|
|
#[test]
|
|
fn test_update_children() {
|
|
let mut ui_surface = UiSurface::default();
|
|
let root_node_entity = Entity::from_raw(1);
|
|
let child_entity = Entity::from_raw(2);
|
|
let node = Node::default();
|
|
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, root_node_entity, &node, None);
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, child_entity, &node, None);
|
|
|
|
ui_surface.update_children(root_node_entity, vec![child_entity].into_iter());
|
|
|
|
let parent_node = *ui_surface.entity_to_taffy.get(&root_node_entity).unwrap();
|
|
let child_node = *ui_surface.entity_to_taffy.get(&child_entity).unwrap();
|
|
assert_eq!(ui_surface.taffy.parent(child_node.id), Some(parent_node.id));
|
|
}
|
|
|
|
#[expect(
|
|
unreachable_code,
|
|
reason = "Certain pieces of code tested here cause the test to fail if made reachable; see #16362 for progress on fixing this"
|
|
)]
|
|
#[test]
|
|
fn test_set_camera_children() {
|
|
let mut ui_surface = UiSurface::default();
|
|
let root_node_entity = Entity::from_raw(1);
|
|
let child_entity = Entity::from_raw(2);
|
|
let node = Node::default();
|
|
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, root_node_entity, &node, None);
|
|
ui_surface.upsert_node(&LayoutContext::TEST_CONTEXT, child_entity, &node, None);
|
|
|
|
let root_taffy_node = *ui_surface.entity_to_taffy.get(&root_node_entity).unwrap();
|
|
let child_taffy = *ui_surface.entity_to_taffy.get(&child_entity).unwrap();
|
|
|
|
// set up the relationship manually
|
|
ui_surface
|
|
.taffy
|
|
.add_child(root_taffy_node.id, child_taffy.id)
|
|
.unwrap();
|
|
|
|
ui_surface.get_or_insert_taffy_viewport_node(root_node_entity);
|
|
|
|
assert_eq!(
|
|
ui_surface.taffy.parent(child_taffy.id),
|
|
Some(root_taffy_node.id)
|
|
);
|
|
let root_taffy_children = ui_surface.taffy.children(root_taffy_node.id).unwrap();
|
|
assert!(
|
|
root_taffy_children.contains(&child_taffy.id),
|
|
"root node is not a parent of child node"
|
|
);
|
|
assert_eq!(
|
|
ui_surface.taffy.child_count(root_taffy_node.id),
|
|
1,
|
|
"expected root node child count to be 1"
|
|
);
|
|
|
|
// clear camera's root nodes
|
|
ui_surface.get_or_insert_taffy_viewport_node(root_node_entity);
|
|
|
|
return; // TODO: can't pass the test if we continue - not implemented (remove allow(unreachable_code))
|
|
|
|
let root_taffy_children = ui_surface.taffy.children(root_taffy_node.id).unwrap();
|
|
assert!(
|
|
root_taffy_children.contains(&child_taffy.id),
|
|
"root node is not a parent of child node"
|
|
);
|
|
assert_eq!(
|
|
ui_surface.taffy.child_count(root_taffy_node.id),
|
|
1,
|
|
"expected root node child count to be 1"
|
|
);
|
|
|
|
// re-associate root node with viewport node
|
|
ui_surface.get_or_insert_taffy_viewport_node(root_node_entity);
|
|
|
|
let child_taffy = ui_surface.entity_to_taffy.get(&child_entity).unwrap();
|
|
let root_taffy_children = ui_surface.taffy.children(root_taffy_node.id).unwrap();
|
|
assert!(
|
|
root_taffy_children.contains(&child_taffy.id),
|
|
"root node is not a parent of child node"
|
|
);
|
|
assert_eq!(
|
|
ui_surface.taffy.child_count(root_taffy_node.id),
|
|
1,
|
|
"expected root node child count to be 1"
|
|
);
|
|
}
|
|
}
|