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

Remove unused query param (#18924)

Browse Source 
# Objective

Was copying off `bevy_ui`'s homework writing a picking backend and
noticed the `Has<IsDefaultPickingCamera>` is not used anywhere.

## Testing

Ran a random example.

This shouldn't cause any behavioral changes at all because the
component/archetype access/filter flags should be the same. `Has<X>`
doesn't affect access since it doesn't actually read or write anything,
and it doesn't affect matched archetypes either. Can't think of another
reason any behavior would change.
This commit is contained in:
JoshValjosh 2025-04-26 15:17:14 -06:00 committed by GitHub
parent 26f0ce272e
commit 9cf1a1afa2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,12 +104,7 @@ pub struct NodeQuery {
/// we need for determining picking.
pub fn ui_picking(
pointers: Query<(&PointerId, &PointerLocation)>,
camera_query: Query<(
Entity,
&Camera,
Has<IsDefaultUiCamera>,
Has<UiPickingCamera>,
)>,
camera_query: Query<(Entity, &Camera, Has<UiPickingCamera>)>,
primary_window: Query<Entity, With<PrimaryWindow>>,
settings: Res<UiPickingSettings>,
ui_stack: Res<UiStack>,
@ -128,8 +123,8 @@ pub fn ui_picking(
// cameras. We want to ensure we return all cameras with a matching target.
for camera in camera_query
.iter()
.filter(|(_, _, _, cam_can_pick)| !settings.require_markers || *cam_can_pick)
.map(|(entity, camera, _, _)| {
.filter(|(_, _, cam_can_pick)| !settings.require_markers || *cam_can_pick)
.map(|(entity, camera, _)| {
(
entity,
camera.target.normalize(primary_window.single().ok()),
@ -139,7 +134,7 @@ pub fn ui_picking(
.filter(|(_entity, target)| target == &pointer_location.target)
.map(|(cam_entity, _target)| cam_entity)
{
let Ok((_, camera_data, _, _)) = camera_query.get(camera) else {
let Ok((_, camera_data, _)) = camera_query.get(camera) else {
continue;
};
let mut pointer_pos =
@ -260,7 +255,7 @@ pub fn ui_picking(
let order = camera_query
.get(*camera)
.map(|(_, cam, _, _)| cam.order)
.map(|(_, cam, _)| cam.order)
.unwrap_or_default() as f32
+ 0.5; // bevy ui can run on any camera, it's a special case