Skip to content
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

Implement the alternate solution for GitHub issue #9321, implementing Deref and DerefMut for EntityMap #9357

Closed
wants to merge 3 commits into from
Closed

Implement the alternate solution for GitHub issue #9321, implementing Deref and DerefMut for EntityMap #9357

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c74539
This implements the alternate solution for GitHub issue #9321, implem…
Aztro-dev Aug 4, 2023
9fade72
Formatting changes
Aztro-dev Aug 4, 2023
a257e85
Merge branch 'bevyengine:main' into main
Aztro-dev Aug 4, 2023
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
14 changes: 14 additions & 0 deletions crates/bevy_ecs/src/entity/map_entities.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::{entity::Entity, world::World};
use bevy_utils::{Entry, HashMap};
use core::ops::{Deref, DerefMut};

/// Operation to map all contained [`Entity`] fields in a type to new values.
///
Expand Down Expand Up @@ -129,6 +130,19 @@ impl EntityMap {
}
}

impl Deref for EntityMap {
type Target = HashMap<Entity, Entity>;
fn deref(&self) -> &Self::Target {
&self.map
}
}

impl DerefMut for EntityMap {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.map
}
}

/// A wrapper for [`EntityMap`], augmenting it with the ability to allocate new [`Entity`] references in a destination
/// world. These newly allocated references are guaranteed to never point to any living entity in that world.
///
Expand Down