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

squish_polygons_together infinite loops sometimes. until a proper fix, just limit it to 100 relaxations

Browse Source
This commit is contained in:
Dustin Carlino 2020-08-16 08:36:00 -07:00
parent bef3434ac8
commit 7d460f27c8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/src/edit/traffic_signals/mod.rs
View File

@ -928,6 +928,7 @@ fn squish_polygons_together(mut polygons: Vec<Polygon>) -> Vec<(f64, f64)> {
// Once a polygon hits another while moving, stop adjusting it. Otherwise, go round-robin.
let mut indices: VecDeque<usize> = (0..polygons.len()).collect();
let mut attempts = 0;
while !indices.is_empty() {
let idx = indices.pop_front().unwrap();
let center = Pt2D::center(&polygons.iter().map(|p| p.center()).collect());
@ -948,6 +949,11 @@ fn squish_polygons_together(mut polygons: Vec<Polygon>) -> Vec<(f64, f64)> {
polygons[idx] = translated;
indices.push_back(idx);
}
attempts += 1;
if attempts == 100 {
break;
}
}
translations