Commit Graph

654 Commits

Author SHA1 Message Date
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