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

tweaking some map colors

Browse Source
This commit is contained in:
Dustin Carlino 2019-10-24 16:00:27 -07:00
parent cb4720946c
commit a8490aa16f
4 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
data/screenshots/montlake/MANIFEST
View File

@ -1,21 +1,21 @@
e1a6e14f3b585a99d70f4d3d9afc97ea ../data/screenshots/pending_montlake/01x01_i52.png
0f008347ce29e2f80006699858f5b024 ../data/screenshots/pending_montlake/02x01_i1.png
b3cf25e0c4382a7c91f8a12c5abfc023 ../data/screenshots/pending_montlake/03x01_i0.png
f2c7083a2e0e2a6039f0ce3fc75823b0 ../data/screenshots/pending_montlake/01x02_i7.png
1af3029a2c2c64af9568760ada59c9f5 ../data/screenshots/pending_montlake/02x02_i125.png
7a2f0c56b2dbb2997da807b90dab3566 ../data/screenshots/pending_montlake/03x02_i30.png
75c7bba069f59f245d05c79588891538 ../data/screenshots/pending_montlake/01x03_i96.png
96a8b52e299032c187ff395bf96e3a54 ../data/screenshots/pending_montlake/02x03_i5.png
392f6158d97402eb7eb8d349591cc384 ../data/screenshots/pending_montlake/03x03_i13.png
615e04c96503dc3a0eec27ae1b9e953e ../data/screenshots/pending_montlake/01x04_i3.png
515cbe5b6ad4545f5771dd7f9cee297e ../data/screenshots/pending_montlake/02x04_i26.png
24cfe9e237b59ba7ef61d7348bd6a683 ../data/screenshots/pending_montlake/03x04_i12.png
bb7b19d3ec9435ded8a5f00a2c4ad04d ../data/screenshots/pending_montlake/01x05_i41.png
81261d07f7af826511941b9b9019d08d ../data/screenshots/pending_montlake/02x05_i40.png
20744688172dfca19683a621438b6825 ../data/screenshots/pending_montlake/03x05_i20.png
96108b40fb32b44ab64cf569941e5faf ../data/screenshots/pending_montlake/01x06_i11.png
d66a4f0e23bd6662201ddad433476e73 ../data/screenshots/pending_montlake/02x06_i9.png
9641d727daf589de64923cd4296e0a13 ../data/screenshots/pending_montlake/03x06_i16.png
228d874db835c89248966a4eda679465 ../data/screenshots/pending_montlake/01x07_i103.png
ddbd185ea6e662c014be4b35b101a29c ../data/screenshots/pending_montlake/02x07_i18.png
fc0041b2f79218a9bb9d7e879564886c ../data/screenshots/pending_montlake/03x07_i17.png
86a9b0e7d962c8018cce79780b887548 ../data/screenshots/pending_montlake/01x01_i52.png
39b7b6cd6fdc808905185df80648aeac ../data/screenshots/pending_montlake/02x01_i1.png
8031bcc147e871442f61bf2dcffd1bef ../data/screenshots/pending_montlake/03x01_i0.png
3b89724ee90dbc27ed63b433134d462b ../data/screenshots/pending_montlake/01x02_i7.png
037de8352136becc9c8d6fc3c055441c ../data/screenshots/pending_montlake/02x02_i125.png
3639aa262e615ec329ef5d3ad66dfac1 ../data/screenshots/pending_montlake/03x02_i30.png
8544a73fb09878e5cf50cd68ae101b4c ../data/screenshots/pending_montlake/01x03_i96.png
28d361824615d3493f7eb68566bbd415 ../data/screenshots/pending_montlake/02x03_i5.png
8dcf86c432fec6b21c40b7a00e644ff7 ../data/screenshots/pending_montlake/03x03_i13.png
4b213980a9062d8b643030fb3ed7c2de ../data/screenshots/pending_montlake/01x04_i3.png
130d1c9b47886deb1131e2aee17bfd63 ../data/screenshots/pending_montlake/02x04_i26.png
b1215a9922c8c61f2b7704fef603e7ae ../data/screenshots/pending_montlake/03x04_i12.png
64067453731a63ccad74e0074ade57de ../data/screenshots/pending_montlake/01x05_i41.png
663179f6274a68124fe348d3d469be27 ../data/screenshots/pending_montlake/02x05_i40.png
0e4ba06ac306f198d503d087c433c9a7 ../data/screenshots/pending_montlake/03x05_i20.png
4c5a9bc055d1631401e6afe1e67fea9b ../data/screenshots/pending_montlake/01x06_i11.png
a86136d5f2feafb89a8589189d40e9b3 ../data/screenshots/pending_montlake/02x06_i9.png
5551bfd3ad090d6c769243e39b323634 ../data/screenshots/pending_montlake/03x06_i16.png
4862103730e29801a90899cee5661439 ../data/screenshots/pending_montlake/01x07_i103.png
18188c8fc187c8a1a830f383566125b0 ../data/screenshots/pending_montlake/02x07_i18.png
d076048ab87e2aef1d457fe1438c1b09 ../data/screenshots/pending_montlake/03x07_i17.png

