Cleanup entity reference types #17149
Merged
Conversation
This file contains hidden or 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
ItsDoot
added
A-ECS
ItsDoot
force-pushed
the
entity-ref-cleanup
branch
from
1cc3ff7 to
43a6868
Compare
ItsDoot
force-pushed
the
entity-ref-cleanup
branch
from
43a6868 to
5e7faa3
Compare
ItsDoot
added
the
S-Needs-Review
TimJentzsch
reviewed
Jan 5, 2025
| EntityRef::from(self) | ||
| } | ||
|
|
||
| /// Consumes `self` and returns non-structural mutable access to all of the |
There was a problem hiding this comment.
What does "non-structural" mean in this context?
There was a problem hiding this comment.
Structural access (&mut World access) means you can insert/remove components, or despawn the entity. Non-structural access allows none of that; instead you have sliced access to the world which means you aren't allowed to perform changes that might affect other entities.
There was a problem hiding this comment.
I see, thanks for the clarification!
chescock
approved these changes
Jan 5, 2025
JaySpruce
approved these changes
Jan 5, 2025
alice-i-cecile
added
S-Ready-For-Final-Review
BenjaminBrienen
approved these changes
Jan 5, 2025
TimJentzsch
approved these changes
Jan 5, 2025
hymm
approved these changes
Jan 6, 2025
mrchantey
pushed a commit
to mrchantey/bevy
that referenced
this pull request
Feb 4, 2025
# Objective
Cleanup `EntityRef`, `EntityMut`, and `EntityWorldMut` in preparation
for my "Scoped Entity References" PR.
## Solution
- Switched `EntityRef`/`EntityMut` from tuple structs to normal ones.
- Ensured all conversion trait impls use the same `entity` argument
name.
- Replaced some `unsafe` with delegated calls from `EntityMut` to
`EntityRef`
- Added `EntityMut::into_readonly` to make the replacements clearer
- Replaced some `unsafe` with delegated calls from `EntityWorldMut` to
`EntityMut` and `EntityRef`
- Added `EntityWorldMut::into_readonly`, `::as_readonly`,
`::into_mutable`, `::as_mutable` to make the replacements clearer
## Testing
Reusing current tests.
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
Cleanup
EntityRef,EntityMut, andEntityWorldMutin preparation for my "Scoped Entity References" PR.Solution
EntityRef/EntityMutfrom tuple structs to normal ones.entityargument name.unsafewith delegated calls fromEntityMuttoEntityRefEntityMut::into_readonlyto make the replacements clearerunsafewith delegated calls fromEntityWorldMuttoEntityMutandEntityRefEntityWorldMut::into_readonly,::as_readonly,::into_mutable,::as_mutableto make the replacements clearerTesting
Reusing current tests.