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

show which bus a ped is waiting for

Browse Source
This commit is contained in:
Dustin Carlino 2019-10-19 16:00:55 -07:00
parent f1f951fc1c
commit 7020544073
4 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/src/common/info.rs
View File

@ -178,7 +178,7 @@ fn info_for(id: ID, ui: &UI, ctx: &EventCtx) -> Text {
// TODO jump to src/dst/current spot
}
ID::Pedestrian(id) => {
for line in sim.ped_tooltip(id) {
for line in sim.ped_tooltip(id, map) {
// TODO Wrap
txt.add(Line(line));
}

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

@ -6,7 +6,7 @@ use crate::{
};
use abstutil::{deserialize_multimap, serialize_multimap, MultiMap};
use geom::{Distance, Duration, Line, PolyLine, Speed};
use map_model::{BuildingID, Map, Path, PathStep, Traversable, LANE_THICKNESS};
use map_model::{BuildingID, BusRouteID, Map, Path, PathStep, Traversable, LANE_THICKNESS};
use serde_derive::{Deserialize, Serialize};
use std::collections::BTreeMap;
@ -136,13 +136,15 @@ impl WalkingSimState {
scheduler.push(ped.state.get_end_time(), Command::UpdatePed(ped.id));
}
SidewalkPOI::BusStop(stop) => {
if trips.ped_reached_bus_stop(ped.id, stop, map, transit) {
if let Some(route) =
trips.ped_reached_bus_stop(ped.id, stop, map, transit)
{
ped.state = PedState::WaitingForBus(route);
ped.blocked_since = Some(now);
} else {
self.peds_per_traversable
.remove(ped.path.current_step().as_traversable(), ped.id);
self.peds.remove(&id);
} else {
ped.state = PedState::WaitingForBus;
ped.blocked_since = Some(now);
}
}
SidewalkPOI::Border(i) => {
@ -220,14 +222,14 @@ impl WalkingSimState {
ped.state = ped.crossing_state(spot.sidewalk_pos.dist_along(), now, map);
scheduler.push(ped.state.get_end_time(), Command::UpdatePed(ped.id));
}
PedState::WaitingForBus => unreachable!(),
PedState::WaitingForBus(_) => unreachable!(),
}
}
pub fn ped_boarded_bus(&mut self, id: PedestrianID) {
let ped = self.peds.remove(&id).unwrap();
match ped.state {
PedState::WaitingForBus => {
PedState::WaitingForBus(_) => {
self.peds_per_traversable
.remove(ped.path.current_step().as_traversable(), id);
}
@ -243,9 +245,9 @@ impl WalkingSimState {
}
}
pub fn ped_tooltip(&self, id: PedestrianID, now: Duration) -> Vec<String> {
pub fn ped_tooltip(&self, id: PedestrianID, now: Duration, map: &Map) -> Vec<String> {
let p = &self.peds[&id];
vec![
let mut lines = vec![
format!("{} on {:?}", p.id, p.path.current_step()),
format!("{} lanes left in path", p.path.num_lanes()),
format!(
@ -258,8 +260,11 @@ impl WalkingSimState {
p.blocked_since.map(|t| now - t).unwrap_or(Duration::ZERO)
),
format!("Trip time so far: {}", now - p.started_at),
format!("{:?}", p.state),
]
];
if let PedState::WaitingForBus(r) = p.state {
lines.push(format!("Waiting for bus {}", map.get_br(r).name));
}
lines
}
pub fn trace_route(
@ -346,7 +351,7 @@ impl WalkingSimState {
}
PedState::StartingToBike(_, _, _)
| PedState::FinishingBiking(_, _, _)
| PedState::WaitingForBus => {
| PedState::WaitingForBus(_) => {
// The backwards half of the sidewalk is closer to the road.
backwards.push((*id, dist));
}
@ -435,7 +440,7 @@ impl Pedestrian {
PedState::EnteringBuilding(b, _) => map.get_b(b).front_path.sidewalk.dist_along(),
PedState::StartingToBike(ref spot, _, _) => spot.sidewalk_pos.dist_along(),
PedState::FinishingBiking(ref spot, _, _) => spot.sidewalk_pos.dist_along(),
PedState::WaitingForBus => self.goal.sidewalk_pos.dist_along(),
PedState::WaitingForBus(_) => self.goal.sidewalk_pos.dist_along(),
}
}
@ -504,7 +509,7 @@ impl Pedestrian {
PedState::FinishingBiking(_, ref line, ref time_int) => {
(line.percent_along(time_int.percent(now)), line.angle())
}
PedState::WaitingForBus => {
PedState::WaitingForBus(_) => {
let (pt, angle) = self.goal.sidewalk_pos.pt_and_angle(map);
// Face the road
(pt, angle.rotate_degs(90.0))
@ -589,7 +594,7 @@ enum PedState {
EnteringBuilding(BuildingID, TimeInterval),
StartingToBike(SidewalkSpot, Line, TimeInterval),
FinishingBiking(SidewalkSpot, Line, TimeInterval),
WaitingForBus,
WaitingForBus(BusRouteID),
}
impl PedState {
@ -601,7 +606,7 @@ impl PedState {
PedState::EnteringBuilding(_, ref time_int) => time_int.end,
PedState::StartingToBike(_, _, ref time_int) => time_int.end,
PedState::FinishingBiking(_, _, ref time_int) => time_int.end,
PedState::WaitingForBus => unreachable!(),
PedState::WaitingForBus(_) => unreachable!(),
}
}
}

4
sim/src/sim.rs
View File

@ -747,8 +747,8 @@ impl Sim {
self.driving.debug_lane(id);
}
pub fn ped_tooltip(&self, p: PedestrianID) -> Vec<String> {
let mut lines = self.walking.ped_tooltip(p, self.time);
pub fn ped_tooltip(&self, p: PedestrianID, map: &Map) -> Vec<String> {
let mut lines = self.walking.ped_tooltip(p, self.time, map);
lines.extend(self.trips.tooltip_lines(AgentID::Pedestrian(p)));
lines
}

8
sim/src/trips.rs
View File

@ -304,14 +304,14 @@ impl TripManager {
self.unfinished_trips -= 1;
}
// If true, the pedestrian boarded a bus immediately.
// If no route is returned, the pedestrian boarded a bus immediately.
pub fn ped_reached_bus_stop(
&mut self,
ped: PedestrianID,
stop: BusStopID,
map: &Map,
transit: &mut TransitSimState,
) -> bool {
) -> Option<BusRouteID> {
self.events.push(Event::PedReachedBusStop(ped, stop));
let trip = &mut self.trips[self.active_trip_mode[&AgentID::Pedestrian(ped)].0];
match trip.legs[0] {
@ -325,9 +325,9 @@ impl TripManager {
TripLeg::RideBus(_, route, stop2) => {
if transit.ped_waiting_for_bus(ped, stop, route, stop2) {
trip.legs.pop_front();
true
None
} else {
false
Some(route)
}
}
_ => unreachable!(),