a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-29 17:34:58 +03:00
Code Issues Projects Releases Wiki Activity

only need to prebake once per map+scenario

Browse Source
This commit is contained in:
Dustin Carlino 2019-12-13 13:57:27 -08:00
parent 16c9819a0d
commit e307e1f56d
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
game/src/challenges.rs
View File

@ -10,7 +10,7 @@ use ezgui::{
};
use geom::Time;
use sim::{Sim, SimFlags, SimOptions, TripMode};
use std::collections::BTreeMap;
use std::collections::{BTreeMap, HashSet};
// TODO Also have some kind of screenshot to display for each challenge
#[derive(Clone)]
@ -270,9 +270,18 @@ pub fn prebake() {
timer.start(format!("prebake for {}", map_path));
let map = map_model::Map::new(map_path.clone(), false, &mut timer);
let mut done_scenarios = HashSet::new();
for challenge in list {
timer.start(format!("prebake for {}", challenge.title));
if let Some(scenario) = challenge.gameplay.scenario(&map, None, &mut timer) {
if done_scenarios.contains(&scenario.scenario_name) {
continue;
}
done_scenarios.insert(scenario.scenario_name.clone());
timer.start(format!(
"prebake for {} / {}",
scenario.map_name, scenario.scenario_name
));
let mut sim = Sim::new(&map, SimOptions::new("prebaked"), &mut timer);
// Bit of an abuse of this, but just need to fix the rng seed.
let mut rng = SimFlags::for_test("prebaked").make_rng();
@ -283,8 +292,11 @@ pub fn prebake() {
abstutil::path_prebaked_results(&scenario.map_name, &scenario.scenario_name),
sim.get_analytics(),
);
timer.stop(format!(
"prebake for {} / {}",
scenario.map_name, scenario.scenario_name
));
}
timer.stop(format!("prebake for {}", challenge.title));
}
timer.stop(format!("prebake for {}", map_path));

2
map_model/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
aabb-quadtree = "0.1.0"
abstutil = { path = "../abstutil" }
fast_paths = { git = "https://github.com/dabreegster/fast_paths" }
fast_paths = { git = "https://github.com/easbar/fast_paths", rev = "7bdbaf0e02f4dc502a915277d9a079801ce1a752" }
geom = { path = "../geom" }
gtfs = { path = "../gtfs" }
nbez = "0.1.0"