a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-22 22:01:41 +03:00
Code Issues Projects Releases Wiki Activity
3,267 Commits 85 Branches 166 Tags 395 MiB
6d016cd01b
Commit Graph

601 Commits

Author SHA1 Message Date
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
Dustin Carlino
e893e6b98c add a flag to override DPI, so we can tune on mac 2019-12-16 19:09:02 -08:00
Dustin Carlino
b1da0f0284 get rid of unzoomed_radius, used to highlight agents stuck in intersections. there are better gridlock debug tools now, and this complicates the minimap 2019-12-16 18:51:29 -08:00
Dustin Carlino
4046be3966 start drawing agents in the minimap. theyre a bit big. 2019-12-16 18:46:03 -08:00
Dustin Carlino
eda40ecdec start an interactive legend for the minimap. pretty disjoint from real 
AgentColorScheme right now
 2019-12-16 15:40:32 -08:00
Dustin Carlino
a7071a1bc4 convert ColorLegend to Composite. 2019-12-16 14:50:21 -08:00
Dustin Carlino
8ced649b62 try a different pattern, where callers keep ownership of the Slider, instead of Composite. lots of plumbing, but it's hidden away, so this seems like an improvement. 2019-12-16 14:13:08 -08:00
Dustin Carlino
2bdd7bef74 switching speed panel to Composite 2019-12-16 13:41:17 -08:00
Dustin Carlino
9a702d5c79 an easy one: use flexbox Composite on splash screen. can't quite express 
the centering
 2019-12-16 10:27:52 -08:00
Dustin Carlino
ec01267dd0 let some buttons skip having callbacks and let the owner query them instead 2019-12-16 10:10:01 -08:00
Dustin Carlino
2c8f68344c move tool panel to Composite, the first one with interaction. edit mode 
exit temporarily broken, need to rearrange things a bit
 2019-12-16 09:42:12 -08:00
Dustin Carlino
1e9f14f62d use the new Composite for time controls 2019-12-15 18:42:14 -08:00
Dustin Carlino
d2a18069e7 experiment with using ManagedWidgets and flexbox for AgentMeters. 
crazy inefficient, but the API is darn nice
 2019-12-15 17:09:41 -08:00
Dustin Carlino
97c8a84efb switching out lane editing icons for yuwen's nice ones 2019-12-15 11:06:59 -08:00
Dustin Carlino
eaf01559d3 temporarily adjust position of color legends and agent meters. not the final position, but doing a release today and ideally not drawing two panels on top of each other 2019-12-15 10:30:19 -08:00
Dustin Carlino
90fcfbc1ea start with the simulation playing by default. part of #31 and something on the long list of UX issues anyway 2019-12-14 21:02:21 -08:00
Dustin Carlino
9c879ab488 click to toggle signal priority and stop signs. key didnt make sense, because no way to open an info panel for those objects 2019-12-13 15:52:23 -08:00
Dustin Carlino
442a0509dd invert the default for text background. none by default, should be an exception to use it. planning to support background more generally through some kind of widget layouting. 2019-12-13 15:45:24 -08:00
Dustin Carlino
e307e1f56d only need to prebake once per map+scenario 2019-12-13 13:57:27 -08:00
Dustin Carlino
bb09f4aa72 remove chokepoints overlay (doesnt say anything meaningful) and bike 
path costs overlay (was used for debugging why bike lanes werent being
used a while ago)
 2019-12-13 12:20:21 -08:00
Dustin Carlino
10e0b229a5 previous fix exposed problem entering the time warp state, need to make sure to switch to animation mode upon entry 2019-12-13 11:51:21 -08:00
Dustin Carlino
33bd713609 fix the weirdness with clicking in the info panel to choose actions. the 
click event was getting immediately reused after exiting the panel,
causing the panel to reappear. problem was some widget stuff looking for
mouse-down events. instead they should look for mouse-up.
 2019-12-13 11:47:02 -08:00
Dustin Carlino
4594bd5a7f add OSD annotations to let people know when to click something. use to 
switch interactive spawner away from keypresses, since it's impossible
to open the info panel there anyway
 2019-12-12 18:56:27 -08:00
