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

Use chevrons, not arrows, to point uphill, per discussion with Yuwen. #82

Browse Source
This commit is contained in:
Dustin Carlino 2021-03-27 09:25:06 -07:00
parent ef7cbdcf48
commit 3f1abda5e2
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
game/src/layer/elevation.rs
View File

@ -1,5 +1,5 @@
use abstutil::Parallelism; use abstutil::Parallelism;
use geom::{ArrowCap, Distance, FindClosest, PolyLine, Polygon, Pt2D}; use geom::{Angle, Distance, FindClosest, PolyLine, Polygon, Pt2D};
use map_gui::tools::{ColorDiscrete, ColorScale, Grid}; use map_gui::tools::{ColorDiscrete, ColorScale, Grid};
use map_gui::ID; use map_gui::ID;
use widgetry::{Color, Drawable, EventCtx, GeomBatch, GfxCtx, Panel, Text, TextExt, Widget}; use widgetry::{Color, Drawable, EventCtx, GeomBatch, GfxCtx, Panel, Text, TextExt, Widget};
@ -63,7 +63,7 @@ impl SteepStreets {
); );
let arrow_len = Distance::meters(5.0); let arrow_len = Distance::meters(5.0);
let thickness = Distance::meters(1.0); let thickness = Distance::meters(2.0);
let mut steepest = 0.0_f64; let mut steepest = 0.0_f64;
let mut arrows = GeomBatch::new(); let mut arrows = GeomBatch::new();
for r in app.primary.map.all_roads() { for r in app.primary.map.all_roads() {
@ -96,7 +96,7 @@ impl SteepStreets {
pl = pl.reversed(); pl = pl.reversed();
} }
let btwn = Distance::meters(10.0); let btwn = Distance::meters(15.0);
let len = pl.length(); let len = pl.length();
let mut dist = arrow_len; let mut dist = arrow_len;
@ -105,10 +105,11 @@ impl SteepStreets {
arrows.push( arrows.push(
Color::WHITE, Color::WHITE,
PolyLine::must_new(vec![ PolyLine::must_new(vec![
pt.project_away(arrow_len / 2.0, angle.opposite()), pt.project_away(arrow_len, angle.rotate_degs(-135.0)),
pt.project_away(arrow_len / 2.0, angle), pt,
pt.project_away(arrow_len, angle.rotate_degs(135.0)),
]) ])
.make_arrow(thickness, ArrowCap::Triangle), .make_polygons(thickness),
); );
dist += btwn; dist += btwn;
} }
@ -116,18 +117,18 @@ impl SteepStreets {
colorer.unzoomed.append(arrows); colorer.unzoomed.append(arrows);
let (unzoomed, zoomed, legend) = colorer.build(ctx); let (unzoomed, zoomed, legend) = colorer.build(ctx);
let pt = Pt2D::new(0.0, 0.0);
let panel_arrow = PolyLine::must_new(vec![
pt.project_away(arrow_len, Angle::degrees(-135.0)),
pt,
pt.project_away(arrow_len, Angle::degrees(135.0)),
])
.make_polygons(thickness)
.scale(5.0);
let panel = Panel::new(Widget::col(vec![ let panel = Panel::new(Widget::col(vec![
header(ctx, "Steep streets"), header(ctx, "Steep streets"),
Widget::row(vec![ Widget::row(vec![
GeomBatch::from(vec![( GeomBatch::from(vec![(ctx.style().text_fg_color, panel_arrow)])
ctx.style().text_fg_color,
PolyLine::must_new(vec![
Pt2D::new(0.0, 0.0),
Pt2D::new(arrow_len.inner_meters(), 0.0),
])
.make_arrow(thickness, ArrowCap::Triangle)
.scale(10.0),
)])
.autocrop() .autocrop()
.into_widget(ctx), .into_widget(ctx),
"points uphill".text_widget(ctx).centered_vert(), "points uphill".text_widget(ctx).centered_vert(),