adjust unzoomed colors

This commit is contained in:
Dustin Carlino 2020-02-18 17:33:41 -08:00
parent b4017cc0e2
commit a88a836752
2 changed files with 17 additions and 6 deletions

View File

@ -23,7 +23,8 @@ impl ShowBusRoute {
let mut txt = Text::from(Line(&route.name)); let mut txt = Text::from(Line(&route.name));
txt.add(Line(format!("{} buses", bus_locations.len()))); txt.add(Line(format!("{} buses", bus_locations.len())));
let mut colorer = Colorer::new(txt, vec![("route", Color::RED)]); let color = ui.cs.get("unzoomed bus");
let mut colorer = Colorer::new(txt, vec![("route", color)]);
for (stop1, stop2) in for (stop1, stop2) in
route route
.stops .stops
@ -46,7 +47,7 @@ impl ShowBusRoute {
.get_steps() .get_steps()
{ {
if let PathStep::Lane(l) = step { if let PathStep::Lane(l) = step {
colorer.add_l(*l, Color::RED, map); colorer.add_l(*l, color, map);
} }
} }
} }

View File

@ -458,12 +458,22 @@ impl InnerAgentColorScheme {
"agent types", "agent types",
"agent types", "agent types",
vec![ vec![
("car", cs.get_def("unzoomed car", Color::RED.alpha(0.5))), (
("bike", cs.get_def("unzoomed bike", Color::GREEN.alpha(0.5))), "car",
("bus", cs.get_def("unzoomed bus", Color::BLUE.alpha(0.5))), cs.get_def("unzoomed car", Color::hex("#A32015")).alpha(0.8),
),
(
"bike",
cs.get_def("unzoomed bike", Color::hex("#5D9630"))
.alpha(0.8),
),
(
"bus",
cs.get_def("unzoomed bus", Color::hex("#12409D")).alpha(0.8),
),
( (
"pedestrian", "pedestrian",
cs.get_def("unzoomed pedestrian", Color::ORANGE.alpha(0.5)), cs.get_def("unzoomed pedestrian", Color::hex("#DF8C3D").alpha(0.8)),
), ),
], ],
), ),