Dustin Carlino
201c0edaab moving some debug info from the info panel to the console log 2019-12-12 16:09:01 -08:00
Dustin Carlino
5440fca4fe move the functions from the last MenuUnderButton to the ModalMenus, just so I can get rid of the atrocity that is MenuUnderButton 2019-12-12 15:24:07 -08:00
Dustin Carlino
f51a077ee9 move some more functionality to the tool panel. remove another 
MenuUnderButton
 2019-12-12 15:09:28 -08:00
Dustin Carlino
bd557ef4bb move savestate tools in debug mode to modal menu, getting rid of another MenuUnderButton 2019-12-12 14:12:14 -08:00
Dustin Carlino
0de212f763 move back and settings to a bottom-left panel, out of the drop-down menus. no more hamburgers! 2019-12-12 14:10:09 -08:00
Dustin Carlino
7d53f536d4 fix up speed controls a bit after yesterday's move. closes #23 2019-12-12 13:16:53 -08:00
Dustin Carlino
ed2f703e85 add some logging to debug #19 2019-12-12 10:35:51 -08:00
Dustin Carlino
dc2cc81249 make Timer methods and ModalMenu take &str or String 2019-12-12 10:25:48 -08:00
Dustin Carlino
ee598b6ae4 round of clippy. not fixing everything. 2019-12-11 16:17:15 -08:00
Dustin Carlino
260574b208 remove dependency on old ezgui context menus 2019-12-11 16:02:08 -08:00
Dustin Carlino
94502a73ed the magic hack: make the actions usable from the info panel 2019-12-11 15:55:27 -08:00
Dustin Carlino
ec40780ee3 use the action list to populate a menu in InfoPanel. cant choose the actions yet there. 2019-12-11 15:25:43 -08:00
Dustin Carlino
061aed2624 add in a shim to collect contextual actions. just silently pass-through to old behavior for now. 2019-12-11 15:04:32 -08:00
Dustin Carlino
14f4dc2e3c left click to open info panel. refiddling how drag events are detected. 
kind of messy code, but the behavior is FINALLY right.
 2019-12-11 13:52:01 -08:00
Dustin Carlino
706f602e10 splitting time/speed panels. horrible layouting hacks 2019-12-11 13:08:17 -08:00
Dustin Carlino
b9fd59c930 remove some debug functions from UI, document them in dev guide 2019-12-11 10:29:08 -08:00
Dustin Carlino
f0af92f00e split out an agent meter with icons for the modes 2019-12-11 10:13:36 -08:00
Dustin Carlino
2afa2ef43f experimenting with tracking and visualizing demand at traffic signals 2019-12-09 15:23:30 -08:00
Dustin Carlino
b83e61eaee little outlines for the bars 2019-12-09 14:06:25 -08:00
Dustin Carlino
c35ae15ec0 start gameplay with the histogram shown 2019-12-09 14:00:28 -08:00
Dustin Carlino
f296513b2e add mouseover to histogram 2019-12-09 13:47:46 -08:00
Dustin Carlino
11e9d7781f adjust the histogram, hide some text stats now 2019-12-09 13:42:28 -08:00
Dustin Carlino
158f09c3a9 suppress minimap in tutorials 2019-12-09 13:23:18 -08:00
Dustin Carlino
3187fc7ef8 replace MultiText with DrawBoth 2019-12-09 13:03:28 -08:00
Dustin Carlino
954ac97a9f started a histogram to show relative trip durations for fixing traffic 
signals. lots of work needed.
 2019-12-09 12:50:55 -08:00
Dustin Carlino
4e96363398 tuning color rewriting and placement of some svg icons. removing the 
crazy shader color masking
 2019-12-08 13:44:43 -08:00
Dustin Carlino
5a7314d137 Add color rewriting and stroke support for SVG images. Cut over more 
images, discovering some break...
 2019-12-08 12:46:56 -08:00
Dustin Carlino
77099a164b try using usvg and lyon to produce Polygon+Colors from svg files. so 
far, so good. dodging a dependency on harfbuzz (which doesn't build in
my windows cross-compilation env), now trying on mac...
 2019-12-08 10:24:01 -08:00