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

change arrow location back to the original

Browse Source 
But leave arrow length extended somewhat. Also fix the lane length check.
This commit is contained in:
Marcel Dejean 2021-12-20 22:57:33 -05:00 committed by Dustin Carlino
parent 68c5d43dd4
commit 425300b130
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
map_gui/src/render/lane.rs
View File

@ -304,9 +304,6 @@ fn calculate_driving_lines(lane: &Lane, road: &Road) -> Vec<Polygon> {
}
fn calculate_turn_markings(map: &Map, lane: &Lane) -> Vec<Polygon> {
if lane.length() < Distance::meters(7.0) {
return Vec::new();
}
// Does this lane connect to every other possible outbound lane of the same type, excluding
// U-turns to the same road? If so, then there's nothing unexpected to communicate.
@ -340,7 +337,7 @@ fn calculate_turn_markings(map: &Map, lane: &Lane) -> Vec<Polygon> {
let thickness = Distance::meters(0.2);
// The distance of the end of a straight arrow from the intersection
let location = Distance::meters(2.0);
let location = Distance::meters(4.0);
// The length of a straight arrow (turn arrows are shorter)
let length_max = Distance::meters(3.0);
// The width of a double (left+right) u-turn arrow
@ -363,6 +360,11 @@ fn calculate_turn_markings(map: &Map, lane: &Lane) -> Vec<Polygon> {
// Put the middle, not the straight line of the marking in the middle of the lane
let offset = (right + left) / 2.0;
// If the lane is too short to fit the arrows, don't make them
if lane.length() < length_max + location {
return Vec::new();
}
let (start_pt_unshifted, start_angle) = lane
.lane_center_pts
.must_dist_along(lane.length() - (length_max + location));