Skip to content

Commit

Permalink
Try #4160:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] authored Mar 9, 2022
2 parents 1a85fb5 + 6890468 commit 5407a6f
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 2 deletions.
14 changes: 14 additions & 0 deletions crates/bevy_ecs/src/change_detection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ pub trait DetectChanges {
///
/// **Note**: This operation is irreversible.
fn set_changed(&mut self);

/// Returns the change tick recording the previous time this component (or resource) was changed.
///
/// Note that components and resources are also marked as changed upon insertion.
///
/// For comparison, the previous change tick of a system can be read using the
/// [`SystemChangeTick`](crate::system::SystemChangeTick)
/// [`SystemParam`](crate::system::SystemParam).
fn last_changed(&self) -> u32;
}

macro_rules! change_detection_impl {
Expand All @@ -67,6 +76,11 @@ macro_rules! change_detection_impl {
.component_ticks
.set_changed(self.ticks.change_tick);
}

#[inline]
fn last_changed(&self) -> u32 {
self.ticks.last_change_tick
}
}

impl<$($generics),* $(: $traits)?> Deref for $name<$($generics),*> {
Expand Down
25 changes: 23 additions & 2 deletions crates/bevy_ecs/src/system/system_param.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1154,10 +1154,31 @@ impl<'w, 's> SystemParamFetch<'w, 's> for BundlesState {
}
}

/// A [`SystemParam`] that reads the previous and current change ticks of the system.
///
/// A system's change ticks are updated each time it runs:
/// - `last_change_tick` copies the previous value of `change_tick`
/// - `change_tick` copies the current value of [`World::read_change_tick`]
///
/// Component change ticks that are more recent than `last_change_tick` will be detected by the system.
/// Those can be read by calling [`last_changed`](crate::change_detection::DetectChanges::last_changed)
/// on a [`Mut<T>`](crate::change_detection::Mut) or [`ResMut<T>`](crate::change_detection::ResMut).
#[derive(Debug)]
pub struct SystemChangeTick {
pub last_change_tick: u32,
pub change_tick: u32,
last_change_tick: u32,
change_tick: u32,
}

impl SystemChangeTick {
/// Returns the current [`World`] change tick seen by the system.
pub fn change_tick(&self) -> u32 {
self.change_tick
}

/// Returns the [`World`] change tick seen by the system the previous time it ran.
pub fn last_change_tick(&self) -> u32 {
self.last_change_tick
}
}

// SAFE: Only reads internal system state
Expand Down

0 comments on commit 5407a6f

Please sign in to comment.