forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SceneEntityMapper constructor/destructor public (#13630)

Browse Source 
# Objective

`SceneEntityMapper` seems like it could be generally useful.

## Solution

Allow end users to call `SceneEntityMapper::new` and
`SceneEntityMapper::finish`.
This commit is contained in:
Dmytro Banin 2024-06-03 06:37:53 -07:00 committed by GitHub
parent 159b9a9091
commit 7307d76fb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_ecs/src/entity/map_entities.rs
View File

@ -132,7 +132,7 @@ impl<'m> SceneEntityMapper<'m> {
} }
/// Creates a new [`SceneEntityMapper`], spawning a temporary base [`Entity`] in the provided [`World`] /// Creates a new [`SceneEntityMapper`], spawning a temporary base [`Entity`] in the provided [`World`]
fn new(map: &'m mut EntityHashMap<Entity>, world: &mut World) -> Self { pub fn new(map: &'m mut EntityHashMap<Entity>, world: &mut World) -> Self {
Self { Self {
map, map,
// SAFETY: Entities data is kept in a valid state via `EntityMapper::world_scope` // SAFETY: Entities data is kept in a valid state via `EntityMapper::world_scope`
@ -145,7 +145,7 @@ impl<'m> SceneEntityMapper<'m> {
/// [`Entity`] while reserving extra generations via [`crate::entity::Entities::reserve_generations`]. Because this /// [`Entity`] while reserving extra generations via [`crate::entity::Entities::reserve_generations`]. Because this
/// renders the [`SceneEntityMapper`] unable to safely allocate any more references, this method takes ownership of /// renders the [`SceneEntityMapper`] unable to safely allocate any more references, this method takes ownership of
/// `self` in order to render it unusable. /// `self` in order to render it unusable.
fn finish(self, world: &mut World) { pub fn finish(self, world: &mut World) {
// SAFETY: Entities data is kept in a valid state via `EntityMap::world_scope` // SAFETY: Entities data is kept in a valid state via `EntityMap::world_scope`
let entities = unsafe { world.entities_mut() }; let entities = unsafe { world.entities_mut() };
assert!(entities.free(self.dead_start).is_some()); assert!(entities.free(self.dead_start).is_some());