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

addressed comments

Browse Source
This commit is contained in:
Trashtalk 2025-07-13 18:38:50 +00:00
parent e3ccd1b8e5
commit 57581349b9
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/bevy_ecs/src/entity_disabling.rs
View File

@ -70,6 +70,7 @@
use crate::{ use crate::{
component::{ComponentId, Components, StorageType}, component::{ComponentId, Components, StorageType},
query::FilteredAccess, query::FilteredAccess,
resource::IsResource,
world::{FromWorld, World}, world::{FromWorld, World},
}; };
use bevy_ecs_macros::{Component, Resource}; use bevy_ecs_macros::{Component, Resource};
@ -143,6 +144,8 @@ impl FromWorld for DefaultQueryFilters {
let mut filters = DefaultQueryFilters::empty(); let mut filters = DefaultQueryFilters::empty();
let disabled_component_id = world.register_component::<Disabled>(); let disabled_component_id = world.register_component::<Disabled>();
filters.register_disabling_component(disabled_component_id); filters.register_disabling_component(disabled_component_id);
let is_resource_component_id = world.register_component::<IsResource>();
filters.register_disabling_component(is_resource_component_id);
filters filters
} }
} }

5
crates/bevy_ecs/src/query/state.rs
View File

@ -2174,10 +2174,7 @@ mod tests {
world.spawn((B(0), C(0))); world.spawn((B(0), C(0)));
world.spawn(C(0)); world.spawn(C(0));
let mut df = DefaultQueryFilters::empty(); world.register_disabling_component::<C>();
df.register_disabling_component(world.register_component::<C>());
world.insert_resource(df);
world.register_disabling_component::<IsResource>();
// Without<C> only matches the first entity // Without<C> only matches the first entity
let mut query = QueryState::<()>::new(&mut world); let mut query = QueryState::<()>::new(&mut world);

3
crates/bevy_ecs/src/world/mod.rs
View File

@ -22,7 +22,7 @@ use crate::{
event::BufferedEvent, event::BufferedEvent,
lifecycle::{ComponentHooks, ADD, DESPAWN, INSERT, REMOVE, REPLACE}, lifecycle::{ComponentHooks, ADD, DESPAWN, INSERT, REMOVE, REPLACE},
prelude::{Add, Despawn, Insert, Remove, Replace}, prelude::{Add, Despawn, Insert, Remove, Replace},
resource::{IsResource, ResourceEntity, TypeErasedResource}, resource::{ResourceEntity, TypeErasedResource},
}; };
pub use bevy_ecs_macros::FromWorld; pub use bevy_ecs_macros::FromWorld;
use bevy_utils::prelude::DebugName; use bevy_utils::prelude::DebugName;
@ -170,7 +170,6 @@ impl World {
// This sets up `Disabled` as a disabling component, via the FromWorld impl // This sets up `Disabled` as a disabling component, via the FromWorld impl
self.init_resource::<DefaultQueryFilters>(); self.init_resource::<DefaultQueryFilters>();
self.register_disabling_component::<IsResource>();
} }
/// Creates a new empty [`World`]. /// Creates a new empty [`World`].
/// ///