Skip to content

Commit d8df506

Browse files
authored
Rename ComputedNodeTarget to ComputedUiTargetCamera (#20519)
# Objective Seems like not enough users and devs are aware of this component or what it's for, maybe a more descriptive name will help. ## Solution Rename `ComputedNodeTarget` to `ComputedUiTargetCamera`. New name chosen because the component's value is derived from `UiTargetCamera`.
1 parent 67c7825 commit d8df506

File tree

19 files changed

+84
-72
lines changed

19 files changed

+84
-72
lines changed

crates/bevy_core_widgets/src/core_scrollbar.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use bevy_math::Vec2;
1212
use bevy_picking::events::{Cancel, Drag, DragEnd, DragStart, Pointer, Press};
1313
use bevy_reflect::{prelude::ReflectDefault, Reflect};
1414
use bevy_ui::{
15-
ComputedNode, ComputedNodeTarget, Node, ScrollPosition, UiGlobalTransform, UiScale, Val,
15+
ComputedNode, ComputedUiTargetCamera, Node, ScrollPosition, UiGlobalTransform, UiScale, Val,
1616
};
1717

1818
/// Used to select the orientation of a scrollbar, slider, or other oriented control.
@@ -104,7 +104,7 @@ fn scrollbar_on_pointer_down(
104104
mut q_scrollbar: Query<(
105105
&CoreScrollbar,
106106
&ComputedNode,
107-
&ComputedNodeTarget,
107+
&ComputedUiTargetCamera,
108108
&UiGlobalTransform,
109109
)>,
110110
mut q_scroll_pos: Query<(&mut ScrollPosition, &ComputedNode), Without<CoreScrollbar>>,

crates/bevy_core_widgets/src/core_slider.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ use bevy_log::warn_once;
2323
use bevy_math::ops;
2424
use bevy_picking::events::{Drag, DragEnd, DragStart, Pointer, Press};
2525
use bevy_reflect::{prelude::ReflectDefault, Reflect};
26-
use bevy_ui::{ComputedNode, ComputedNodeTarget, InteractionDisabled, UiGlobalTransform, UiScale};
26+
use bevy_ui::{
27+
ComputedNode, ComputedUiTargetCamera, InteractionDisabled, UiGlobalTransform, UiScale,
28+
};
2729

2830
use crate::{Callback, Notify, ValueChange};
2931

@@ -234,7 +236,7 @@ pub(crate) fn slider_on_pointer_down(
234236
&SliderStep,
235237
Option<&SliderPrecision>,
236238
&ComputedNode,
237-
&ComputedNodeTarget,
239+
&ComputedUiTargetCamera,
238240
&UiGlobalTransform,
239241
Has<InteractionDisabled>,
240242
)>,

crates/bevy_ui/src/experimental/ghost_hierarchy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! This module contains [`GhostNode`] and utilities to flatten the UI hierarchy, traversing past ghost nodes.
22
33
#[cfg(feature = "ghost_nodes")]
4-
use crate::ui_node::ComputedNodeTarget;
4+
use crate::ui_node::ComputedUiTargetCamera;
55
use crate::Node;
66
#[cfg(feature = "ghost_nodes")]
77
use bevy_camera::visibility::Visibility;
@@ -21,7 +21,7 @@ use smallvec::SmallVec;
2121
#[derive(Component, Debug, Copy, Clone, Reflect)]
2222
#[cfg_attr(feature = "ghost_nodes", derive(Default))]
2323
#[reflect(Component, Debug, Clone)]
24-
#[require(Visibility, Transform, ComputedNodeTarget)]
24+
#[require(Visibility, Transform, ComputedUiTargetCamera)]
2525
pub struct GhostNode;
2626

2727
#[cfg(feature = "ghost_nodes")]

crates/bevy_ui/src/focus.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::{
2-
ui_transform::UiGlobalTransform, ComputedNode, ComputedNodeTarget, Node, OverrideClip, UiStack,
2+
ui_transform::UiGlobalTransform, ComputedNode, ComputedUiTargetCamera, Node, OverrideClip,
3+
UiStack,
34
};
45
use bevy_camera::{visibility::InheritedVisibility, Camera, NormalizedRenderTarget};
56
use bevy_ecs::{
@@ -139,7 +140,7 @@ pub struct NodeQuery {
139140
relative_cursor_position: Option<&'static mut RelativeCursorPosition>,
140141
focus_policy: Option<&'static FocusPolicy>,
141142
inherited_visibility: Option<&'static InheritedVisibility>,
142-
target_camera: &'static ComputedNodeTarget,
143+
target_camera: &'static ComputedUiTargetCamera,
143144
}
144145

145146
/// The system that sets Interaction for all UI elements based on the mouse cursor activity

crates/bevy_ui/src/layout/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::{
22
experimental::{UiChildren, UiRootNodes},
33
ui_transform::{UiGlobalTransform, UiTransform},
4-
BorderRadius, ComputedNode, ComputedNodeTarget, ContentSize, Display, LayoutConfig, Node,
4+
BorderRadius, ComputedNode, ComputedUiTargetCamera, ContentSize, Display, LayoutConfig, Node,
55
Outline, OverflowAxis, ScrollPosition,
66
};
77
use bevy_ecs::{
@@ -77,7 +77,7 @@ pub fn ui_layout_system(
7777
Entity,
7878
Ref<Node>,
7979
Option<&mut ContentSize>,
80-
Ref<ComputedNodeTarget>,
80+
Ref<ComputedUiTargetCamera>,
8181
)>,
8282
added_node_query: Query<(), Added<Node>>,
8383
mut node_update_query: Query<(
@@ -383,7 +383,7 @@ mod tests {
383383
fn setup_ui_test_app() -> App {
384384
let mut app = App::new();
385385

386-
app.add_plugins(HierarchyPropagatePlugin::<ComputedNodeTarget>::new(
386+
app.add_plugins(HierarchyPropagatePlugin::<ComputedUiTargetCamera>::new(
387387
PostUpdate,
388388
));
389389
app.init_resource::<UiScale>();
@@ -416,7 +416,7 @@ mod tests {
416416

417417
app.configure_sets(
418418
PostUpdate,
419-
PropagateSet::<ComputedNodeTarget>::default()
419+
PropagateSet::<ComputedUiTargetCamera>::default()
420420
.after(update_ui_context_system)
421421
.before(ui_layout_system),
422422
);
@@ -1074,13 +1074,13 @@ mod tests {
10741074
.chain(),
10751075
);
10761076

1077-
app.add_plugins(HierarchyPropagatePlugin::<ComputedNodeTarget>::new(
1077+
app.add_plugins(HierarchyPropagatePlugin::<ComputedUiTargetCamera>::new(
10781078
PostUpdate,
10791079
));
10801080

10811081
app.configure_sets(
10821082
PostUpdate,
1083-
PropagateSet::<ComputedNodeTarget>::default()
1083+
PropagateSet::<ComputedUiTargetCamera>::default()
10841084
.after(update_ui_context_system)
10851085
.before(ui_layout_system),
10861086
);

crates/bevy_ui/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ impl Plugin for UiPlugin {
154154
)
155155
.configure_sets(
156156
PostUpdate,
157-
PropagateSet::<ComputedNodeTarget>::default().in_set(UiSystems::Propagate),
157+
PropagateSet::<ComputedUiTargetCamera>::default().in_set(UiSystems::Propagate),
158158
)
159-
.add_plugins(HierarchyPropagatePlugin::<ComputedNodeTarget>::new(
159+
.add_plugins(HierarchyPropagatePlugin::<ComputedUiTargetCamera>::new(
160160
PostUpdate,
161161
))
162162
.add_systems(

crates/bevy_ui/src/picking_backend.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub struct NodeQuery {
9292
transform: &'static UiGlobalTransform,
9393
pickable: Option<&'static Pickable>,
9494
inherited_visibility: Option<&'static InheritedVisibility>,
95-
target_camera: &'static ComputedNodeTarget,
95+
target_camera: &'static ComputedUiTargetCamera,
9696
}
9797

9898
/// Computes the UI node entities under each pointer.

crates/bevy_ui/src/ui_node.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ impl From<Vec2> for ScrollPosition {
380380
#[derive(Component, Clone, PartialEq, Debug, Reflect)]
381381
#[require(
382382
ComputedNode,
383-
ComputedNodeTarget,
383+
ComputedUiTargetCamera,
384384
UiTransform,
385385
BackgroundColor,
386386
BorderColor,
@@ -2802,13 +2802,13 @@ impl<'w, 's> DefaultUiCamera<'w, 's> {
28022802
/// Derived information about the camera target for this UI node.
28032803
#[derive(Component, Clone, Copy, Debug, Reflect, PartialEq)]
28042804
#[reflect(Component, Default, PartialEq, Clone)]
2805-
pub struct ComputedNodeTarget {
2805+
pub struct ComputedUiTargetCamera {
28062806
pub(crate) camera: Entity,
28072807
pub(crate) scale_factor: f32,
28082808
pub(crate) physical_size: UVec2,
28092809
}
28102810

2811-
impl Default for ComputedNodeTarget {
2811+
impl Default for ComputedUiTargetCamera {
28122812
fn default() -> Self {
28132813
Self {
28142814
camera: Entity::PLACEHOLDER,
@@ -2818,7 +2818,7 @@ impl Default for ComputedNodeTarget {
28182818
}
28192819
}
28202820

2821-
impl ComputedNodeTarget {
2821+
impl ComputedUiTargetCamera {
28222822
pub fn camera(&self) -> Option<Entity> {
28232823
Some(self.camera).filter(|&entity| entity != Entity::PLACEHOLDER)
28242824
}

0 commit comments

Comments
 (0)