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

fix rendering crash

Browse Source
This commit is contained in:
Dustin Carlino 2020-07-08 15:57:19 -07:00
parent 6304abdcc8
commit 95626d5b64
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/src/render/traffic_signal.rs
View File

@ -284,7 +284,7 @@ pub fn draw_signal_phase(
fn crosswalk_icon(geom: &PolyLine) -> (Pt2D, Angle) { fn crosswalk_icon(geom: &PolyLine) -> (Pt2D, Angle) {
let l = Line::new(geom.points()[1], geom.points()[2]); let l = Line::new(geom.points()[1], geom.points()[2]);
( (
l.dist_along(Distance::meters(1.0)), l.safe_dist_along(Distance::meters(1.0)).unwrap_or(l.pt1()),
l.angle().shortest_rotation_towards(Angle::new_degs(90.0)), l.angle().shortest_rotation_towards(Angle::new_degs(90.0)),
) )
} }

8
geom/src/line.rs
View File

@ -165,6 +165,14 @@ impl Line {
self.percent_along(dist / len) self.percent_along(dist / len)
} }
pub fn safe_dist_along(&self, dist: Distance) -> Option<Pt2D> {
if dist > self.length() {
None
} else {
Some(self.dist_along(dist))
}
}
pub fn middle(&self) -> Pt2D { pub fn middle(&self) -> Pt2D {
self.dist_along(self.length() / 2.0) self.dist_along(self.length() / 2.0)
} }