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

Make pedestrians walk on the left side of the sidewalk in the UK. #311

Browse Source
This commit is contained in:
Dustin Carlino 2020-09-11 13:55:26 -07:00
parent d56d1fd0e3
commit d88ccf98b7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/src/render/pedestrian.rs
View File

@ -3,7 +3,7 @@ use crate::colors::ColorScheme;
use crate::helpers::ID;
use crate::render::{DrawOptions, Renderable, OUTLINE_THICKNESS};
use geom::{ArrowCap, Circle, Distance, PolyLine, Polygon};
use map_model::{Map, SIDEWALK_THICKNESS};
use map_model::{DrivingSide, Map, SIDEWALK_THICKNESS};
use sim::{DrawPedCrowdInput, DrawPedestrianInput, PedCrowdLocation, PedestrianID};
use widgetry::{Color, Drawable, GeomBatch, GfxCtx, Line, Prerender, Text};
@ -205,7 +205,7 @@ impl DrawPedCrowd {
let pl_shifted = match input.location {
PedCrowdLocation::Sidewalk(on, contraflow) => {
let pl_slice = on.exact_slice(input.low, input.high, map);
if contraflow {
if contraflow == (map.get_config().driving_side == DrivingSide::Right) {
pl_slice.shift_left(SIDEWALK_THICKNESS / 4.0)
} else {
pl_slice.shift_right(SIDEWALK_THICKNESS / 4.0)

16
sim/src/mechanics/walking.rs
View File

@ -8,7 +8,8 @@ use crate::{
use abstutil::{deserialize_multimap, serialize_multimap, MultiMap};
use geom::{Distance, Duration, Line, PolyLine, Speed, Time};
use map_model::{
BuildingID, BusRouteID, Map, ParkingLotID, Path, PathStep, Traversable, SIDEWALK_THICKNESS,
BuildingID, BusRouteID, DrivingSide, Map, ParkingLotID, Path, PathStep, Traversable,
SIDEWALK_THICKNESS,
};
use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet};
@ -555,6 +556,11 @@ impl Pedestrian {
fn get_draw_ped(&self, now: Time, map: &Map) -> DrawPedestrianInput {
let on = self.path.current_step().as_traversable();
let err = format!("at {}, {}'s position is broken", now, self.id);
let angle_offset = if map.get_config().driving_side == DrivingSide::Right {
90.0
} else {
270.0
};
let (pos, facing) = match self.state {
PedState::Crossing(ref dist_int, ref time_int) => {
let percent = if now > time_int.end {
@ -569,7 +575,7 @@ impl Pedestrian {
orig_angle.opposite()
};
(
pos.project_away(SIDEWALK_THICKNESS / 4.0, facing.rotate_degs(90.0)),
pos.project_away(SIDEWALK_THICKNESS / 4.0, facing.rotate_degs(angle_offset)),
facing,
)
}
@ -581,7 +587,7 @@ impl Pedestrian {
orig_angle
};
(
pos.project_away(SIDEWALK_THICKNESS / 4.0, facing.rotate_degs(90.0)),
pos.project_away(SIDEWALK_THICKNESS / 4.0, facing.rotate_degs(angle_offset)),
facing,
)
}
@ -635,8 +641,8 @@ impl Pedestrian {
let (pt, angle) = self.goal.sidewalk_pos.pt_and_angle(map);
// Stand on the far side of the sidewalk (by the bus stop), facing the road
(
pt.project_away(SIDEWALK_THICKNESS / 4.0, angle.rotate_degs(90.0)),
angle.rotate_degs(-90.0),
pt.project_away(SIDEWALK_THICKNESS / 4.0, angle.rotate_degs(angle_offset)),
angle.rotate_degs(-angle_offset),
)
}
};