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

Allow adding systems to multiple sets that share the same base set (#7709)

Browse Source 
# Objective

Fixes #7702.

## Solution

- Added an test that ensures that no error is returned if a system or set is inside two different sets that share the same base set.
- Added an check to only return an error if the two base sets are not equal.
This commit is contained in:
Edgar Geier 2023-02-16 17:09:46 +00:00
parent b35818c0a3
commit 6a63940367
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/bevy_ecs/src/schedule/mod.rs
View File

@ -797,6 +797,28 @@ mod tests {
)); ));
} }
#[test]
fn allow_same_base_sets() {
let mut world = World::new();
let mut schedule = Schedule::new();
schedule
.configure_set(Normal::X.in_base_set(Base::A))
.configure_set(Normal::Y.in_base_set(Base::A))
.add_system(named_system.in_set(Normal::X).in_set(Normal::Y));
let result = schedule.initialize(&mut world);
assert!(matches!(result, Ok(())));
let mut schedule = Schedule::new();
schedule
.configure_set(Normal::X.in_base_set(Base::A))
.configure_set(Normal::Y.in_base_set(Base::A).in_set(Normal::X));
let result = schedule.initialize(&mut world);
assert!(matches!(result, Ok(())));
}
#[test] #[test]
fn default_base_set_ordering() { fn default_base_set_ordering() {
let mut world = World::default(); let mut world = World::default();

32
crates/bevy_ecs/src/schedule/schedule.rs
View File

@ -840,20 +840,26 @@ impl ScheduleGraph {
neighbor, neighbor,
)? { )? {
if let Some(first_set) = base_set { if let Some(first_set) = base_set {
return Err(match node_id { if first_set != calculated_base_set {
NodeId::System(index) => { return Err(match node_id {
ScheduleBuildError::SystemInMultipleBaseSets { NodeId::System(index) => {
system: systems[index].name(), ScheduleBuildError::SystemInMultipleBaseSets {
first_set: system_sets[first_set.index()].name(), system: systems[index].name(),
second_set: system_sets[calculated_base_set.index()].name(), first_set: system_sets[first_set.index()].name(),
second_set: system_sets[calculated_base_set.index()]
.name(),
}
} }
} NodeId::Set(index) => {
NodeId::Set(index) => ScheduleBuildError::SetInMultipleBaseSets { ScheduleBuildError::SetInMultipleBaseSets {
set: system_sets[index].name(), set: system_sets[index].name(),
first_set: system_sets[first_set.index()].name(), first_set: system_sets[first_set.index()].name(),
second_set: system_sets[calculated_base_set.index()].name(), second_set: system_sets[calculated_base_set.index()]
}, .name(),
}); }
}
});
}
} }
base_set = Some(calculated_base_set); base_set = Some(calculated_base_set);
} }