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

Fixed commands for coerced exclusive systems (#1531)

Browse Source 
Fixes #1530.
This commit is contained in:
Alexander Sepity 2021-03-03 23:36:01 +00:00
parent 8bc7320a35
commit 4f1a65113d
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/bevy_ecs/src/system/exclusive_system.rs
View File

@ -105,6 +105,7 @@ impl ExclusiveSystem for ExclusiveSystemCoerced {
fn run(&mut self, world: &mut World, resources: &mut Resources) {
self.system.run((), world, resources);
self.system.apply_buffers(world, resources);
}
fn initialize(&mut self, world: &mut World, resources: &mut Resources) {
@ -123,3 +124,38 @@ where
}
}
}
#[test]
fn parallel_with_commands_as_exclusive() {
use crate::{
Commands, Entity, IntoExclusiveSystem, IntoSystem, ResMut, Resources, Stage, SystemStage,
With, World,
};
let mut world = World::new();
let mut resources = Resources::default();
fn removal(
commands: &mut Commands,
query: Query<Entity, With<f32>>,
mut counter: ResMut<usize>,
) {
for entity in query.iter() {
*counter += 1;
commands.remove_one::<f32>(entity);
}
}
let mut stage = SystemStage::parallel().with_system(removal.system());
world.spawn((0.0f32,));
resources.insert(0usize);
stage.run(&mut world, &mut resources);
stage.run(&mut world, &mut resources);
assert_eq!(*resources.get::<usize>().unwrap(), 1);
let mut stage = SystemStage::parallel().with_system(removal.exclusive_system());
world.spawn((0.0f32,));
resources.insert(0usize);
stage.run(&mut world, &mut resources);
stage.run(&mut world, &mut resources);
assert_eq!(*resources.get::<usize>().unwrap(), 1);
}