Skip to content

Commit 21518de

Browse files
authored
refactor: Change Option<With<T>> query params to Has<T> (#9959)
# Objective `Has<T>` was added to bevy_ecs, but we're still using the `Option<With<T>>` pattern in multiple locations. ## Solution Replace them with `Has<T>`.
1 parent dfdc9f8 commit 21518de

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

crates/bevy_animation/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -453,16 +453,16 @@ fn entity_from_path(
453453
/// Verify that there are no ancestors of a given entity that have an [`AnimationPlayer`].
454454
fn verify_no_ancestor_player(
455455
player_parent: Option<&Parent>,
456-
parents: &Query<(Option<With<AnimationPlayer>>, Option<&Parent>)>,
456+
parents: &Query<(Has<AnimationPlayer>, Option<&Parent>)>,
457457
) -> bool {
458458
let Some(mut current) = player_parent.map(Parent::get) else {
459459
return true;
460460
};
461461
loop {
462-
let Ok((maybe_player, parent)) = parents.get(current) else {
462+
let Ok((has_player, parent)) = parents.get(current) else {
463463
return true;
464464
};
465-
if maybe_player.is_some() {
465+
if has_player {
466466
return false;
467467
}
468468
if let Some(parent) = parent {
@@ -483,7 +483,7 @@ pub fn animation_player(
483483
names: Query<&Name>,
484484
transforms: Query<&mut Transform>,
485485
morphs: Query<&mut MorphWeights>,
486-
parents: Query<(Option<With<AnimationPlayer>>, Option<&Parent>)>,
486+
parents: Query<(Has<AnimationPlayer>, Option<&Parent>)>,
487487
mut animation_players: Query<(Entity, Option<&Parent>, &mut AnimationPlayer)>,
488488
) {
489489
animation_players
@@ -515,7 +515,7 @@ fn run_animation_player(
515515
transforms: &Query<&mut Transform>,
516516
morphs: &Query<&mut MorphWeights>,
517517
maybe_parent: Option<&Parent>,
518-
parents: &Query<(Option<With<AnimationPlayer>>, Option<&Parent>)>,
518+
parents: &Query<(Has<AnimationPlayer>, Option<&Parent>)>,
519519
children: &Query<&Children>,
520520
) {
521521
let paused = player.paused;
@@ -601,7 +601,7 @@ fn apply_animation(
601601
transforms: &Query<&mut Transform>,
602602
morphs: &Query<&mut MorphWeights>,
603603
maybe_parent: Option<&Parent>,
604-
parents: &Query<(Option<With<AnimationPlayer>>, Option<&Parent>)>,
604+
parents: &Query<(Has<AnimationPlayer>, Option<&Parent>)>,
605605
children: &Query<&Children>,
606606
) {
607607
if let Some(animation_clip) = animations.get(&animation.animation_clip) {

crates/bevy_pbr/src/render/mesh.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ pub fn extract_meshes(
256256
&GlobalTransform,
257257
Option<&PreviousGlobalTransform>,
258258
&Handle<Mesh>,
259-
Option<With<NotShadowReceiver>>,
260-
Option<With<NotShadowCaster>>,
259+
Has<NotShadowReceiver>,
260+
Has<NotShadowCaster>,
261261
Has<NoAutomaticBatching>,
262262
)>,
263263
>,
@@ -278,7 +278,7 @@ pub fn extract_meshes(
278278
}
279279
let transform = transform.affine();
280280
let previous_transform = previous_transform.map(|t| t.0).unwrap_or(transform);
281-
let mut flags = if not_receiver.is_some() {
281+
let mut flags = if not_receiver {
282282
MeshFlags::empty()
283283
} else {
284284
MeshFlags::SHADOW_RECEIVER
@@ -298,7 +298,7 @@ pub fn extract_meshes(
298298
RenderMeshInstance {
299299
mesh_asset_id: handle.id(),
300300
transforms,
301-
shadow_caster: not_caster.is_none(),
301+
shadow_caster: !not_caster,
302302
material_bind_group_id: MaterialBindGroupId::default(),
303303
automatic_batching: !no_automatic_batching,
304304
},

0 commit comments

Comments
 (0)