[Merged by Bors] - Clean up taffy nodes when UI node entities are removed #5886
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alice-i-cecile
added
A-UI
SkiFire13
reviewed
Sep 5, 2022
oceantume
requested review from
SkiFire13 and
alice-i-cecile
and removed request for
alice-i-cecile and
SkiFire13
|
Sorry if I'm spamming reviewers. Looks like GitHub cancels one when I request the other. I'll leave this as-is now haha. |
alice-i-cecile
requested changes
Sep 5, 2022
oceantume
force-pushed
the
feature/ui-node-removal
branch
from
af118ae to
101347a
Compare
Weibye
approved these changes
Sep 5, 2022
tim-blackbird
approved these changes
Sep 5, 2022
Weibye
added
the
S-Ready-For-Final-Review
mockersf
approved these changes
Sep 5, 2022
SkiFire13
reviewed
Sep 5, 2022
| @@ -780,6 +780,15 @@ impl<'a, T: Component> RemovedComponents<'a, T> { | |||
| } | |||
| } | |||
|
|
|||
| impl<'a, T: Component> IntoIterator for &'a RemovedComponents<'a, T> { | |||
There was a problem hiding this comment.
Technically this doesn't need both lifetimes to be 'a does it? I think .iter() also has an overconstrained lifetime.
There was a problem hiding this comment.
This does not compile without &'a if that's what you're asking.
There was a problem hiding this comment.
I mean that iter returns a std::iter::Cloned<std::slice::Iter<'_, Entity>> whose lifetime is linked to the &self parameter, but it could return a std::iter::Cloned<std::slice::Iter<'a, Entity>>, and by consequence IntoIterator could be implemented for &'a RemovedComponents<'b, T>, returning a std::iter::Cloned<std::slice::Iter<'b, Entity>>.
bors bot
pushed a commit
that referenced
this pull request
Sep 5, 2022
# Objective Clean up taffy nodes when the associated UI node gets removed. The current UI code will keep the taffy nodes around forever. ## Solution Use `RemovedComponents<Node>` to iterate over nodes that are no longer valid UI nodes or that have been despawned, and remove them from taffy and the internal hash map. ## Implementation Notes Do note that using `despawn()` instead of `despawn_recursive()` on a UI node that has children will result in a [warnings spam](https://github.com/bevyengine/bevy/blob/main/crates/bevy_ui/src/flex/mod.rs#L120) since the children will not be part of a proper UI hierarchy anymore. --- ## Changelog - Fixed memory leak when nodes are removed in bevy_ui
|
Pull request successfully merged into main. Build succeeded: |
bors
bot
changed the title
nicopap
pushed a commit
to nicopap/bevy
that referenced
this pull request
Sep 12, 2022
# Objective Clean up taffy nodes when the associated UI node gets removed. The current UI code will keep the taffy nodes around forever. ## Solution Use `RemovedComponents<Node>` to iterate over nodes that are no longer valid UI nodes or that have been despawned, and remove them from taffy and the internal hash map. ## Implementation Notes Do note that using `despawn()` instead of `despawn_recursive()` on a UI node that has children will result in a [warnings spam](https://github.com/bevyengine/bevy/blob/main/crates/bevy_ui/src/flex/mod.rs#L120) since the children will not be part of a proper UI hierarchy anymore. --- ## Changelog - Fixed memory leak when nodes are removed in bevy_ui
james7132
pushed a commit
to james7132/bevy
that referenced
this pull request
Oct 28, 2022
# Objective Clean up taffy nodes when the associated UI node gets removed. The current UI code will keep the taffy nodes around forever. ## Solution Use `RemovedComponents<Node>` to iterate over nodes that are no longer valid UI nodes or that have been despawned, and remove them from taffy and the internal hash map. ## Implementation Notes Do note that using `despawn()` instead of `despawn_recursive()` on a UI node that has children will result in a [warnings spam](https://github.com/bevyengine/bevy/blob/main/crates/bevy_ui/src/flex/mod.rs#L120) since the children will not be part of a proper UI hierarchy anymore. --- ## Changelog - Fixed memory leak when nodes are removed in bevy_ui
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
# Objective Clean up taffy nodes when the associated UI node gets removed. The current UI code will keep the taffy nodes around forever. ## Solution Use `RemovedComponents<Node>` to iterate over nodes that are no longer valid UI nodes or that have been despawned, and remove them from taffy and the internal hash map. ## Implementation Notes Do note that using `despawn()` instead of `despawn_recursive()` on a UI node that has children will result in a [warnings spam](https://github.com/bevyengine/bevy/blob/main/crates/bevy_ui/src/flex/mod.rs#L120) since the children will not be part of a proper UI hierarchy anymore. --- ## Changelog - Fixed memory leak when nodes are removed in bevy_ui
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Objective
Clean up taffy nodes when the associated UI node gets removed. The current UI code will keep the taffy nodes around forever.
Solution
Use
RemovedComponents<Node>to iterate over nodes that are no longer valid UI nodes or that have been despawned, and remove them from taffy and the internal hash map.Implementation Notes
Do note that using
despawn()instead ofdespawn_recursive()on a UI node that has children will result in a warnings spam since the children will not be part of a proper UI hierarchy anymore.Changelog