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

[Bugfix] add_stage now checks Stage existence (#1346)

Browse Source 
add_stage now checks stage existence
This commit is contained in:
Telzhaak 2021-01-30 21:10:14 +01:00 committed by GitHub
parent 57f9ac18d7
commit 61c9a40fde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,15 +58,14 @@ impl Schedule {
pub fn add_stage<S: Stage>(&mut self, name: &str, stage: S) -> &mut Self { pub fn add_stage<S: Stage>(&mut self, name: &str, stage: S) -> &mut Self {
self.stage_order.push(name.to_string()); self.stage_order.push(name.to_string());
self.stages.insert(name.to_string(), Box::new(stage)); let prev = self.stages.insert(name.to_string(), Box::new(stage));
if prev.is_some() {
panic!("Stage already exists: {}.", name);
}
self self
} }
pub fn add_stage_after<S: Stage>(&mut self, target: &str, name: &str, stage: S) -> &mut Self { pub fn add_stage_after<S: Stage>(&mut self, target: &str, name: &str, stage: S) -> &mut Self {
if self.stages.get(name).is_some() {
panic!("Stage already exists: {}.", name);
}
let target_index = self let target_index = self
.stage_order .stage_order
.iter() .iter()
@ -75,16 +74,15 @@ impl Schedule {
.map(|(i, _)| i) .map(|(i, _)| i)
.unwrap_or_else(|| panic!("Target stage does not exist: {}.", target)); .unwrap_or_else(|| panic!("Target stage does not exist: {}.", target));
self.stages.insert(name.to_string(), Box::new(stage));
self.stage_order.insert(target_index + 1, name.to_string()); self.stage_order.insert(target_index + 1, name.to_string());
let prev = self.stages.insert(name.to_string(), Box::new(stage));
if prev.is_some() {
panic!("Stage already exists: {}.", name);
}
self self
} }
pub fn add_stage_before<S: Stage>(&mut self, target: &str, name: &str, stage: S) -> &mut Self { pub fn add_stage_before<S: Stage>(&mut self, target: &str, name: &str, stage: S) -> &mut Self {
if self.stages.get(name).is_some() {
panic!("Stage already exists: {}.", name);
}
let target_index = self let target_index = self
.stage_order .stage_order
.iter() .iter()
@ -93,8 +91,11 @@ impl Schedule {
.map(|(i, _)| i) .map(|(i, _)| i)
.unwrap_or_else(|| panic!("Target stage does not exist: {}.", target)); .unwrap_or_else(|| panic!("Target stage does not exist: {}.", target));
self.stages.insert(name.to_string(), Box::new(stage));
self.stage_order.insert(target_index, name.to_string()); self.stage_order.insert(target_index, name.to_string());
let prev = self.stages.insert(name.to_string(), Box::new(stage));
if prev.is_some() {
panic!("Stage already exists: {}.", name);
}
self self
} }