Commit Graph

1331 Commits

Author SHA1 Message Date
Dustin Carlino
72ac85f540 stability round: loading ballard broke, spawning PSRC trips in most maps hit little bugs 2019-05-27 10:45:53 -07:00
Dustin Carlino
0e298c756f make it a bit easier to jump to the time when trips are actually
starting. and prepping popdat for release
2019-05-26 21:31:44 -07:00
Dustin Carlino
40efcc7b05 generalize a parallelize method for timers, use for all trip viz 2019-05-25 19:35:35 -07:00
Dustin Carlino
bc69a6b4d4 spawn as many trips from PSRC as possible 2019-05-25 18:34:50 -07:00
Dustin Carlino
ef60359cc8 spawn trips from data. not working yet; hitting a problem with
sidewalk->bike lane on oneways
2019-05-25 18:22:07 -07:00
Dustin Carlino
01a4abb64a work around path traces that're breaking PolyLine 2019-05-25 13:33:41 -07:00
Dustin Carlino
1cdbe0ea81 refactor parallelized pathfinding and use it in trip viz too 2019-05-24 12:50:01 -07:00
Dustin Carlino
f674527ef2 interpolate along route for trip viz 2019-05-24 12:28:57 -07:00
Dustin Carlino
416d0b0d7d building PathRequest for trip visualization, and slightly refactoring bldg->Position for it. also forced to extend the equiv_pos fix for bus stops to all equiv_pos queries. 2019-05-24 11:47:01 -07:00
Dustin Carlino
8d7ec9d533 start a tool to visualize all trips over time 2019-05-23 17:39:29 -07:00
Dustin Carlino
dad1c170ed squish down the popdat output by using enums for purpose 2019-05-23 16:15:42 -07:00
Dustin Carlino
42c021c8df glue timers to psrc input stuff 2019-05-23 16:04:46 -07:00
Dustin Carlino
a6ecda2d07 also scrape trip time and distance, for sanity checks 2019-05-23 15:47:45 -07:00
Dustin Carlino
73b751d46c also scrape trip purpose 2019-05-23 15:29:32 -07:00
Dustin Carlino
e597c8e0bc match src/dst to a building 2019-05-23 15:02:04 -07:00
Dustin Carlino
3a363c89b4 starting a simple explorer for the trips data 2019-05-23 14:49:35 -07:00
Dustin Carlino
f01173ec50 export some trips in PopDat, start reading them in and filtering 2019-05-23 14:34:47 -07:00
Dustin Carlino
788cd237a8 upload traffic signal Drawable once per state change 2019-05-23 11:31:28 -07:00
Dustin Carlino
d2dc7e52eb draw the traffic signal diagram on the left. stop caring where the
bottom left of a modalmenu is
2019-05-21 14:13:48 -07:00
Dustin Carlino
7ba6cd32b4 control to reset traffic signal to original 2019-05-21 13:45:48 -07:00
Dustin Carlino
219a7b3236 refactoring list of signal policies 2019-05-21 13:26:39 -07:00
Dustin Carlino
6b5945aade put traffic signal box in the true middle of the intersection; it was in a bad spot for one-ways 2019-05-21 13:13:24 -07:00
Dustin Carlino
28eb670bf9 also display estimated total number of cars in the tract 2019-05-20 15:14:22 -07:00
Dustin Carlino
0f88e67a01 error bars too 2019-05-20 15:06:04 -07:00
Dustin Carlino
3a625f9a32 print percentages and number of samples in bar chart 2019-05-20 14:57:17 -07:00
Dustin Carlino
253127fd19 use colorbrewer for nice related colors 2019-05-20 12:26:33 -07:00
Dustin Carlino
09493f9b7b remove old color shifting 2019-05-20 11:58:35 -07:00
Dustin Carlino
381883b357 display the stats with simple bar charts 2019-05-20 11:56:00 -07:00
Dustin Carlino
dd3d670cdd display table of data for a tract. group all the measurements to bundle
error
2019-05-20 10:47:26 -07:00
Dustin Carlino
6f2b907927 count the buildings and parking spots in each tract 2019-05-20 10:05:06 -07:00
Dustin Carlino
083b96f0e7 mouseover tracts 2019-05-20 09:47:27 -07:00
Dustin Carlino
8d2e3b0623 census tracts are the same between datasets, so group the data better 2019-05-20 09:33:20 -07:00
Dustin Carlino
dfdc6804e5 very barebones mode to explore the popdat 2019-05-20 09:12:57 -07:00
Dustin Carlino
21520c6afa also mouseover KML shapes in debug mode when unzoomed 2019-05-19 15:01:40 -07:00
Dustin Carlino
6734e57ab1 dont suppress traffic signal details when hovering on parking lane 2019-05-19 14:51:07 -07:00
Dustin Carlino
71e1fe6a58 inline crosswalks into stop sign and border drawing 2019-05-19 14:44:03 -07:00
Dustin Carlino
c728210b2d render selected turn icons better, just highlighting the circle 2019-05-19 13:28:43 -07:00
Dustin Carlino
e6a3b02689 make stop sign editor use stop signs on the side of the road for
controls
2019-05-19 12:45:12 -07:00
Dustin Carlino
7760d42d4a recompute DrawIntersection after editing stop signs 2019-05-19 12:11:25 -07:00
Dustin Carlino
c9f5b92496 much simpler idea for intersection geom -- just extend the last line of all incoming roads 2019-05-18 12:32:25 -07:00
Dustin Carlino
ebc8bafab1 using adjacent roads to glue together polylines 2019-05-17 16:28:05 -07:00
Dustin Carlino
4c1e9b41c1 experimentally try finding intersection polygon by naively intersecting thick road polygons. 2019-05-17 15:48:21 -07:00
Dustin Carlino
de51b1c154 simplify some render/ code by using GeomBatch 2019-05-17 13:14:58 -07:00
Dustin Carlino
222ddf6a96 use Distance, not f64, for some params in geom/ layer, simplifying other code 2019-05-17 12:42:36 -07:00
Dustin Carlino
c29039c499 policies for four-ways all one-ways 2019-05-17 12:00:29 -07:00
Dustin Carlino
dec8d65776 better traffic light policy for degenerate intersections 2019-05-17 10:31:51 -07:00
Dustin Carlino
808d4b2718 batch turn icon drawing in editors 2019-05-16 19:25:33 -07:00
Dustin Carlino
ec015624c0 workaround for awful intersection geometry causing get_outline's that
explode out to some corner and get constantly rendered
2019-05-16 18:49:47 -07:00
Dustin Carlino
db04553626 batch traffic signal drawing 2019-05-16 17:55:26 -07:00
Dustin Carlino
88856c50ce nice OSD name for intersections 2019-05-16 14:54:18 -07:00
Dustin Carlino
b6cdd0f99c fix crosswalk coupling in intersection editors, not sure when this broke 2019-05-16 14:46:00 -07:00
Dustin Carlino
113aa99b47 show signal yield turns as outlines, not dashes 2019-05-15 15:00:38 -07:00
Dustin Carlino
bb2ce2c2f5 only mouseover areas in unzoomed debug mode 2019-05-15 14:28:35 -07:00
Dustin Carlino
d516985437 use different colors for unzoomed roads to show road type 2019-05-15 14:23:39 -07:00
Dustin Carlino
bb4d593c46 turn arrows for bikes too 2019-05-15 13:16:52 -07:00
Dustin Carlino
d3f866a82a draw exact arrows for car blinkers 2019-05-15 12:31:08 -07:00
Dustin Carlino
a08f90def8 always draw car blinkers, maybe in an inactive color 2019-05-15 12:21:51 -07:00
Dustin Carlino
f7c59e710d get rid of blinking turn signals. dont be in Animation mode constantly. doesnt look that great and really burns CPU. 2019-05-15 11:56:12 -07:00
Dustin Carlino
faea2e94e3 improve LCing turns with degenerate intersections, turn markings 2019-05-14 10:28:22 -07:00
Dustin Carlino
73aab37fc7 explicitly represent StraightWithLaneChanging turns. fix up preset
stop sign and traffic signal policies
2019-05-13 16:58:02 -07:00
Dustin Carlino
9252dbd14b traffic signal boxes have 3 circles, more recognizable 2019-05-13 14:46:50 -07:00
Dustin Carlino
3ab012906f draw stop signs to the right of the road... initial version with lots of
problems, but looks OK. removing stop lines on lanes.
2019-05-13 14:02:47 -07:00
Dustin Carlino
f4620c1951 add basic hatching support to fragment shader. use it to visualize map
edits when zoomed in
2019-05-12 17:59:12 -07:00
Dustin Carlino
ba71d2d5e6 dont be so confusing with CarAppearing in interactive commands -- dont retry if there's not room 2019-05-12 15:06:12 -07:00
Dustin Carlino
aa7bd11797 tweak edit mode's menu info 2019-05-11 16:53:30 -07:00
Dustin Carlino
4dcdbf0593 show time left for traffic signals 2019-05-11 16:45:24 -07:00
Dustin Carlino
06aa3e7cb3 woops, broke drawing agents in intersections in 3501c0ab4f 2019-05-11 16:14:45 -07:00
Dustin Carlino
9b848c894a better selection polygons for polyline-based things 2019-05-11 16:03:39 -07:00
Dustin Carlino
2454704b6b better selection polygons... at least for intersections and buildings 2019-05-11 15:12:12 -07:00
Dustin Carlino
5c9086a829 controls to naively flip stop signs on/off 2019-05-11 14:53:17 -07:00
Dustin Carlino
ca23950097 base RoadWithStopSign enabledness on turn priorities 2019-05-11 14:46:45 -07:00
Dustin Carlino
6b218fb5ab base stop sign lines on lanes on RoadWithStopSign 2019-05-11 14:38:55 -07:00
Dustin Carlino
c70c83f22b move the StopSignGroup abstraction to map_model. write down some rules for how stop signs _should_ work... 2019-05-11 14:31:46 -07:00
Dustin Carlino
a5505cca17 no reason for DrawTurn to implement Renderable. simplify its API. 2019-05-11 13:51:39 -07:00
Dustin Carlino
b7daea7fb4 make OSD work for intersection editors 2019-05-11 13:37:48 -07:00
Dustin Carlino
3501c0ab4f dont handle turn icons in UI by default; make the two editors explicitly do mouseover and draw them 2019-05-11 11:51:16 -07:00
Dustin Carlino
be9830acc7 make stop signs selectable... with lots of bugginess 2019-05-10 16:10:18 -07:00
Dustin Carlino
f63f694576 organizing stop sign drawing code a bit 2019-05-10 15:55:07 -07:00
Dustin Carlino
8bd4ab72d4 draw full stop sign octagon when editing a single intersection 2019-05-10 15:23:31 -07:00
Dustin Carlino
a53e9ee8cb only restore editor_state when --no_splash used. start screensaver on a random building, not potentially some dead space 2019-05-10 11:16:06 -07:00
Dustin Carlino
ba5de5ad34 different colors for extra shapes. also refactoring the lists of these rotating colors 2019-05-09 14:23:41 -07:00
Dustin Carlino
8b79c55d13 show extra shapes when zoomed out 2019-05-09 14:04:53 -07:00
Dustin Carlino
089b27fb83 notes on demand datasets, handling KMLs that define polygons 2019-05-09 13:25:08 -07:00
Dustin Carlino
994eb2dd73 fix bug with reset sim 2019-05-09 11:02:24 -07:00
Dustin Carlino
8e949d5fa9 make --num_agents work exactly when specified 2019-05-09 10:51:07 -07:00
Dustin Carlino
a4f6a773a9 fix up time limits for headless/tests. fix a few tests now that peds
walk slowly.
2019-05-08 20:05:52 -07:00
Dustin Carlino
fce5d0f6dc animate pedestrian feet smoothly regardless of sim speed 2019-05-08 18:34:41 -07:00
Dustin Carlino
60eea9b413 change sim API to step forward by a variable duration, not a fixed timestep. adjust UI callers accordingly. some bugs introduced, but solid start 2019-05-08 17:44:01 -07:00
Dustin Carlino
240efa5ad7 make warping be slightly snappier with impatient keypressing and a
minimum speed
2019-05-08 12:07:32 -07:00
Dustin Carlino
32b4c073a1 scroll through a particular route 2019-05-08 11:51:32 -07:00
Dustin Carlino
16c606c745 make sure to draw modal menus last; noticed route preview was covering it 2019-05-08 10:48:28 -07:00
Dustin Carlino
89b74b9137 random ped speeds. lots of plumbing needed to implement this. :\ 2019-05-07 10:54:58 -07:00
Dustin Carlino
939f2fefdd adding hands to the bikes 2019-05-06 18:33:01 -07:00
Dustin Carlino
6a66276606 every day the pedestrians are shuffling 2019-05-06 17:40:59 -07:00
Dustin Carlino
c034040b27 a start to drawing bikes with more personality 2019-05-06 13:20:57 -07:00
Dustin Carlino
b0ca4429ad make turn blinkers work even when sim is paused 2019-05-06 12:56:19 -07:00
Dustin Carlino
b060a3ecc2 giving pedestrians more shape 2019-05-06 12:45:52 -07:00
Dustin Carlino
3ba56a76fb fix a panic with bike parking 2019-05-06 11:00:41 -07:00
Dustin Carlino
f31f46e483 draw peds on one side of the sidewalk 2019-05-05 23:18:24 -07:00
Dustin Carlino
a921469da9 dont special-case having a loading screen during make_gui. pass in EventCtx to make_gui to undo some hacks 2019-05-04 17:19:45 -07:00
Dustin Carlino
798a7b5354 be able to trigger a loading screen anywhere 2019-05-04 17:07:07 -07:00
Dustin Carlino
eed33931de proof-of-concept for gluing Timer to loading screen. hacky and not
featurefull yet.
2019-05-04 16:41:01 -07:00
Dustin Carlino
951e2f37ce flush text to display immediately, not at the end. prerequisite to drawing scaled text better 2019-05-04 15:36:40 -07:00
Dustin Carlino
71be19163d highlight object after warping 2019-05-04 10:16:01 -07:00
Dustin Carlino
67d34413fd erase sim at strategic state-changing times 2019-05-04 09:56:36 -07:00
Dustin Carlino
2f66c8ca5c remember if modal menus are hidden or not 2019-05-04 09:30:44 -07:00
Dustin Carlino
625d9890d7 dont allow dupe keys in menus 2019-05-03 14:55:40 -07:00
Dustin Carlino
10240aa478 trigger CommonState actions from a bunch of modal menus 2019-05-03 14:47:31 -07:00
Dustin Carlino
6f4252fcae also draw OSD in some modes that dont use CommonState 2019-05-03 14:27:34 -07:00
Dustin Carlino
3db78d1ddd hacky way of showing context menu hotkeys in OSD 2019-05-03 14:21:43 -07:00
Dustin Carlino
4b4e6f17a0 start a really basic OSD 2019-05-02 12:38:12 -05:00
Dustin Carlino
96c3907655 combo calls to update prompt for ModalMenu 2019-05-01 21:45:34 -05:00
Dustin Carlino
e25af2e450 remove sim's dependency on ezgui and hopefully speed up draw_unzoomed in the process 2019-05-01 19:32:39 -07:00
Dustin Carlino
a0b69db71e recalculate modal menu when resizing, hiding, updating prompt... 2019-05-01 17:00:23 -07:00
Dustin Carlino
bc3b883e2f optional modal menu keys 2019-05-01 16:22:14 -07:00
Dustin Carlino
3b6ecbf4af draw everything from ezgui in screencap mode 2019-05-01 16:14:15 -07:00
Dustin Carlino
e767a704d3 remove old modal menu stuff from ezgui 2019-05-01 16:02:50 -07:00
Dustin Carlino
2915af1b7c converting last things to NewModalMenu 2019-05-01 15:55:38 -07:00
Dustin Carlino
36df2e7908 convert more to NewModalMenu 2019-05-01 14:55:47 -07:00
Dustin Carlino
d10cbd9b7c manage the ModalMenu directly in each state, not in ezgui. convert 2
uses of it to start.
2019-05-01 14:00:46 -07:00
Dustin Carlino
1eb1b0ea40 slightly refactoring Text creation 2019-05-01 11:46:22 -07:00
Dustin Carlino
b2b7d0767c use a modal menu for tutorial mode 2019-05-01 11:37:19 -07:00
Dustin Carlino
b42bba799d ModalMenus can be mostly hidden 2019-05-01 11:17:30 -07:00
Dustin Carlino
a1d1c3d3bc refactor some warping code 2019-04-30 14:54:53 -07:00
Dustin Carlino
82627ce927 prompt for the cross-street next 2019-04-30 14:43:57 -07:00
Dustin Carlino
3b2c1a1d73 new warp function that autocompletes street names 2019-04-30 12:48:00 -07:00
Dustin Carlino
30db2e7fc2 flatten mouseover_something impl 2019-04-29 14:44:43 -07:00
Dustin Carlino
5a7c712f55 move DrawCtx to render module 2019-04-29 14:42:25 -07:00
Dustin Carlino
096dbd99f7 replace RenderOptions with DrawOptions 2019-04-29 14:39:08 -07:00
Dustin Carlino
1972ceeab5 actually, dont plumb DrawOptions in DrawCtx 2019-04-29 14:27:19 -07:00
Dustin Carlino
623401f588 plumb DrawOptions through DrawCtx, get rid of RenderingHints 2019-04-29 14:19:45 -07:00
Dustin Carlino
c59d76d40c organizing input to UI's draw into a struct 2019-04-29 14:05:43 -07:00
Dustin Carlino
51f279c3a2 always draw full turn when hovering over an icon, to be clear what the icon means 2019-04-29 13:33:57 -07:00
Dustin Carlino
1c5d3f6bbf never draw turn icons for SharedSidewalkCorners. remove a field from RenderingHints accordingly. 2019-04-29 13:25:09 -07:00
Dustin Carlino
5d7769694d moving loading utilities to the single module that uses them 2019-04-29 10:10:43 -07:00
Dustin Carlino
6c95bdc0cd merge some stuff into a single helpers module 2019-04-29 10:03:43 -07:00
Dustin Carlino
f29570a28e flatten UIState into UI 2019-04-29 09:52:52 -07:00
Dustin Carlino
8b2d74cad8 simplify instructions after all the GUI refactor 2019-04-28 20:24:37 -07:00
Dustin Carlino
a1f50e4dfb remove OSD, which just had number of uploaded GPU things 2019-04-28 20:12:04 -07:00
Dustin Carlino
2f6cc5fe4d remove vestiges of top menu being in the way 2019-04-28 20:10:00 -07:00
Dustin Carlino
a72e779a89 remove legacy mode, UI's new_event, the top_menu... impl GUI on Game, no
more forwarding to UI ever
2019-04-28 18:00:44 -07:00
Dustin Carlino
9ed882a31c deleting unused plugin boilerplate 2019-04-28 17:45:22 -07:00
Dustin Carlino
e1f35b07cf moving warp into CommonState 2019-04-28 17:38:27 -07:00
Dustin Carlino
52ffb5cce7 common screenshot just this function 2019-04-28 17:23:35 -07:00
Dustin Carlino
db67c734ef moving turn cycler to CommonState 2019-04-28 17:18:54 -07:00
Dustin Carlino
78fc973611 move the show_associated plugin to some CommonState, invoke it from relevant modes 2019-04-28 17:09:31 -07:00
Dustin Carlino
4caec9c5d6 cleaning up old UI plugin structures 2019-04-28 14:15:55 -07:00
Dustin Carlino
0fb0ee0952 move the other diff plugin into a/b test mode 2019-04-28 14:05:49 -07:00
Dustin Carlino
b3949d5da7 moving one diff plugin into a/b test mode 2019-04-28 13:56:24 -07:00
Dustin Carlino
4a3e8177c4 the vital swap control 2019-04-28 13:35:01 -07:00