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

dont spawn under vehicle length... but hmm, seeing another problem. need

Browse Source 
easier debugging first.
This commit is contained in:
Dustin Carlino 2019-02-04 18:52:11 -08:00
parent 91ae32cd4a
commit acc298a6ab
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/src/driving.rs
View File

@ -734,6 +734,13 @@ impl DrivingSimState {
let start_on = Traversable::Lane(start_lane);
let start_dist = params.start.dist_along();
if start_dist < params.vehicle.length {
panic!(
"Can't start car at {} along {}; the vehicle is {}. Bad position passed in.",
start_dist, start_lane, params.vehicle.length
);
}
// The caller should have passed in a Position for the driving lane. But sanity check!
{
let start_length = map.get_l(start_lane).length();

2
sim/src/kinematics.rs
View File

@ -8,7 +8,7 @@ use serde_derive::{Deserialize, Serialize};
// http://pccsc.net/bicycle-parking-info/ says 68 inches, which is 1.73m
const MIN_BIKE_LENGTH: Distance = Distance::const_meters(1.7);
const MAX_BIKE_LENGTH: Distance = Distance::const_meters(2.0);
pub const MAX_BIKE_LENGTH: Distance = Distance::const_meters(2.0);
// These two must be < PARKING_SPOT_LENGTH
const MIN_CAR_LENGTH: Distance = Distance::const_meters(4.5);
const MAX_CAR_LENGTH: Distance = Distance::const_meters(6.5);

21
sim/src/spawn.rs
View File

@ -1,6 +1,6 @@
use crate::driving::{CreateCar, DrivingGoal, DrivingSimState};
use crate::intersections::IntersectionSimState;
use crate::kinematics::Vehicle;
use crate::kinematics::{Vehicle, MAX_BIKE_LENGTH};
use crate::parking::ParkingSimState;
use crate::router::Router;
use crate::scheduler;
@ -26,7 +26,7 @@ enum Command {
Walk(Tick, TripID, PedestrianID, SidewalkSpot, SidewalkSpot),
Drive(Tick, TripID, ParkedCar, DrivingGoal),
// As in, a car appears suddenly
DriveSpontanouesly {
DriveSpontaneously {
at: Tick,
trip: TripID,
car: CarID,
@ -48,7 +48,7 @@ impl Command {
match self {
Command::Walk(at, _, _, _, _) => *at,
Command::Drive(at, _, _, _) => *at,
Command::DriveSpontanouesly { at, .. } => *at,
Command::DriveSpontaneously { at, .. } => *at,
Command::Bike { at, .. } => *at,
}
}
@ -105,7 +105,7 @@ impl Command {
can_use_bike_lanes: true,
}
}
Command::DriveSpontanouesly {
Command::DriveSpontaneously {
start,
goal,
vehicle,
@ -207,7 +207,7 @@ impl Spawner {
},
));
}
Command::DriveSpontanouesly {
Command::DriveSpontaneously {
trip,
car,
ref vehicle,
@ -471,7 +471,7 @@ impl Spawner {
if from.dist_along() == Distance::ZERO {
from = Position::new(from.lane(), vehicle.length);
}
self.enqueue_command(Command::DriveSpontanouesly {
self.enqueue_command(Command::DriveSpontaneously {
at,
trip: trips.new_trip(at, Some(ped_id), legs),
car: car_id,
@ -540,7 +540,12 @@ impl Spawner {
let first_spot = {
let b = map.get_b(start_bldg);
SidewalkSpot::bike_rack(b.front_path.sidewalk, map)
let pos = b.front_path.sidewalk;
if pos.dist_along() < MAX_BIKE_LENGTH {
SidewalkSpot::bike_rack(Position::new(pos.lane(), MAX_BIKE_LENGTH), map)
} else {
SidewalkSpot::bike_rack(pos, map)
}
};
let mut legs = vec![
@ -610,7 +615,7 @@ impl Spawner {
legs.push(TripLeg::Walk(SidewalkSpot::building(b, map)));
}
assert!(map.get_l(first_lane).length() > vehicle.length);
self.enqueue_command(Command::DriveSpontanouesly {
self.enqueue_command(Command::DriveSpontaneously {
at,
trip: trips.new_trip(at, Some(ped_id), legs),
car: bike_id,