Skip to content

Commit

Permalink
rename _target_filter
Browse files Browse the repository at this point in the history
  • Loading branch information
@BoxyUwU
BoxyUwU committed Jul 21, 2021
1 parent 5949f5a commit 75f40d0
Show file tree
Hide file tree
Showing 8 changed files with 152 additions and 286 deletions.
110 changes: 30 additions & 80 deletions crates/bevy_ecs/src/query/fetch.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,20 +190,16 @@ unsafe impl FetchState for EntityState {
}

#[inline]
fn matches_archetype(
&self,
_archetype: &Archetype,
_target_filter: &Self::TargetFilter,
) -> bool {
fn matches_archetype(&self, _archetype: &Archetype, _: &Self::TargetFilter) -> bool {
true
}

#[inline]
fn matches_table(&self, _table: &Table, _target_filter: &Self::TargetFilter) -> bool {
fn matches_table(&self, _table: &Table, _: &Self::TargetFilter) -> bool {
true
}

fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
}

impl<'w, 's> Fetch<'w, 's> for EntityFetch {
Expand All @@ -219,7 +215,7 @@ impl<'w, 's> Fetch<'w, 's> for EntityFetch {
unsafe fn init(
_world: &World,
_state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
_last_change_tick: u32,
_change_tick: u32,
) -> Self {
Expand All @@ -232,20 +228,15 @@ impl<'w, 's> Fetch<'w, 's> for EntityFetch {
unsafe fn set_archetype(
&mut self,
_state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
archetype: &Archetype,
_tables: &Tables,
) {
self.entities = archetype.entities().as_ptr();
}

#[inline]
unsafe fn set_table(
&mut self,
_state: &Self::State,
_target_filter: &Self::TargetFilter,
table: &Table,
) {
unsafe fn set_table(&mut self, _state: &Self::State, _: &Self::TargetFilter, table: &Table) {
self.entities = table.entities().as_ptr();
}

Expand Down Expand Up @@ -308,19 +299,15 @@ unsafe impl<T: Component> FetchState for ReadState<T> {
}
}

fn matches_archetype(
&self,
archetype: &Archetype,
_target_filter: &Self::TargetFilter,
) -> bool {
fn matches_archetype(&self, archetype: &Archetype, _: &Self::TargetFilter) -> bool {
archetype.contains(self.component_id, None)
}

fn matches_table(&self, table: &Table, _target_filter: &Self::TargetFilter) -> bool {
fn matches_table(&self, table: &Table, _: &Self::TargetFilter) -> bool {
table.has_column(self.component_id, None)
}

fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
}

/// The [`Fetch`] of `&T`.
Expand Down Expand Up @@ -363,7 +350,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
unsafe fn init(
world: &World,
state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
_last_change_tick: u32,
_change_tick: u32,
) -> Self {
Expand All @@ -388,7 +375,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
unsafe fn set_archetype(
&mut self,
state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
archetype: &Archetype,
tables: &Tables,
) {
Expand All @@ -405,12 +392,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
}

#[inline]
unsafe fn set_table(
&mut self,
state: &Self::State,
_target_filter: &Self::TargetFilter,
table: &Table,
) {
unsafe fn set_table(&mut self, state: &Self::State, _: &Self::TargetFilter, table: &Table) {
self.table_components = table
.get_column(state.component_id, None)
.unwrap()
Expand Down Expand Up @@ -513,19 +495,15 @@ unsafe impl<T: Component> FetchState for WriteState<T> {
}
}

fn matches_archetype(
&self,
archetype: &Archetype,
_target_filter: &Self::TargetFilter,
) -> bool {
fn matches_archetype(&self, archetype: &Archetype, _: &Self::TargetFilter) -> bool {
archetype.contains(self.component_id, None)
}

fn matches_table(&self, table: &Table, _target_filter: &Self::TargetFilter) -> bool {
fn matches_table(&self, table: &Table, _: &Self::TargetFilter) -> bool {
table.has_column(self.component_id, None)
}

fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
}

impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
Expand All @@ -544,7 +522,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
unsafe fn init(
world: &World,
state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
last_change_tick: u32,
change_tick: u32,
) -> Self {
Expand Down Expand Up @@ -572,7 +550,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
unsafe fn set_archetype(
&mut self,
state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
archetype: &Archetype,
tables: &Tables,
) {
Expand All @@ -590,12 +568,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
}

#[inline]
unsafe fn set_table(
&mut self,
state: &Self::State,
_target_filter: &Self::TargetFilter,
table: &Table,
) {
unsafe fn set_table(&mut self, state: &Self::State, _: &Self::TargetFilter, table: &Table) {
let column = table.get_column(state.component_id, None).unwrap();
self.table_components = column.get_data_ptr().cast::<T>();
self.table_ticks = column.get_ticks_ptr();
Expand Down Expand Up @@ -872,7 +845,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadRelationFetch<T> {
unsafe fn set_archetype(
&mut self,
_state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
archetype: &Archetype,
tables: &Tables,
) {
Expand All @@ -882,12 +855,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadRelationFetch<T> {
self.entities = archetype.entities();
}

unsafe fn set_table(
&mut self,
_state: &Self::State,
_target_filter: &Self::TargetFilter,
table: &Table,
) {
unsafe fn set_table(&mut self, _state: &Self::State, _: &Self::TargetFilter, table: &Table) {
self.table_ptr = table;
}

Expand Down Expand Up @@ -1202,7 +1170,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteRelationFetch<T> {
unsafe fn set_archetype(
&mut self,
_state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
archetype: &Archetype,
tables: &Tables,
) {
Expand All @@ -1212,12 +1180,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteRelationFetch<T> {
self.entities = archetype.entities();
}

unsafe fn set_table(
&mut self,
_state: &Self::State,
_target_filter: &Self::TargetFilter,
table: &Table,
) {
unsafe fn set_table(&mut self, _state: &Self::State, _: &Self::TargetFilter, table: &Table) {
self.table_ptr = table;
}

Expand Down Expand Up @@ -1329,15 +1292,11 @@ unsafe impl<T: FetchState> FetchState for OptionState<T> {
}
}

fn matches_archetype(
&self,
_archetype: &Archetype,
_target_filter: &Self::TargetFilter,
) -> bool {
fn matches_archetype(&self, _archetype: &Archetype, _: &Self::TargetFilter) -> bool {
true
}

fn matches_table(&self, _table: &Table, _target_filter: &Self::TargetFilter) -> bool {
fn matches_table(&self, _table: &Table, _: &Self::TargetFilter) -> bool {
true
}

Expand Down Expand Up @@ -1533,19 +1492,15 @@ unsafe impl<T: Component> FetchState for ChangeTrackersState<T> {
}
}

fn matches_archetype(
&self,
archetype: &Archetype,
_target_filter: &Self::TargetFilter,
) -> bool {
fn matches_archetype(&self, archetype: &Archetype, _: &Self::TargetFilter) -> bool {
archetype.contains(self.component_id, None)
}

fn matches_table(&self, table: &Table, _target_filter: &Self::TargetFilter) -> bool {
fn matches_table(&self, table: &Table, _: &Self::TargetFilter) -> bool {
table.has_column(self.component_id, None)
}

fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
}

/// The [`Fetch`] of [`ChangeTrackers`].
Expand Down Expand Up @@ -1579,7 +1534,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
unsafe fn init(
world: &World,
state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
last_change_tick: u32,
change_tick: u32,
) -> Self {
Expand Down Expand Up @@ -1607,7 +1562,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
unsafe fn set_archetype(
&mut self,
state: &Self::State,
_target_filter: &Self::TargetFilter,
_: &Self::TargetFilter,
archetype: &Archetype,
tables: &Tables,
) {
Expand All @@ -1624,12 +1579,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
}

#[inline]
unsafe fn set_table(
&mut self,
state: &Self::State,
_target_filter: &Self::TargetFilter,
table: &Table,
) {
unsafe fn set_table(&mut self, state: &Self::State, _: &Self::TargetFilter, table: &Table) {
self.table_ticks = table
.get_column(state.component_id, None)
.unwrap()
Expand Down
Loading

0 comments on commit 75f40d0

Please sign in to comment.