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

disable slow and unused startup step, and add more timing in DrawMap

Browse Source
This commit is contained in:
Dustin Carlino 2019-01-26 10:34:19 -08:00
parent 4d5bafd551
commit 476a4346e8
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editor/src/plugins/view/neighborhood_summary.rs
View File

@ -80,22 +80,23 @@ struct Region {
}
impl Region {
fn new(idx: usize, n: Neighborhood, map: &Map, draw_map: &DrawMap) -> Region {
fn new(idx: usize, n: Neighborhood, _map: &Map, _draw_map: &DrawMap) -> Region {
let center = n.polygon.center();
// TODO polygon overlap or complete containment would be more ideal
let lanes = draw_map
.get_matching_lanes(n.polygon.get_bounds())
.into_iter()
.filter(|id| {
let l = map.get_l(*id);
n.polygon.contains_pt(l.first_pt()) && n.polygon.contains_pt(l.last_pt())
})
.collect();
// TODO Re-enable when this is useful; just causes slow start all the time
/*let lanes = draw_map
.get_matching_lanes(n.polygon.get_bounds())
.into_iter()
.filter(|id| {
let l = map.get_l(*id);
n.polygon.contains_pt(l.first_pt()) && n.polygon.contains_pt(l.last_pt())
})
.collect();*/
Region {
name: n.name.clone(),
polygon: n.polygon.clone(),
center,
lanes,
lanes: HashSet::new(),
color: COLORS[idx % COLORS.len()],
summary: Text::from_line(format!("{} - no summary yet", n.name)),
}

20
editor/src/render/map.rs
View File

@ -51,8 +51,8 @@ impl DrawMap {
prerender: &Prerender,
timer: &mut Timer,
) -> DrawMap {
let mut lanes: Vec<DrawLane> = Vec::new();
timer.start_iter("make DrawLanes", map.all_lanes().len());
let mut lanes: Vec<DrawLane> = Vec::new();
for l in map.all_lanes() {
timer.next();
lanes.push(DrawLane::new(l, map, cs, prerender));
@ -64,15 +64,23 @@ impl DrawMap {
}
assert_eq!(turn_to_lane_offset.len(), map.all_turns().len());
timer.start_iter("make DrawTurns", map.all_turns().len());
let mut turns: HashMap<TurnID, DrawTurn> = HashMap::new();
for t in map.all_turns().values() {
timer.next();
turns.insert(t.id, DrawTurn::new(map, t, turn_to_lane_offset[&t.id]));
}
timer.start_iter("make DrawIntersections", map.all_intersections().len());
let intersections: Vec<DrawIntersection> = map
.all_intersections()
.iter()
.map(|i| DrawIntersection::new(i, map, cs, prerender))
.map(|i| {
timer.next();
DrawIntersection::new(i, map, cs, prerender)
})
.collect();
timer.start_iter("make DrawBuildings", map.all_buildings().len());
let buildings: Vec<DrawBuilding> = map
.all_buildings()
@ -82,10 +90,15 @@ impl DrawMap {
DrawBuilding::new(b, cs, prerender)
})
.collect();
timer.start_iter("make DrawParcels", map.all_parcels().len());
let parcels: Vec<DrawParcel> = map
.all_parcels()
.iter()
.map(|p| DrawParcel::new(p, cs, prerender))
.map(|p| {
timer.next();
DrawParcel::new(p, cs, prerender)
})
.collect();
let mut extra_shapes: Vec<DrawExtraShape> = Vec::new();
@ -231,6 +244,7 @@ impl DrawMap {
&self.areas[id.0]
}
#[allow(dead_code)]
pub fn get_matching_lanes(&self, bounds: Bounds) -> Vec<LaneID> {
let mut results: Vec<LaneID> = Vec::new();
for &(id, _, _) in &self.quadtree.query(bounds.as_bbox()) {