forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of unnecessary mutable access in ui picking backend (#15630)

Browse Source 
## Solution

Yeet

## Testing

Tested the `simple_picking` example
This commit is contained in:
Tim 2024-10-03 21:30:52 +00:00 committed by GitHub
parent 8bf5d99d86
commit 20dbf790a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/bevy_ui/src/picking_backend.rs
View File

@ -67,7 +67,7 @@ pub fn ui_picking(
primary_window: Query<Entity, With<PrimaryWindow>>, primary_window: Query<Entity, With<PrimaryWindow>>,
ui_scale: Res<UiScale>, ui_scale: Res<UiScale>,
ui_stack: Res<UiStack>, ui_stack: Res<UiStack>,
mut node_query: Query<NodeQuery>, node_query: Query<NodeQuery>,
mut output: EventWriter<PointerHits>, mut output: EventWriter<PointerHits>,
) { ) {
// For each camera, the pointer and its position // For each camera, the pointer and its position
@ -119,7 +119,7 @@ pub fn ui_picking(
// reverse the iterator to traverse the tree from closest nodes to furthest // reverse the iterator to traverse the tree from closest nodes to furthest
.rev() .rev()
{ {
let Ok(node) = node_query.get_mut(*node_entity) else { let Ok(node) = node_query.get(*node_entity) else {
continue; continue;
}; };
@ -183,11 +183,10 @@ pub fn ui_picking(
for ((camera, pointer), hovered_nodes) in hit_nodes.iter() { for ((camera, pointer), hovered_nodes) in hit_nodes.iter() {
// As soon as a node with a `Block` focus policy is detected, the iteration will stop on it // As soon as a node with a `Block` focus policy is detected, the iteration will stop on it
// because it "captures" the interaction. // because it "captures" the interaction.
let mut iter = node_query.iter_many_mut(hovered_nodes.iter());
let mut picks = Vec::new(); let mut picks = Vec::new();
let mut depth = 0.0; let mut depth = 0.0;
while let Some(node) = iter.fetch_next() { for node in node_query.iter_many(hovered_nodes) {
let Some(camera_entity) = node let Some(camera_entity) = node
.target_camera .target_camera
.map(TargetCamera::entity) .map(TargetCamera::entity)