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

Fallback to old path tracing for shortcuts

Browse Source
This commit is contained in:
Dustin Carlino 2022-07-19 08:33:01 +02:00
parent 306b8c2dd8
commit aed6795234
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
apps/ltn/src/edit/shortcuts.rs
View File

@ -1,5 +1,5 @@
use geom::Distance;
use map_model::{Path, RoadID};
use geom::{Distance, Pt2D};
use map_model::{Path, RoadID, NORMAL_LANE_THICKNESS};
use widgetry::mapspace::{ToggleZoomed, World, WorldOutcome};
use widgetry::{Color, EventCtx, GeomBatch, Key, Line, Text, TextExt, Widget};
@ -91,28 +91,37 @@ pub fn make_world(
if let Some(ref focus) = focus {
let mut draw_path = ToggleZoomed::builder();
let path = &focus.paths[focus.current_idx];
if let Ok(poly) = path.trace_v2(&app.map) {
let color = *app.cs.good_to_bad_red.0.last().unwrap();
let color = *app.cs.good_to_bad_red.0.last().unwrap();
let (first_pt, last_pt) = if let Ok(poly) = path.trace_v2(&app.map) {
draw_path.unzoomed.push(color.alpha(0.8), poly.clone());
draw_path.zoomed.push(color.alpha(0.5), poly);
(
path.get_req().start.pt(&app.map),
path.get_req().end.pt(&app.map),
)
} else if let Some(pl) = path.trace(&app.map) {
let poly = pl.make_polygons(5.0 * NORMAL_LANE_THICKNESS);
draw_path.unzoomed.push(color.alpha(0.8), poly.clone());
draw_path.zoomed.push(color.alpha(0.5), poly);
(pl.first_pt(), pl.last_pt())
} else {
// Should be unreachable, but don't crash
(Pt2D::zero(), Pt2D::zero())
};
draw_path
.unzoomed
.append(map_gui::tools::start_marker(ctx, first_pt, 2.0));
draw_path
.zoomed
.append(map_gui::tools::start_marker(ctx, first_pt, 0.5));
let first_pt = path.get_req().start.pt(&app.map);
let last_pt = path.get_req().end.pt(&app.map);
draw_path
.unzoomed
.append(map_gui::tools::goal_marker(ctx, last_pt, 2.0));
draw_path
.zoomed
.append(map_gui::tools::goal_marker(ctx, last_pt, 0.5));
draw_path
.unzoomed
.append(map_gui::tools::start_marker(ctx, first_pt, 2.0));
draw_path
.zoomed
.append(map_gui::tools::start_marker(ctx, first_pt, 0.5));
draw_path
.unzoomed
.append(map_gui::tools::goal_marker(ctx, last_pt, 2.0));
draw_path
.zoomed
.append(map_gui::tools::goal_marker(ctx, last_pt, 0.5));
}
world.draw_master_batch_while_not_hovering(ctx, draw_path);
}