Commit Graph

754 Commits

Author SHA1 Message Date
Dustin Carlino
f141329e85 moving some types in the sim layer around, now that the dust has settled 2018-08-23 13:56:49 -07:00
Dustin Carlino
2a12c338cf fixing up the parking test... had to deal with horizontal/vertical lines
for the building front path stuff
2018-08-23 10:37:17 -07:00
Dustin Carlino
7745678794 make the spawner deal with trips and transitions... big revamp for it 2018-08-23 10:11:56 -07:00
Dustin Carlino
0a944f9864 making peds be able to start/end at a parking spot as well. nothing
tells them to start/end at parking yet, though
2018-08-23 07:58:18 -07:00
Dustin Carlino
fbf6010715 make peds walk to bldgs when done with path 2018-08-22 14:19:46 -07:00
Dustin Carlino
7b28b8c988 make peds actually walk from bldg to sidewalk when starting 2018-08-22 14:03:08 -07:00
Dustin Carlino
3fba70a9a9 make pedestrians start aligned with building paths. almost ready to make
them travel along the front path
2018-08-22 13:43:11 -07:00
Dustin Carlino
0e2ae49596 debug a car in a different color 2018-08-22 10:13:32 -07:00
Dustin Carlino
19727cdcaf adjusting intersection policy to not deadlock? 2018-08-22 09:30:33 -07:00
Dustin Carlino
9b4caacea7 quick fix for signal overrun 2018-08-22 09:02:30 -07:00
Dustin Carlino
ef307e817f debugging for an intersection policy problem. traffic signal allows
overrun!
2018-08-21 19:02:24 -07:00
Dustin Carlino
9f1ad3755d present sim time in a nicer format 2018-08-21 16:19:54 -07:00
Dustin Carlino
b87af4b303 digging into stuck kinematics. seemingly unblocks completion test! 2018-08-20 15:34:55 -07:00
Dustin Carlino
ebb83e6592 woops, driving capacity not based on all long vehicles 2018-08-20 13:31:24 -07:00
Dustin Carlino
d84a9b06cc make following distance understand different car lengths 2018-08-20 13:05:36 -07:00
Dustin Carlino
9fdac1cfe3 removing the defunct models module 2018-08-20 12:53:15 -07:00
Dustin Carlino
1eecc48dbe removing parametric driving model for now. too much work to keep it updated as aorta driving model improves, and no benefit anticipated. 2018-08-20 12:39:03 -07:00
Dustin Carlino
7f29e5d285 making car length vary, and adjusting parking model in response 2018-08-20 12:31:39 -07:00
Dustin Carlino
917c3c3ed5 WIP storing per-car properties like accel somewhere 2018-08-20 11:27:11 -07:00
Dustin Carlino
e2ee2ecc84 drawing cars a bit more nicely 2018-08-19 19:01:31 -07:00
Dustin Carlino
bf52822e37 wrote a few tests of parking 2018-08-19 18:07:28 -07:00
Dustin Carlino
3376633ed9 avoid dupe commands to start parked cars 2018-08-17 22:37:57 -07:00
Dustin Carlino
cef21f2545 dont start a parked car if it'll cause a crash. keep trying till it
works.
2018-08-17 14:26:42 -07:00
Dustin Carlino
dd206474cc kind of handle being stuck at a deadend 2018-08-16 18:43:38 -07:00
Dustin Carlino
0b57852a09 refactor command; enum doesnt make sense 2018-08-16 18:32:46 -07:00
Dustin Carlino
3e8aa2c43f start parked cars from spawner as well 2018-08-16 18:26:05 -07:00
Dustin Carlino
29ad509401 moving pedestrian spawning 2018-08-16 17:46:51 -07:00
Dustin Carlino
af8a583f77 moving spawning of parked cars to a dedicated place 2018-08-16 15:10:26 -07:00
Dustin Carlino
6054154aaf roaming around (very naively) for parking 2018-08-16 13:18:48 -07:00
Dustin Carlino
0edd4c6eff oops, bug where parking spots were too close to the start 2018-08-16 12:50:46 -07:00
Dustin Carlino
e7dab9f65e undo an epsilon fix that broke stuff. all tests pass right now! 2018-08-15 16:28:43 -07:00
Dustin Carlino
d8e26eb703 woops, lookahead distance needs to stay back from cars. how did this not break earlier? 2018-08-15 16:13:47 -07:00
Dustin Carlino
f45bc525d5 fix a few epsilon issues that made restoring from a savestate break 2018-08-15 15:37:07 -07:00
Dustin Carlino
6693147a99 WIP making driving cars park at a specific spot 2018-08-15 15:29:49 -07:00
Dustin Carlino
511aab4483 representing departing vehicles 2018-08-15 11:53:04 -07:00
Dustin Carlino
d3611c6084 easier queries for lane type 2018-08-14 21:25:19 -07:00
Dustin Carlino
f6a302efb9 start parked car at the appropriate distance 2018-08-14 21:17:20 -07:00
Dustin Carlino
1720e51828 WIP start a specific parked car, not the last one in the lane. broken,
because multiple cars jump to the beginning of the driving lane. need to
make them start in the right position (and then go there slowly)
2018-08-14 21:13:05 -07:00
Dustin Carlino
432c9644fc slightly different speed limits 2018-08-09 13:14:30 -07:00
Dustin Carlino
6d70605355 unit test that a sim finishes eventually 2018-08-09 12:53:12 -07:00
Dustin Carlino
44239588c8 debugging why a car doesnt see an agent to not hit... oh, wasn't
factoring in FOLLOW_DIST
2018-08-09 12:23:26 -07:00
Dustin Carlino
850df3de4e fix a bug with stop signs that probably didnt even happen 2018-08-09 12:04:55 -07:00
Dustin Carlino
6c6dbee529 WIP ignore constraints on the current lane if our lookahead dist doesnt even hit them 2018-08-09 12:00:37 -07:00
Dustin Carlino
0fe6507a5c oops, never actually capped acceleration of cars... 2018-08-09 11:28:10 -07:00
Dustin Carlino
3e9a2db0bd flag to tell headless to savestate 2018-08-09 11:16:51 -07:00
Dustin Carlino
40cb2bf6f4 making draw_polygon only accept a geom Polygon. guess ezgui depending on geom is fine. 2018-08-09 10:57:19 -07:00
Dustin Carlino
0caa8969dd fix contains_pt signature 2018-08-09 10:49:26 -07:00
Dustin Carlino
bf2bd09a54 WIP converting lanes and draw car to new polygon 2018-08-09 10:36:29 -07:00
Dustin Carlino
c77415164e count the peds moving/waiting too 2018-08-08 12:47:57 -07:00
Dustin Carlino
ccbf5939d8 waiting_for for new driving model 2018-08-08 12:43:47 -07:00
Dustin Carlino
8d82148342 fix bug with somebody holding a lock on a turn 2018-08-08 12:26:46 -07:00
Dustin Carlino
449085f02f stop sign should only admit leader vehicles 2018-08-08 11:50:05 -07:00
Dustin Carlino
139c03ce09 let everyone through traffic signal; figuring out crossing time is hard 2018-08-08 11:01:55 -07:00
Dustin Carlino
a3caf09cda count agents as stopped if their speed is super tiny 2018-08-08 10:53:10 -07:00
Dustin Carlino
7e6a48ebc6 vanish at the end of the last lane, not the beginning 2018-08-07 14:16:28 -07:00
Dustin Carlino
bdb21f5eef wait, can fit more cars on lanes, actually 2018-08-07 14:10:19 -07:00
Dustin Carlino
d0744083fc stop right BEFORE intersections 2018-08-07 14:06:31 -07:00
Dustin Carlino
0a0740c1bf oops, nobody was actually stopping for stop signs 2018-08-07 13:11:25 -07:00
Dustin Carlino
4c0a8f588a still debugging various breakages. drawing lane IDs 2018-08-07 12:23:00 -07:00
Dustin Carlino
62f2d9c40e debugging sim invariant breakages better 2018-08-07 11:35:40 -07:00
Dustin Carlino
73f23549b6 WIP debugging a car entering a lane too quickly 2018-08-07 11:13:13 -07:00
Dustin Carlino
4e5d8eccb0 handling end-of-path for lookahead 2018-08-07 10:41:44 -07:00
Dustin Carlino
9dce169a88 working on arbitrary lookahead and not hitting lead vehicles 2018-08-06 16:46:08 -07:00
Dustin Carlino
d71c2cf70d filling out more kinematics stuff, resuming aorta driving model.
stopping for intersections now seems OK...
2018-08-06 14:56:14 -07:00
Dustin Carlino
c7bae2b6ef type aliases for units 2018-08-04 17:04:48 -07:00
Dustin Carlino
5b41f4a9b5 few things towards new driving model, without lookahead 2018-08-04 15:07:11 -07:00
Dustin Carlino
474215d478 moving agent stepping code to be owned by each agent 2018-08-04 14:10:27 -07:00
Dustin Carlino
676e076ae1 repeating determinism tests for both driving models 2018-08-04 13:25:09 -07:00
Dustin Carlino
7611be90ab trying enums with delegation... 2018-08-04 12:26:58 -07:00
Dustin Carlino
bb934ff509 WIP making both driving models toggleable... 2018-08-04 09:54:13 -07:00
Dustin Carlino
c2306ef47a forking aorta driving model from parametric one... 2018-08-04 08:03:55 -07:00
Dustin Carlino
87d040f061 first making driving stuff private, before making a second driving model 2018-08-03 14:32:08 -07:00
Dustin Carlino
67c81df83f draw stopping buffer for cars 2018-08-02 11:15:47 -07:00
Dustin Carlino
5ad6f53607 use new dimensioned version, letting us serialize maps and clean up
hacks elsewhere
2018-08-01 14:05:38 -07:00
Dustin Carlino
73f4c95bd0 test to make sure savestating stays deterministic 2018-08-01 13:37:26 -07:00
Dustin Carlino
890f6541af turns between sidewalks were getting conflated after the TurnID change; adding parent intersection fixes it. should fix ped warping problem. 2018-08-01 13:31:14 -07:00
Dustin Carlino
ec38ccc11e refactoring common code in intersections 2018-08-01 11:38:35 -07:00
Dustin Carlino
aaf2933768 debug cars and peds 2018-08-01 09:35:02 -07:00
Dustin Carlino
3941621127 draw ped waiting for a turn 2018-07-31 20:31:41 -07:00
Dustin Carlino
473b5bf22e handle missing objects in warp plugin 2018-07-31 13:49:04 -07:00
Dustin Carlino
296e16aea9 warp to agents 2018-07-31 13:25:03 -07:00
Dustin Carlino
c7bf59dde0 refactor serde multimap helper 2018-07-30 17:39:15 -07:00
Dustin Carlino
c874d432f9 revamping walking sim to match driving. may have some warping bugs... 2018-07-30 17:28:14 -07:00
Dustin Carlino
cc8c6453ac make walking sim state match driving, with a kind of SimQueue equivalent 2018-07-30 17:03:33 -07:00
Dustin Carlino
af706f72e1 making the new protocol for agent/intersection interaction. it works!
\o/
2018-07-30 16:10:39 -07:00
Dustin Carlino
fe62537ee3 moving part of car behavior to an immutable reaction to a worldview 2018-07-30 15:11:15 -07:00
Dustin Carlino
6cc8489dfa reduce some visibility 2018-07-30 15:01:41 -07:00
Dustin Carlino
93815c91f0 argh, broke serialization again. refactoring a nice btreemap solution 2018-07-30 14:50:53 -07:00
Dustin Carlino
7205e6d926 lifting intersection sim state out of driving 2018-07-30 14:39:15 -07:00
Dustin Carlino
d4f2966a5d changing API of intersection policies to allow for peds 2018-07-30 14:22:36 -07:00
Dustin Carlino
19133adad8 fixed the broken savestating; custom multimap serialization was just
plain wrong
2018-07-30 13:30:30 -07:00
Dustin Carlino
c9b890e44c hash to btree, for easier comparison in serializtion 2018-07-29 16:58:41 -07:00
Dustin Carlino
af6b7c08ac fixing sim serialization after TurnID became a tuple struct 2018-07-29 16:34:47 -07:00
Dustin Carlino
cce85994f6 dont need a sort anymore... actually, can't run the determinism test
right now
2018-07-29 15:51:06 -07:00
Dustin Carlino
298babc85d parallelizing parked->driving car pathfinding too 2018-07-28 11:02:28 -07:00
Dustin Carlino
f732335ed8 parallelizing pathfinding for pedestrians 2018-07-27 15:51:44 -07:00
Dustin Carlino
d22d955dbb deleting and adding turns when edited 2018-07-26 13:06:37 -07:00
Dustin Carlino
904aa4449e editing lane types, vastly simplified, no turns yet 2018-07-26 12:04:02 -07:00
Dustin Carlino
de54b917bc changing turns to have IDs thatll be stable across edits 2018-07-25 19:01:47 -07:00
Dustin Carlino
3ed1bba5c9 fixing encapsulation and delegation of stuff in sim layer 2018-07-25 18:36:04 -07:00
Dustin Carlino
3e72f39121 planning how to do live road edits 2018-07-25 18:19:39 -07:00
Dustin Carlino
9200a5ef3d use pretty assertions 2018-07-24 16:23:25 -07:00
Dustin Carlino
c321c07bd7 make map use road edits when loading from scratch 2018-07-24 16:06:25 -07:00
Dustin Carlino
30b992e7f0 wait, make road remember lane types too 2018-07-24 11:40:58 -07:00
Dustin Carlino
c04572e4c7 dont store siblings anymore, simplify LaneSpec 2018-07-24 10:07:31 -07:00
Dustin Carlino
4207b2cacf rename existing roads to lanes 2018-07-23 20:24:53 -07:00
Dustin Carlino
52d5c5b69b bike lane turns 2018-07-23 14:03:13 -07:00
Dustin Carlino
3017728515 introducing bike lanes! no turns yet 2018-07-23 10:56:45 -07:00
Dustin Carlino
22b1e70707 info on parked cars and peds in OSD 2018-07-14 13:53:32 -05:00
Dustin Carlino
f54d581016 fixing pedestrian mouseover 2018-07-14 13:38:15 -05:00
Dustin Carlino
9ce7309c3e making peds move, but blindly plow through intersections 2018-07-14 13:33:08 -05:00
Dustin Carlino
82460f62f5 making peds pathfind to a goal 2018-07-14 10:32:21 -07:00
Dustin Carlino
e5de791fa7 starting to model pedestrians. spawn and draw them. 2018-07-11 15:06:31 -07:00
Dustin Carlino
6f00507740 realizing an issue with old editor state 2018-07-11 13:43:47 -07:00
Dustin Carlino
5ffa4ba7c7 centering parked cars in their spots 2018-07-09 16:08:23 -07:00
Dustin Carlino
282f20e438 drawing parked cars 2018-07-09 14:17:33 -07:00
Dustin Carlino
db54420ede fixing all tests 2018-07-09 13:52:08 -07:00
Dustin Carlino
8b58665dbd handling new build errors after 1.27... 2018-07-09 13:44:52 -07:00
Dustin Carlino
2ebc13140b round of rustfmt after 1.27 upgrade 2018-07-09 12:30:59 -07:00
Dustin Carlino
d3bcbe1da2 lots of the logic to start a parked car 2018-07-09 11:59:40 -07:00
Dustin Carlino
dbc6cd1e67 the first time spawning is requested, create a bunch of parked cars 2018-07-09 11:11:40 -07:00
Dustin Carlino
bf68be8870 moving the sim state that's driving-specific 2018-07-09 11:07:54 -07:00
Dustin Carlino
bde37d666b split out some of the driving-only code 2018-07-09 10:36:17 -07:00
Dustin Carlino
75144cf2ab rename a file to deemphasize strawness 2018-07-09 10:22:34 -07:00
Dustin Carlino
ddb30734c6 refactoring DrawCar 2018-07-09 10:17:20 -07:00
Dustin Carlino
d2c67d8b91 seeding with a bunch of parked cars 2018-07-09 09:41:05 -07:00
Dustin Carlino
8b908d2744 calculating the number of parking spots 2018-07-09 09:16:12 -07:00
Dustin Carlino
c033f51da2 make cars pathfind to their destination 2018-07-08 15:40:39 -07:00
Dustin Carlino
c6ebab1e9c move some sim code 2018-07-08 14:00:03 -07:00
Dustin Carlino
e2aabeb0e9 refactoring drawing primitives into GfxCtx 2018-07-06 11:04:18 -07:00
Dustin Carlino
a082fbb511 moving stuff to geom crate 2018-06-28 20:35:00 -07:00
Dustin Carlino
34e7f11cda get rid of vecmath 2018-06-28 19:46:21 -07:00
Dustin Carlino
4bdf70365e making my own angle class 2018-06-28 15:07:48 -07:00
Dustin Carlino
bc92c3ca8d replacing the pb with serde stuff 2018-06-25 18:56:57 -07:00
Dustin Carlino
94e8f7a4bf switch to new polygons for cars. seems to work. 2018-06-25 14:01:55 -07:00
Dustin Carlino
3edbf30719 woops, forgot to fix a sim test ages ago when refactoring json writing/reading 2018-06-25 09:06:40 -07:00
Dustin Carlino
ba310cbd45 removing geom crate, using just map model 2018-06-25 09:00:43 -07:00
Dustin Carlino
0d46b413bb move gfxctx 2018-06-22 14:42:13 -07:00
Dustin Carlino
5ce158cb90 refactoring json saving/loading 2018-06-22 13:36:12 -07:00
Dustin Carlino
6b8a5a0103 moving more colors to scheme 2018-06-21 11:18:17 -07:00
Dustin Carlino
0d43b8da88 dont put cars on wrong lane types 2018-06-19 12:24:29 -07:00
Dustin Carlino
116f3c35e9 upgrade to rand 0.5 2018-06-18 10:32:54 -07:00
Dustin Carlino
923883883b updating README and trimming license declarations 2018-06-03 17:56:53 -07:00
Dustin Carlino
f2b7344940 using new rust 1.26 match stuff, and fmt 2018-05-10 16:19:26 -07:00
Dustin Carlino
9b4a8b22c6 tweak the behavior of starting a turn. still jumpy and weird, am thinking this is a fundamental problem with straw_model 2018-04-17 17:26:41 -07:00
Dustin Carlino
b73e9ebfb6 a second determinism test, to make sure savestating works reasonably 2018-04-16 17:30:55 -07:00
Dustin Carlino
9e1c5ffc52 fix the nondeterminism from using hashmap. doh. 2018-04-16 17:21:25 -07:00
Dustin Carlino
93245a79ca start a test to see if simulations are deterministic. they... aren't :( 2018-04-15 21:08:00 -07:00
Dustin Carlino
9f3fd72417 changing f64 time to u32 ticks. this gets rid of the custom serde stuff
and lets us compare full sim states
2018-04-14 15:29:18 -07:00
Dustin Carlino
401123d11a make rng part of sim 2018-04-13 22:44:24 -07:00
Dustin Carlino
f8436f9017 add UI hooks to save/load sim state 2018-04-13 21:52:30 -07:00
Dustin Carlino
e292d06cfb change intersection policy from trait to enum, so serde works 2018-04-13 21:34:00 -07:00
Dustin Carlino
ff2f284d1f serializing (most of) the sim state 2018-04-13 19:08:18 -07:00
Dustin Carlino
065c2ce9ba Importing everything since the initial import 2018-04-10 17:51:37 -07:00