Commit Graph

651 Commits

Author SHA1 Message Date
Dustin Carlino
9312d81471 auto-update info panels 2020-01-16 15:57:18 -08:00
Dustin Carlino
5f0dd70d43 jump to info panel object 2020-01-16 15:43:01 -08:00
Dustin Carlino
497d05552a use a locate icon button in a few places 2020-01-16 15:34:30 -08:00
Dustin Carlino
5966460527 change info panels to coexist in a parent state. only contextual action
possible on the map is to close the info panel or open a new one.
2020-01-16 15:33:13 -08:00
Dustin Carlino
9296765369 simplify manage_overlays. make bus picker from big info dash work 2020-01-16 14:45:59 -08:00
Dustin Carlino
1a16a5289b launch bus delay plot from anywhere 2020-01-16 14:38:49 -08:00
Dustin Carlino
f85ca54a44 bail out of spawning parked cars if we're totally out of space. still
horribly slow in maps without enough onstreet parking.

also fix the name of github artifacts [rebuild]
2020-01-16 11:27:15 -08:00
Dustin Carlino
08a601c45a same for the bus timeline 2020-01-15 16:37:22 -08:00
Dustin Carlino
52c394aaf2 get rid of the scrolling bus explorer thing. be able to launch show bus route as a normal overlay anywhere. 2020-01-15 16:28:12 -08:00
Dustin Carlino
15400dc514 slightly adjust some fullscreen stuff 2020-01-15 14:51:55 -08:00
Dustin Carlino
bb01c30b9d scale scrollbar length to show how much stuff is actually scrollable 2020-01-15 12:07:25 -08:00
Dustin Carlino
0835e58bef use floating panels for signal diagrams too. no more smushing into the
OSD
2020-01-15 11:38:05 -08:00
Dustin Carlino
a349eb330b fix flex wrapping and other weird issues 2020-01-15 11:21:32 -08:00
Dustin Carlino
c1f35aca46 simplify size management -- minimal size by default, can limit max size 2020-01-15 10:33:08 -08:00
Dustin Carlino
5af9c7e17b every composite will automatically be scrollable if needed. simplify API. 2020-01-15 10:19:21 -08:00
Dustin Carlino
ffb8270b10 treat the percentage as a max, not a set limit 2020-01-14 16:53:11 -08:00
Dustin Carlino
851e12f432 simplify some code without changing behavior 2020-01-14 15:57:21 -08:00
Dustin Carlino
d637243f2a support horizontal scrolling 2020-01-14 15:47:35 -08:00
Dustin Carlino
6db84efdae WIP clip composites 2020-01-14 15:18:27 -08:00
Dustin Carlino
51756b570c show selected phase in full view 2020-01-14 15:03:19 -08:00
Dustin Carlino
a29b8f5fd0 render phases differently in the full diagram 2020-01-14 14:57:14 -08:00
Dustin Carlino
eb0fa982c6 click to warp to intersection whose demand is being shown 2020-01-14 14:42:14 -08:00
Dustin Carlino
d21bcb9aa6 make the finished trips histogram closeable easily 2020-01-14 14:27:03 -08:00
Dustin Carlino
801d4f47c9 simpler top-center panel 2020-01-14 14:15:22 -08:00
Dustin Carlino
875f311f55 preserve scenario when changing maps 2020-01-14 14:05:21 -08:00
Dustin Carlino
cca6ce48a6 creep towards floating info panels, by moving it away from the corner of the screen 2020-01-13 18:52:44 -08:00
Dustin Carlino
8a7e3cecff make clipping be a stateful API, as prep for clipping composites 2020-01-13 16:57:09 -08:00
Dustin Carlino
90300c655e switch remaining signal editor stuff to a top-center panel 2020-01-13 15:56:25 -08:00
Dustin Carlino
af76ad9d60 wrap text in signal diagram to limit width 2020-01-13 14:57:46 -08:00
Dustin Carlino
1ab3c5200a limit max unzoom based on actual map dims 2020-01-13 14:39:02 -08:00
Dustin Carlino
0a771404ea make the zoom in/out fully feature actually smoothly zoom 2020-01-13 14:01:56 -08:00
Dustin Carlino
32afd5663b inline some signal editor controls 2020-01-13 11:34:43 -08:00
Dustin Carlino
8f17bc9227 branch a copy of the signal diagram for the editor 2020-01-13 10:36:52 -08:00
Dustin Carlino
1f01054077 draw a legend for intersection demand too 2020-01-13 10:00:25 -08:00
Dustin Carlino
30664d9791 stop listing edits in main edit mode too 2020-01-13 09:51:35 -08:00
Dustin Carlino
23b3b1e0a4 add redo support in signal editor 2020-01-13 09:35:49 -08:00
Dustin Carlino
b40a4a5b59 stop describing edits in traffic signal editor 2020-01-13 09:28:52 -08:00
Dustin Carlino
bf6392384b remove redundant traffic signal editor feature 2020-01-13 09:23:59 -08:00
Dustin Carlino
f28029c69f dont crash when peds are waiting for a bus that isnt spawned, and dont walk in place while waiting 2020-01-13 09:21:23 -08:00
Dustin Carlino
649d0ddbda always draw brake light with turn signals 2020-01-13 09:08:51 -08:00
Dustin Carlino
f78bc6a5ef simplify top-center panel in challenge mode 2020-01-12 10:53:32 -08:00
Dustin Carlino
ec1e3f435b make it easy to dump raw events for debugging on windows/mac [rebuild] 2020-01-12 09:35:38 -08:00
Dustin Carlino
de1c481c93 svg parking icons 2020-01-12 09:20:54 -08:00
Dustin Carlino
5f4e2bd81e use edit map icon 2020-01-11 20:40:44 -06:00
Dustin Carlino
e207500877 move some controls above minimap viz panel 2020-01-11 20:27:25 -06:00
Dustin Carlino
f1b42ecdb9 consolidate composite layouting... just need to know alignment and percentage of screen 2020-01-11 14:59:27 -06:00
Dustin Carlino
0023002935 proof of concept: max size for composites! 2020-01-11 14:32:41 -06:00
Dustin Carlino
abe89d65f8 center popup menus 2020-01-11 14:02:47 -06:00
Dustin Carlino
60c20230ec align X button to the right. flexbox is so unintuitive. 2020-01-11 13:54:42 -06:00
Dustin Carlino
f4f85febd7 choose heatmap via yuwen's icons. layouting is funky, but when is it
not?
2020-01-11 13:42:26 -06:00
Dustin Carlino
511c451e8a totally ditch the fixed Composite positioning 2020-01-10 12:01:05 -06:00
Dustin Carlino
52e08238e5 use relative positioning for the minimap and legend. (when starting maximized, window size changes a few times, really exposing how silly exact positioning is) 2020-01-10 11:59:15 -06:00
Dustin Carlino
e2de6b24d9 start windows maximized 2020-01-10 11:23:52 -06:00
Dustin Carlino
f7c2911671 [rebuild] to test windows info panel click bug 2020-01-10 10:01:26 -06:00
Dustin Carlino
a6edc70d3c input validation for naming edits 2020-01-10 09:34:23 -06:00
Dustin Carlino
bc8eb8d6e0 ahhh, fix bug that made crosswalks not conflict with turns 2020-01-10 09:18:21 -06:00
Dustin Carlino
f12e231966 jump to editing traffic signal directly from sandbox mode 2020-01-09 19:13:06 -06:00
Dustin Carlino
11ece6b188 no more log scroller. have an OK button 2020-01-09 17:54:07 -06:00
Dustin Carlino
7b4c7306e7 dont allow 0s phases 2020-01-09 17:38:02 -06:00
Dustin Carlino
4115d26b6b woops, adding missing turns to traffic sig needs to prioritize crosswalks 2020-01-09 17:23:00 -06:00
Dustin Carlino
d871e3b447 loading screen for applying map edits 2020-01-09 17:19:35 -06:00
Dustin Carlino
bc95319859 hide traffic sig details when turn cycling in sandbox mode 2020-01-09 17:17:24 -06:00
Dustin Carlino
f6274e566d OSD even for pregame stuff 2020-01-09 15:50:00 -06:00
Dustin Carlino
de21ee0727 show keybindings in info panel 2020-01-09 15:43:35 -06:00
Dustin Carlino
0a5d945f20 avoid some bugs if we simulate way past 24 hours 2020-01-09 12:01:12 -06:00
Dustin Carlino
53f33a31e4 hide IDs unless in dev mode 2020-01-09 11:50:56 -06:00
Dustin Carlino
c049221743 add a timeline showing bus location 2020-01-08 13:59:01 -06:00
Dustin Carlino
0ecfb1be20 make the passenger delay panel into a Composite, and click stops to warp to them 2020-01-08 13:17:10 -06:00
Dustin Carlino
6203ff70f0 make it easier to find all bus stops 2020-01-08 11:23:00 -06:00
Dustin Carlino
45c7ee08e1 remove speed slider, use the 3 settings instead 2020-01-08 10:55:34 -06:00
Dustin Carlino
5ae2557b2c adjusting some speed panel buttons. the new triangles dont do anything
yet.
2020-01-07 12:52:56 -06:00
Dustin Carlino
24565cfe49 refactoring composite builder API 2020-01-07 12:08:39 -06:00
Dustin Carlino
0ad371525b after clicking a button, figure out if we're hovering over any new buttons that're created. kind of an invasive refactor to get to this, but worth it. 2020-01-07 11:43:34 -06:00
Dustin Carlino
eb9050777b hide button for heatmaps 2020-01-07 11:07:34 -06:00
Dustin Carlino
0439e05e4e start a panel for showing live passenger delay 2020-01-04 10:52:25 -06:00
Dustin Carlino
05888357ea generalize that into a prebaked analytics thing. undo the previous
thing. (i forgot even live stuff should be in analytics)
2020-01-04 10:30:57 -06:00
Dustin Carlino
fd2fbf6a5e info panel for bus stop has number of people waiting currently, time spent waiting 2020-01-04 10:11:22 -06:00
Dustin Carlino
9aac76ee39 draw less terrible bus stops 2020-01-04 09:50:03 -06:00
Dustin Carlino
eeb0c653c4 grab the right sunset/sunrise icons 2020-01-03 11:55:19 -06:00
Dustin Carlino
3208636c29 move legend for colorer 2020-01-03 10:58:07 -06:00
Dustin Carlino
35357534aa draw heatmap on the minimap 2020-01-03 10:52:09 -06:00
Dustin Carlino
e8ea180f8a clean up places using Colorer that were drawing things themselves 2020-01-03 10:44:28 -06:00
Dustin Carlino
a2e749c30c merge RoadColorer and ObjectColorer 2020-01-03 10:30:02 -06:00
Dustin Carlino
a70cea84b5 make road colorer draw on top of original stuff when zoomed in, with
less opacity. dont use override_colors.
2020-01-03 10:15:50 -06:00
Dustin Carlino
852ee69430 buttons to zoom in/out fully. poor animation for now. 2020-01-02 12:21:47 -06:00
Dustin Carlino
d21676ea11 make the zoom indicators clickable 2020-01-02 12:11:13 -06:00
Dustin Carlino
3bd4a7220d make popup menus use scrolling 2020-01-02 11:35:41 -06:00
Dustin Carlino
c9b8438bd5 yuwen's magical new heatmap colors 2020-01-02 10:41:43 -06:00
Dustin Carlino
642084c595 rotate walk icons 2020-01-02 10:24:12 -06:00
Dustin Carlino
1ad3dfd634 always draw crosswalks, draw walk / dont walk icons 2020-01-01 13:47:55 -06:00
Dustin Carlino
c925eff8b9 new traffic signal arrow styles and phase spinner 2020-01-01 12:51:40 -06:00
Dustin Carlino
87a2c82ba6 fixed number of zoom levels for the minimap 2019-12-30 11:10:32 -06:00
Dustin Carlino
74de79e0dd make an iterator to determine when we're on the last item. use to refactor a few places that have to do this. there are more though. 2019-12-29 11:20:05 -06:00
Dustin Carlino
7cd7eec5cd stop embedding TimePanel inside SpeedPanel (even though they always go together) 2019-12-29 10:55:34 -06:00
Dustin Carlino
4329f55e97 zoom controls for minimap 2019-12-29 10:44:29 -06:00
Dustin Carlino
863e239c98 turning histogram into a proper ManagedWidget 2019-12-29 10:16:38 -06:00
Dustin Carlino
1de77f0d3b prevent a crash spawning agents on a synthetic map [rebuild] 2019-12-28 11:02:27 -06:00
Dustin Carlino
5b6e7a6f54 jump straight to a challenge from command line for fast development. fixes #31 2019-12-26 18:53:44 -06:00
Dustin Carlino
71553cbc70 make time jump textbox start with the current time, so the format is a bit more clear. addresses #24 2019-12-26 18:30:51 -06:00
Dustin Carlino
227c20bd38 use proper paths in game's colorscheme-scraping build script, so things work on windows. should fix #33. try re-enabling windows build to confirm. [rebuild] 2019-12-26 17:52:25 -06:00
Dustin Carlino
38bc88d54b make the pan buttons do something 2019-12-25 12:35:49 -08:00
Dustin Carlino
517a35775f adding pan buttons to minimap. they dont do anything yet, but the hard
part was positioning the minimap using all the new layouting
2019-12-25 12:01:51 -08:00
Dustin Carlino
e8c9cfd2cf support command stack and undo within traffic sig ed 2019-12-25 11:22:31 -08:00
Dustin Carlino
b81d66dcc3 real time/speed controls in traffic sig preview, with a different
meaning for reset
2019-12-25 10:58:12 -08:00
Dustin Carlino
3ddae0517e put action buttons in the info panel directly; scrap the modal menu 2019-12-24 15:50:13 -08:00
Dustin Carlino
bb55b2158f start sandbox mode with agents from main screen 2019-12-24 15:40:16 -08:00
Dustin Carlino
fbbb59f6a5 add option to preview traffic signal edits with the live sim results 2019-12-24 14:34:50 -08:00
Dustin Carlino
ebd405e2ef make the scrollbar slider work! also, stop wasting github resources 2019-12-23 15:00:22 -08:00
Dustin Carlino
21b8f41a59 change API of Composite. we need to own all the sliders after all. prep
for including a scrollbar.
2019-12-23 14:33:43 -08:00
Dustin Carlino
3c0b88dfdf rewrite slider a bit. support vertical scrolling (untested). fix some
bugs in speed panel introduced a while ago. keep tuning github workflow.
2019-12-23 13:56:29 -08:00
Dustin Carlino
faa7de4d96 argh wrong directory 2019-12-23 11:54:41 -08:00
Dustin Carlino
b45bfc392c try out a github workflow for building particularly on mac. forked from https://github.com/timfish/usb-enumeration/blob/master/.github/workflows/main.yml 2019-12-23 11:51:22 -08:00
Dustin Carlino
dafcc50479 for now, hack around layouting mess by hardcoding window width to make flex wrapping kind of work 2019-12-23 11:05:24 -08:00
Dustin Carlino
47db959155 also for picking finished trips 2019-12-22 20:14:15 -08:00
Dustin Carlino
c249934eba use flex buttons for picking a bus route 2019-12-22 20:00:19 -08:00
Dustin Carlino
2a8c657770 only upload widget backgrounds once 2019-12-22 10:52:41 -08:00
Dustin Carlino
194dbae66f embed Scroller functionality in Composite directly. use for analytics panel 2019-12-22 10:26:48 -08:00
Dustin Carlino
c130e49cb4 reverse earlier decision and put prebaked analytics back in UI, so existing plumbing works. but it's optional and carefully set/reset 2019-12-22 10:14:19 -08:00
Dustin Carlino
7c37c786fd stick the finished trips plot in the new dashboard 2019-12-21 14:47:39 -08:00
Dustin Carlino
2a67872d17 turning the old scoreboard into a separate dashboard. also fold in the
bus route explorer
2019-12-21 14:43:03 -08:00
Dustin Carlino
e7d9efc4e4 split the plot into 3 pieces, use layouting for the axes 2019-12-21 10:43:26 -08:00
Dustin Carlino
f1566b48c9 lift ManagedWidget and friends into ezgui. have a wrapper layer in game that adds callbacks. here's my herculean refactor of the week. :D 2019-12-20 15:56:04 -08:00
Dustin Carlino
a188741c06 migrate remaining users of old Plot to new Plot 2019-12-20 14:38:54 -08:00
Dustin Carlino
f6b4af1797 move road throughput into info panel 2019-12-20 14:28:34 -08:00
Dustin Carlino
c2e5678308 cut intersection delay and thruput plots over to being embedded in info panel composite. working on rendering issues. 2019-12-20 14:19:40 -08:00
Dustin Carlino
2a02e31bce making Plot be something that can be composited. just some of the glue
so far, nothing working yet.
2019-12-20 13:42:58 -08:00
Dustin Carlino
38d731e2a5 adjust traffic signal diagram based on yuwen's mocks 2019-12-20 13:11:50 -08:00
Dustin Carlino
a67b1bf19a refactor Polygon::rectangle_top_left and a few more things... taking
Distance everywhere is kind of silly
2019-12-20 12:42:49 -08:00
Dustin Carlino
ae41408c70 compute Composite layout upfront. only recompute when window is resized. 2019-12-20 11:20:09 -08:00
Dustin Carlino
6b5e33a665 glue up the next/prev phase keys 2019-12-20 11:00:38 -08:00
Dustin Carlino
49a0f7abd6 yay, delete old gunky attempts at scrolling 2019-12-20 10:30:56 -08:00
Dustin Carlino
b229c44511 make the new signal diagram selectable. it's now basically usable! 2019-12-20 10:25:14 -08:00
Dustin Carlino
04bcf77e2b work on new traffic signal scrolling panel. generalized scrollable
Composite works!
2019-12-20 09:35:27 -08:00
Dustin Carlino
988b4bed18 adjust pregame screens slightly 2019-12-20 08:12:01 -08:00
Dustin Carlino
82d91d3ec6 actually toggle layers of agent color schemes. the indirection might be
crazy expensive...
2019-12-19 14:52:54 -08:00
Dustin Carlino
56285a7b30 add screen positioning to some Composites 2019-12-19 10:59:39 -08:00
Dustin Carlino
d5312fabd4 remove the show/hide feature from ModalMenus. ModalMenus are on the way out, the icon is often covering stuff up, and now we can delete some old pngs 2019-12-18 16:26:28 -08:00
Dustin Carlino
7ad40959ca adjust all of the UI panels... 2019-12-18 16:20:14 -08:00
Dustin Carlino
ea59c84f6b start a more general top-center panel for freeform mode 2019-12-18 16:06:52 -08:00
Dustin Carlino
1eb21f2fe0 get rid of the sandbox modal menu in favor of a top-center panel 2019-12-18 15:46:21 -08:00
Dustin Carlino
0fcbd69264 flexbox margins. thanks julian 2019-12-18 15:27:52 -08:00
Dustin Carlino
3547c2cf1b move some sandox menu items to tool panel for the moment 2019-12-18 15:14:59 -08:00
Dustin Carlino
959a89e81c dont serialize paths of yet-to-be-spawned stuff. drastically reduces savestate size. 2019-12-17 18:08:59 -08:00
Dustin Carlino
a1ff95e80a exploring the feasibility of recording prebaked savestates (to use for
quick previews in edit mode). reduced size of savestates significantly
by ommitting analytics...
2019-12-17 16:36:29 -08:00
Dustin Carlino
892e0592e1 adjust rendering of parked cars 2019-12-17 15:55:47 -08:00
Dustin Carlino
dfa1b82c70 stop adjusting agent colors when zoomed in. just one fixed scheme right now. acs just for unzoomed/minimap. get rid of the "arbitrary colors" scheme 2019-12-17 15:50:09 -08:00
Dustin Carlino
75f2b46f08 implement yuwen's car colors and turn indicators 2019-12-17 15:29:36 -08:00
Dustin Carlino
7701e19c05 tune a few text button colors, to make it more obvious they're buttons 2019-12-17 14:58:36 -08:00
Dustin Carlino
a2ac3c5265 make the minimap visibility panel match up with the agent colorscheme.
remove the old color legend
2019-12-17 14:54:25 -08:00
Dustin Carlino
9aa4fda837 overhaul color scheme. no more dynamic picker or saving. sometimes
generate an easily editable JSON file.
2019-12-17 11:05:07 -08:00