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

Fix crash in ungap's route sketcher. If you drag intermediate waypoints

Browse Source 
such that the path is impossible, don't move the waypoint.
This commit is contained in:
Dustin Carlino 2021-12-07 15:25:46 +00:00
parent b45bf869b7
commit 56a42f9f21
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
game/src/common/route_sketcher.rs
View File

@ -299,6 +299,8 @@ impl Route {
return 0;
}
let orig = self.clone();
// Move an existing waypoint?
if let Some(way_idx) = self.waypoints.iter().position(|x| *x == old_i) {
self.waypoints[way_idx] = new_i;
@ -317,12 +319,16 @@ impl Route {
// changed, but eh.
self.full_path.clear();
for pair in self.waypoints.windows(2) {
// TODO If the new change doesn't work, we could revert.
let (_, intersections) = map
.simple_path_btwn_v2(pair[0], pair[1], PathConstraints::Car)
.unwrap();
self.full_path.pop();
self.full_path.extend(intersections);
if let Some((_, intersections)) =
map.simple_path_btwn_v2(pair[0], pair[1], PathConstraints::Car)
{
self.full_path.pop();
self.full_path.extend(intersections);
} else {
// Moving the waypoint broke the path, just revert.
*self = orig;
return full_idx;
}
}
self.idx(new_i).unwrap()
}