Skip to content

[Merged by Bors] - Expose set_changed() on ResMut and Mut #2208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NathanSWard wants to merge 3 commits into from
Closed

[Merged by Bors] - Expose set_changed() on ResMut and Mut #2208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0157e10
Expose set_changed() on ResMut and Mut
NathanSWard May 18, 2021
c2aa4d0
Tweak comments to make it clearer that mutation automatically trigger…
cart May 18, 2021
e997155
resource->value
cart May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion crates/bevy_ecs/src/system/system_param.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,16 @@ impl<'w, T: Component> ResMut<'w, T> {
self.ticks
.is_changed(self.last_change_tick, self.change_tick)
}

/// Flags this resource as having been changed.
///
/// **Note**: this operation is irreversible.
/// You should generally prefer to use [`ResMut::as_mut`], as this returns
/// the contained value _and_ sets this resource as changed.
#[inline]
pub fn set_changed(&mut self) {
self.ticks.set_changed(self.change_tick);
}
}

impl<'w, T: Component> Deref for ResMut<'w, T> {
Expand All @@ -381,7 +391,7 @@ impl<'w, T: Component> Deref for ResMut<'w, T> {

impl<'w, T: Component> DerefMut for ResMut<'w, T> {
fn deref_mut(&mut self) -> &mut Self::Target {
self.ticks.set_changed(self.change_tick);
self.set_changed();
self.value
}
}
Expand Down
12 changes: 11 additions & 1 deletion crates/bevy_ecs/src/world/pointer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ impl<'a, T> Mut<'a, T> {
self.component_ticks.set_changed(self.change_tick);
self.value
}

/// Flags this component as having been changed.
///
/// **Note**: this operation is irreversible.
/// You should generally prefer to use [`Mut::as_mut`], as this returns
/// the component _and_ sets it as changed.
#[inline]
pub fn set_changed(&mut self) {
self.component_ticks.set_changed(self.change_tick);
}
}

impl<'a, T> Deref for Mut<'a, T> {
Expand All @@ -28,7 +38,7 @@ impl<'a, T> Deref for Mut<'a, T> {
impl<'a, T> DerefMut for Mut<'a, T> {
#[inline]
fn deref_mut(&mut self) -> &mut T {
self.component_ticks.set_changed(self.change_tick);
self.set_changed();
self.value
}
}
Expand Down