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.

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

Fake World::modify impl #20

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
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
39 changes: 38 additions & 1 deletion src/world.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ use std::error::Error;
use hashbrown::{HashMap, HashSet};

use crate::archetype::Archetype;
use crate::{Bundle, DynamicBundle, EntityRef, MissingComponent, Query, QueryBorrow, Ref, RefMut};
use crate::{
Bundle, DynamicBundle, EntityRef, Fetch, MissingComponent, Query, QueryBorrow, Ref, RefMut,
};

/// An unordered collection of entities, each having any number of distinctly typed components
///
Expand Down Expand Up @@ -362,6 +364,41 @@ impl World {
pub fn remove_one<T: Component>(&mut self, entity: Entity) -> Result<T, ComponentError> {
self.remove::<(T,)>(entity).map(|(x,)| x)
}

/// Execute a query, modifying the world after processing each entity
///
/// For each entity matching `Q`, `process` is invoked to provide access to the queried
/// components, then `apply` is invoked with the same `Entity` and the return value of `process`
/// to allow components and entire entities to be added.
///
/// # Example
/// ```rust
/// # use hecs::*;
/// let mut world = World::new();
/// let a = world.spawn(("abc", 123));
/// let b = world.spawn(("def", 456, true));
/// let c = world.spawn(("ghi", 789, false));
/// world.modify::<&bool, _, _, _>(
/// |_entity, &flag| flag,
/// |world, entity, flag| if flag { world.despawn(entity); },
/// );
/// assert!(world.contains(a));
/// assert!(!world.contains(b));
/// assert!(world.contains(c));
/// ```
pub fn modify<Q: Query, Process, Apply, T>(&mut self, mut process: Process, mut apply: Apply)
where
Process: for<'a> FnMut(Entity, <Q::Fetch as Fetch<'a>>::Item) -> T,
Apply: FnMut(&mut World, Entity, T),
{
let mut tmp = Vec::new();
for (e, q) in &mut self.query::<Q>() {
tmp.push((e, process(e, q)));
}
for (e, x) in tmp {
apply(self, e, x);
}
}
}

unsafe impl Send for World {}
Expand Down