a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-25 03:41:09 +03:00
Code Issues Projects Releases Wiki Activity

prerender lane polygons for MASSIVE win

Browse Source
This commit is contained in:
Dustin Carlino 2019-01-25 11:22:25 -08:00
parent 8afe83162b
commit 9cd2795329
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/TODO_ux.md
View File

@ -67,8 +67,6 @@
- speed
- change ezgui API to allow uploading geometry once
- prerender lane polygons for GREAT win
- what about color then? get fancy and plumb an override color uniform?
- stop storing raw geometry when appropriate
- should the API for batching be easier? make a bunch of mutable calls to GfxCtx-like thing, then flush it?

29
editor/src/render/lane.rs
View File

@ -16,6 +16,7 @@ pub struct DrawLane {
pub polygon: Polygon,
zorder: isize,
draw_default: Drawable,
draw_markings: Drawable,
}
@ -50,10 +51,22 @@ impl DrawLane {
markings.extend(calculate_stop_sign_line(road, lane, map, cs));
}
let draw_default = prerender.upload_borrowed(vec![(
match lane.lane_type {
LaneType::Driving => cs.get_def("driving lane", Color::BLACK),
LaneType::Bus => cs.get_def("bus lane", Color::rgb(190, 74, 76)),
LaneType::Parking => cs.get_def("parking lane", Color::grey(0.2)),
LaneType::Sidewalk => cs.get_def("sidewalk", Color::grey(0.8)),
LaneType::Biking => cs.get_def("bike lane", Color::rgb(15, 125, 75)),
},
&polygon,
)]);
DrawLane {
id: lane.id,
polygon,
zorder: road.get_zorder(),
draw_default,
draw_markings: prerender.upload(markings),
}
}
@ -81,17 +94,11 @@ impl Renderable for DrawLane {
}
fn draw(&self, g: &mut GfxCtx, opts: RenderOptions, ctx: &Ctx) {
let color = opts.color.unwrap_or_else(|| {
let l = ctx.map.get_l(self.id);
match l.lane_type {
LaneType::Driving => ctx.cs.get_def("driving lane", Color::BLACK),
LaneType::Bus => ctx.cs.get_def("bus lane", Color::rgb(190, 74, 76)),
LaneType::Parking => ctx.cs.get_def("parking lane", Color::grey(0.2)),
LaneType::Sidewalk => ctx.cs.get_def("sidewalk", Color::grey(0.8)),
LaneType::Biking => ctx.cs.get_def("bike lane", Color::rgb(15, 125, 75)),
}
});
g.draw_polygon(color, &self.polygon);
if let Some(color) = opts.color {
g.draw_polygon(color, &self.polygon);
} else {
g.redraw(&self.draw_default);
}
if ctx.canvas.cam_zoom >= MIN_ZOOM_FOR_MARKINGS || opts.show_all_detail {
g.redraw(&self.draw_markings);