2
game/src/render/building.rs
View File

@ -26,7 +26,7 @@ impl DrawBuilding {
let front_path = front_path_line.make_polygons(Distance::meters(1.0));
batch.push(
cs.get_def("building", Color::rgb(174, 161, 151)),
cs.get_def("building", Color::rgb(196, 193, 188)),
bldg.polygon.clone(),
);
batch.push(cs.get_def("building path", Color::grey(0.6)), front_path);

18
game/src/render/map.rs
View File

@ -66,10 +66,12 @@ impl DrawMap {
osm_rank_to_color(cs, r.get_rank()),
r.get_thick_polygon().get(timer),
);
all_roads.push(
cs.get_def("unzoomed outline", Color::BLACK),
draw_r.get_outline(map),
);
if false {
all_roads.push(
cs.get_def("unzoomed outline", Color::BLACK),
draw_r.get_outline(map),
);
}
roads.push(draw_r);
}
timer.start("upload thick roads");
@ -121,7 +123,9 @@ impl DrawMap {
let draw_i = DrawIntersection::new(i, map, cs, ctx.prerender, timer);
if i.is_stop_sign() {
all_intersections.push(osm_rank_to_color(cs, i.get_rank(map)), i.polygon.clone());
all_intersections.push(cs.get("unzoomed outline"), draw_i.get_outline(map));
if false {
all_intersections.push(cs.get("unzoomed outline"), draw_i.get_outline(map));
}
} else {
all_intersections.push(
cs.get_def("unzoomed interesting intersection", Color::BLACK),
@ -203,7 +207,7 @@ impl DrawMap {
timer.stop("upload all areas");
let boundary_polygon = ctx.prerender.upload_borrowed(vec![(
cs.get_def("map background", Color::rgb(242, 239, 233)),
cs.get_def("map background", Color::grey(0.87)),
map.get_boundary_polygon(),
)]);
@ -416,7 +420,7 @@ fn osm_rank_to_color(cs: &ColorScheme, rank: usize) -> Color {
if rank >= 16 {
cs.get_def("unzoomed highway road", Color::rgb(232, 146, 162))
} else if rank >= 6 {
cs.get_def("unzoomed arterial road", Color::rgb(247, 250, 191))
cs.get_def("unzoomed arterial road", Color::rgb(255, 199, 62))
} else {
cs.get_def("unzoomed residential road", Color::WHITE)
}

4
game/src/ui.rs
View File

@ -30,12 +30,12 @@ impl UI {
(
"assets/water_texture.png",
TextureType::Tile,
Color::rgb(170, 211, 223),
Color::rgb(164, 200, 234),
),
(
"assets/grass_texture.png",
TextureType::Tile,
Color::rgb(200, 250, 204),
Color::rgb(148, 200, 74),
),
(
"assets/pedestrian.png",