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

1022 Commits

Author SHA1 Message Date
Dustin Carlino
a301343159 add a setting to scale up on-screen UI things [rebuild] 2020-03-02 12:02:25 -08:00
Dustin Carlino
746e1a7af0 make options screen more of a Composite 2020-03-02 11:22:16 -08:00
Dustin Carlino
b3917bf17b mechanical rename of UI -> App 2020-03-02 09:51:20 -08:00
Dustin Carlino
042bff7971 refactoring this checkbox pattern... wound up also refactoring how 
widgets are found within Composites [rebuild]
 2020-02-28 19:06:59 -08:00
Dustin Carlino
a17f46703c some super basic way to enable/disable stopping for traffic jams in jump-to-time 2020-02-28 18:25:20 -08:00
Dustin Carlino
52eba43522 stop and warp to gridlock in jump-to-time 2020-02-28 15:19:37 -08:00
Dustin Carlino
e5d9d80c14 make sim stepping way more precise, doing minimal amount of time 
advancement in the innermost layer

tested by making sure prebaked results don't budge
 2020-02-28 14:52:41 -08:00
Dustin Carlino
0385b96301 improve layout of challenge pregame screens 2020-02-28 13:51:20 -08:00
Dustin Carlino
8fb1f2fa37 cut off the active agent graph properly. dont assume anything about the rest of the day. also reset prebaked in a missing case 2020-02-28 13:11:31 -08:00
Dustin Carlino
0c89b98525 show trip summary after an agent finishes 2020-02-28 12:49:17 -08:00
Dustin Carlino
758fb2a1d0 remove more ModalMenus. DebugMode needs UI work, but it did anyway. 2020-02-27 13:22:57 -08:00
Dustin Carlino
dafbb788ba remove modalmenus from hidden challenges. the functionality needs to be thought out more carefully. 2020-02-27 12:46:01 -08:00
Dustin Carlino
51745d2675 add a better bg for tooltips, centralized in one place 2020-02-27 11:28:57 -08:00
Dustin Carlino
e9468b8ebf add tooltip warnings about the status of different maps. 2020-02-27 11:10:13 -08:00
Dustin Carlino
5e85eee935 clean up dev tools mode, removing ModalMenu dependencies and modernizing 
different UI things
 2020-02-27 10:38:48 -08:00
Dustin Carlino
01a9986aab remove scenario editor and related things. havent used in ages, the scenario abstraction has proven to be wrong anyway, and it blocks cleanup of old ezgui stuff (SliderWithTextBox). 2020-02-27 09:07:12 -08:00
Dustin Carlino
ae33beb3c9 convert agent spawners from ModalMenu to modern stuff 2020-02-26 22:08:55 -08:00
Dustin Carlino
59ec571aae tweaks to tutorial UI 2020-02-26 15:18:05 -08:00
Dustin Carlino
4af217c140 argh, pushed commit too soon, broke build 2020-02-26 14:43:52 -08:00
Dustin Carlino
1cb11e2edc make unzoomed agent radius more explicitly dependent on camera. no 
visible change.
 2020-02-26 14:36:19 -08:00
Dustin Carlino
e19f88cd40 experiment with finding sources of gridlock, exposed as a new heatmap 2020-02-26 12:13:28 -08:00
Dustin Carlino
cc17d9eafd fix laggy info panel circles 2020-02-25 17:41:24 -08:00
Dustin Carlino
34b1f342a2 fix map deserialization in wasm. 64-bit usizes in fast_paths was the problem. 2020-02-25 14:49:56 -08:00
Dustin Carlino
64bde1e4a3 multiple hotkeys 2020-02-25 14:17:49 -08:00
Dustin Carlino
06759dc58c new tutorial flow [rebuild] 2020-02-25 12:17:19 -08:00
Dustin Carlino
682c9e76f8 trip info panel had no header (and thus way to close it). 2020-02-25 11:01:27 -08:00
Dustin Carlino
d17be067e0 select entire roads/intersections in unzoomed edit mode, click to zoom 
in
 2020-02-24 16:41:43 -08:00
Dustin Carlino
cbfd0259b3 hide building paths in unzoomed mode 2020-02-24 15:36:29 -08:00
Dustin Carlino
d1757873e7 handle (some?) trip transitions in info panels [rebuild] 2020-02-24 15:26:22 -08:00
Dustin Carlino
8c26109b13 dont check the 'following car' tutorial bit until the panel is actually opened 2020-02-24 14:39:29 -08:00
Dustin Carlino
763d7ebe34 rip out the old Stage abstraction. I would do this more slowly, but we can't clone the spawn closure. the flow of the tutorial is pretty much the same, but now we could display specific message boxes better 2020-02-24 14:29:10 -08:00
Dustin Carlino
7ba9170ff6 WIP starting to group tutorial stages internally 2020-02-24 13:46:47 -08:00
Dustin Carlino
da1731ccb2 start with the realistic scenario by default. give extra info about some 
scenarios by adding tooltips in the popup menus
 2020-02-24 11:27:22 -08:00
Dustin Carlino
bba71844fd small tweaks after a quick round of UX testing: [rebuild] 
- flip order of +.1s, +1h buttons to match qwerty keybindings
- arrow keys for changing speed
- escape key applies to info panels first
- click out of some Composites to cancel them
 2020-02-23 11:37:09 -08:00
Dustin Carlino
1268890b75 revamp time warp screen 2020-02-21 12:57:51 -08:00
Dustin Carlino
74a95093bd let speed controls directly reset to midnight by plumbing gameplaymode. so now jump to time can reset, then time warp. [rebuild] 2020-02-21 12:43:30 -08:00
Dustin Carlino
64cf4c5d69 replace components in an existing Composite. use for jump to time. maybe this will be convenient in lots of other places too... 2020-02-21 12:19:24 -08:00
Dustin Carlino
c3b3b9d74c new lyon can handle the last two svgs! remove the pngs 2020-02-20 18:16:46 -08:00
Dustin Carlino
db69dbd4df fix the active agents calculation. buckets... don't make any sense. 2020-02-20 17:50:42 -08:00
Dustin Carlino
5e64a2817f starting a new jump-to-time screen 2020-02-20 15:52:21 -08:00
Dustin Carlino
d29839fa27 display a plot of activity over the day. the windowing is incorrect! but 
it's some kind of start
 2020-02-20 15:11:50 -08:00
Dustin Carlino
3d972389e9 tutorial tweaks: 
- no moving canvas during instructions
- hint about heatmap layers more
- reset camera after watching bikes, but before fixing them
- OK -> next
- checkboxes for parts of tasks
 2020-02-20 13:48:55 -08:00
Dustin Carlino
266ca19970 adjust speed controls, and make note of keybindings in the tooltip 2020-02-20 13:30:33 -08:00
Dustin Carlino
3ed6a8e6db few small tweaks: 
- adjust minimap agent size
- info panel is explicit about stop signs
- adjust unzoomed threshold
 2020-02-20 13:19:50 -08:00
Dustin Carlino
2a747ef46b tooltips for UI elements only. don't need the OSD fullscreen now. 2020-02-20 11:24:50 -08:00
Dustin Carlino
775a4d4035 fix crash before traffic signal preview, and weird finished trips pct 2020-02-19 14:15:22 -08:00
Dustin Carlino
e79790249e separators in meters [rebuild] 2020-02-19 13:44:09 -08:00
Dustin Carlino
fe068da3f4 hide all of the phase editing behind a menu too [rebuild] 2020-02-19 13:08:53 -08:00
Dustin Carlino
841f13f13d move some buttons behind more menus [rebuild] 2020-02-19 12:45:54 -08:00
Dustin Carlino
294ef481f3 signal editor style: 
- smaller phase icons
- better currently selected phase drawing
 2020-02-19 12:04:54 -08:00
Dustin Carlino
a65ea991e5 adjust tutorial wording 2020-02-19 09:40:26 -08:00
Dustin Carlino
848347a9b5 change up agent meters 2020-02-19 08:23:06 -08:00
Dustin Carlino
e713013cf9 improve lane editor. click to edit different lanes 2020-02-18 19:07:46 -08:00
Dustin Carlino
f28961e9c4 add padding to OSD 2020-02-18 17:43:00 -08:00
Dustin Carlino
a88a836752 adjust unzoomed colors 2020-02-18 17:33:41 -08:00
Dustin Carlino
b4017cc0e2 put action buttons higher up in info panels 2020-02-18 17:31:29 -08:00
Dustin Carlino
d112707261 more info about trips to/from bldgs and intersections [rebuild] 2020-02-18 15:15:31 -08:00
Dustin Carlino
f71c1d521e add the trip data button. just removed the svg clip and it worked fine. 2020-02-18 12:19:34 -08:00
Dustin Carlino
f90ac143e0 put IDs back in info panels, in a less scary way. make histogram a bit 
smaller, to stop covering new scorecard
 2020-02-18 12:14:05 -08:00
Dustin Carlino
8434369d94 simplify representation of intersection edits, to allow proper undoing 2020-02-18 10:45:50 -08:00
Dustin Carlino
93c159b844 convert between stop signs and traffic signals. fixes #16 2020-02-18 09:54:14 -08:00
Dustin Carlino
0f0924ac56 restore an old debug tool to spot what agents are blocking an intersection. optional mode to avoid some gridlock... seemingly working for a few cases, but breaking other stuff, so disabled. 2020-02-18 08:40:05 -08:00
Dustin Carlino
254d07223e option to invert scroll direction 2020-02-18 07:30:32 -08:00
Dustin Carlino
3555e58369 new map! tried to grab fresh OSM, but some of the old fixes broke it, so 
will find a workaround tomorrow
 2020-02-17 21:54:50 -08:00
Dustin Carlino
bd51208684 name intersections in info panels better, and avoid horizontal scrolling 
in most?? cases
 2020-02-17 17:07:25 -08:00
Dustin Carlino
46b91f0621 move map_path to be a function of GameplayMode, not Challenge. consolidate soem switch_map callers. 2020-02-17 16:43:36 -08:00
Dustin Carlino
47d367d82f when you complete a challenge, offer to jump to the next step 2020-02-17 16:08:58 -08:00
Dustin Carlino
d56803a12a include ongoing trips in measured trip times. adjust wording of 
"finished trips" things.
 2020-02-17 15:58:27 -08:00
Dustin Carlino
2316a725b1 show a score card in the tutorial too [rebuild] 2020-02-16 20:37:35 -08:00
Dustin Carlino
5c79efcc60 move traffic signal challenge score to agent meters. nix the confusing 
details button for the moment.
 2020-02-16 19:32:27 -08:00
Dustin Carlino
4a4917f2f0 plumb in pieces of SandboxMode into the gameplay. undo the event_with_speed hack. 2020-02-16 19:12:33 -08:00
Dustin Carlino
3e0246edec find some way to prebake tutorial scenarios 2020-02-16 11:45:23 -08:00
Dustin Carlino
d292e29ad0 get the game crate running in wasm. bundle in lots of data files, fake out a few more IO things, glue timer println's to console log 2020-02-15 16:44:06 -08:00
Dustin Carlino
9a9619ec32 moving game assets to data/system, to more easily bundle in wasm 
[rebuild]
 2020-02-15 16:19:23 -08:00
Dustin Carlino
bdb0844512 make game crate compile under wasm 2020-02-14 16:15:44 -08:00
Dustin Carlino
b2c92ab8f9 upstreaming some changes for wasm here 
- use instant crate
- bring in the wasm ezgui backend and necessary setup tweaks
- upgrade stdweb

but no map editor build magic yet
 2020-02-14 14:28:25 -08:00
Dustin Carlino
d7d8b472e5 adjust escort mission 2020-02-13 14:30:14 -08:00
Dustin Carlino
152568476c no more Text::prompt 2020-02-13 13:57:48 -08:00
Dustin Carlino
b2e21ea856 disable more controls early in tutorial. change tutorial goal text in a 
few more cases.
 2020-02-13 13:23:48 -08:00
Dustin Carlino
88a58fac8f adjust tutorial instructions based on progress within a stage. had to 
internally revamp tutorial state (again for the better!)
 2020-02-12 17:08:57 -08:00
Dustin Carlino
1f0b225b6b cleaning up trip_details 2020-02-12 16:17:41 -08:00
Dustin Carlino
691dcdfbbc also revamp panels for other objects, except for the trip details part 2020-02-12 12:22:43 -08:00
Dustin Carlino
fc47d2b948 work on info panels a little more. lanes are looking pretty good now. 2020-02-12 11:16:05 -08:00
Dustin Carlino
8b50492d42 trying out a different look for info panel contents. mostly just lanes 
right now
 2020-02-11 17:04:25 -08:00
Dustin Carlino
ba83207477 mitigate accidental tutorial restarting 2020-02-11 16:32:53 -08:00
Dustin Carlino
b033c4f720 round of quick fixes to avoid crashes 2020-02-11 16:13:42 -08:00
Dustin Carlino
66c983d119 refactor away DrawCtx, just pass UI 2020-02-10 13:28:03 -08:00
Dustin Carlino
f359995a27 adjust the indication of some selected objects 2020-02-10 13:16:39 -08:00
Dustin Carlino
6ff0c85a14 cutover to use winit's own event loop. thanks to goddessfreya for help 
fixing the animation timing in
https://github.com/rust-windowing/winit/pull/1450#pullrequestreview-355698895
 2020-02-10 10:01:49 -08:00
Dustin Carlino
604c87f2c7 new release. also sneak in tiny popup menu fix for the next round 2020-02-09 17:32:03 -08:00
Dustin Carlino
1cd7629dfa dont reload prebaked data unnecessarily [rebuild] 2020-02-09 17:15:33 -08:00
Dustin Carlino
935e42aee6 upgrade glium and glutin 
- reference events exported from glutin as winit events, which will ease a transition to wasm (where winit is used with glow, not glium)
- also winit stopped requiring a dance to convert logical to physical sizes, so stop tracking dpi!
 2020-02-09 10:56:51 -08:00
Dustin Carlino
4f7bed25cd massive and trivial perf boost to draw_unzoomed_agents 2020-02-08 16:58:26 -08:00
Dustin Carlino
e46cd7b677 cache SVGs 2020-02-08 16:27:45 -08:00
Dustin Carlino
db65e1d41f slightly less inefficient draw_blocking_text 2020-02-08 13:52:29 -08:00
Dustin Carlino
c51c37caba draw the OSD better [rebuild] 2020-02-08 10:36:44 -08:00
Dustin Carlino
fad4cdbda2 plumb font directory so it'll work anywhere, but still would prefer to bundle binary data properly 2020-02-08 10:36:44 -08:00
Dustin Carlino
da59362dfe fix z values, especially for tooltips. also refactor Button::new 2020-02-08 10:36:44 -08:00
Dustin Carlino
12826fe118 start dismantling DrawBoth, and make the JustDraw API nicer 2020-02-08 10:36:44 -08:00
Dustin Carlino
3ff56f54cf prepping for a caching layer by changing render API, plumbing ctx... 
getting close
 2020-02-08 10:36:44 -08:00
Dustin Carlino
7c76f2d119 migrating all callers of draw_text_at_mapspace to do something better now 2020-02-08 10:36:44 -08:00
Dustin Carlino
d806d9509b draw traffic signal text label properly (and way more efficiently now) 2020-02-08 10:36:44 -08:00
Dustin Carlino
95c1f47047 clean up text_dims, then unplumb a BUNCH of stuff 2020-02-08 10:36:44 -08:00
Dustin Carlino
a3149d2219 no_edits -> untitled edits 2020-02-06 13:15:09 -08:00
Dustin Carlino
872cd0cba6 'save as' feature for map edits. autosave otherwise. 2020-02-06 12:31:06 -08:00
Dustin Carlino
1147d29d98 get rid of some modalmenus in edit mode [rebuild] 2020-02-05 18:02:19 -08:00
Dustin Carlino
bdb4ba43ba less terrible stop sign editor [rebuild] 2020-02-05 16:54:10 -08:00
Dustin Carlino
950238af81 close intersections from signal and stop sign editor 2020-02-05 16:34:42 -08:00
Dustin Carlino
2f2f0506fa jump to lane editor straight from sandbox mode. tune lane editor style 
slightly [rebuild]
 2020-02-05 16:17:16 -08:00
Dustin Carlino
462a812348 ripping out lane paintbrush editor, changing to a popup per lane 2020-02-05 16:03:20 -08:00
Dustin Carlino
bcf4550be2 no info panels in edit mode, just click to jump to editors. no more 
selecting buildings. removing some of the revert shortcuts from the
direct edit mode, since there's no more info panel to see multiple
actions
 2020-02-05 15:22:05 -08:00
Dustin Carlino
a878f57a42 refactor rotating colors, and use a different palette for the 10 bucket case 2020-02-05 14:53:22 -08:00
Dustin Carlino
10ef4057a0 make buttons in sandbox dash look more like tabs 2020-02-05 13:01:35 -08:00
Dustin Carlino
2d73513b0c flexbox trick to make sure plot axes arent stretched out too much when embedded in larger panels 2020-02-05 12:44:05 -08:00
Dustin Carlino
0909344c15 minimap tuning: add vertical separator, make the dropdown appear by the 
button
 2020-02-05 12:15:37 -08:00
Dustin Carlino
f4c6b4453a scrape info from PSRC to relate trips to people. not plumbed into 
scenario layer yet.
 2020-02-04 19:54:13 -08:00
Dustin Carlino
91234bf49a slow day. prototype a dot map from scenarios 2020-02-04 16:30:44 -08:00
Dustin Carlino
b0a56abb6e no more prompt in some of the popups, adjust the menu coloring, cancel 
popups by clicking on the map
 2020-02-04 13:41:09 -08:00
Dustin Carlino
7f82241ed9 put some popup menus beneath their buttons 2020-02-04 13:25:53 -08:00
Dustin Carlino
17ebb506b5 draw previous state underneath wizards, so everything doesnt vanish 2020-02-04 12:52:47 -08:00
Dustin Carlino
0890a37ee1 carve out a section for showing off curated proposals [rebuild] 2020-02-03 18:01:49 -08:00
Dustin Carlino
28d593797a overhaul fullscreen layouts: splash menu, about, challenge picker, 
sandbox dashboards. I think I understand enough of the tricks now.
 2020-02-03 16:13:40 -08:00
Dustin Carlino
92c2fca55e make the details button in signal challenge inactivate 2020-02-03 12:01:13 -08:00
Dustin Carlino
28dcf63c8e simplify challenge picking flow. stop listing previous proposals, for now. use the same tab style as sandbox dashboards 2020-02-03 11:53:54 -08:00
Dustin Carlino
59f2f03acb refactoring some UI-related colors 2020-02-03 11:14:17 -08:00
Dustin Carlino
8a2d73ae23 stick tutorial state in UI session data. now we can remember current and 
latest stage, start dev mode in the right place, and start at any stage
via flag
 2020-02-03 10:21:13 -08:00
Dustin Carlino
17bb3548ff loading screen while clearing edits, and clear edits when leaving 
tutorial
 2020-02-02 17:46:52 -08:00
Dustin Carlino
116d0dfef0 revamp tutorial mode as a gameplay mode underneath sandbox. few small 
bugs left after the transition. unlocks more fixes and improvements
 2020-02-02 14:17:27 -08:00
Dustin Carlino
6f6dda72bd better turn group blocks that handle variable lane width and 
non-contiguous turn lanes. also clarify part of tutorial for #42
 2020-02-01 19:11:01 -08:00
Dustin Carlino
abba4be202 filter out overlays intelligently 2020-02-01 11:39:48 -08:00
Dustin Carlino
719e720bf7 more obvious way to leave edit mode [rebuild] 2020-01-31 15:34:55 -08:00
Dustin Carlino
2daf5c51ca fix bugs transitioning around edit mode 2020-01-31 15:30:46 -08:00
Dustin Carlino
adbbe669d7 working on the tutorial again 2020-01-31 15:16:26 -08:00
Dustin Carlino
8228f53d02 make it easier to debug objects by warping to them, draw turn cycler 
arrows a little more successfully
 2020-01-31 14:06:37 -08:00
Dustin Carlino
1d13ae39c3 explain a few more things in the tutorial, improve arrows a bit 
[rebuild]
 2020-01-31 12:18:44 -08:00
Dustin Carlino
800008dc03 making the histogram more clear about same trips 2020-01-30 15:33:27 -08:00
Dustin Carlino
da92518d62 align all overlay panels above the minimap 2020-01-30 14:38:26 -08:00
Dustin Carlino
e96fa0f96f fix bounds of tutorial levels, so max unzoom and minimap and such work. 
always display minimap in sim modes.
 2020-01-30 14:25:02 -08:00
Dustin Carlino
e87e77f06e hide other challenges outside of dev mode 2020-01-30 13:55:48 -08:00
Dustin Carlino
c62ca1a125 try again or back out of challenge after final score 2020-01-30 13:50:46 -08:00
Dustin Carlino
a0ec59b6c3 remove the modalmenu from traffic sig challenge. show target goal always. pop up score when all trips are done 2020-01-30 12:00:21 -08:00
Dustin Carlino
2cc536608a move trffic signal score into the top-center panel, put a button there to launch the full histogram 2020-01-30 11:28:39 -08:00
Dustin Carlino
cc489ae03f dismantle GameplayRunner indirection 2020-01-30 11:08:33 -08:00
Dustin Carlino
92c6b8e282 give ownership of the top-center panel to each gameplay state 2020-01-30 11:01:40 -08:00
Dustin Carlino
78344ee2a4 simplify traffic signal challenge's communication of main score. move 
count/duration comparators to a more general place.
 2020-01-30 10:49:20 -08:00
Dustin Carlino
d3fe865ad9 tuning signal editor 2020-01-29 16:22:49 -08:00
Dustin Carlino
cfbaf80fe3 autoscroll signal editor to show the current phase 2020-01-29 15:59:56 -08:00
Dustin Carlino
d54384742a tune minimap controls. also avoid the brief flash of a loading screen 
when it's very fast [rebuild]
 2020-01-29 13:35:36 -08:00
Dustin Carlino
c07d5b7c55 add a 4th speed option (uncapped) 2020-01-29 12:47:33 -08:00
Dustin Carlino
2750035172 tuning the speed panel, to fix #34 2020-01-29 12:26:09 -08:00
Dustin Carlino
43ea723111 tune lane editor style, and refactor some widget centering patterns 
[rebuild]
 2020-01-29 12:16:18 -08:00
Dustin Carlino
4ceae3de14 embed a version number in the title screen 2020-01-29 11:43:54 -08:00
Dustin Carlino
5914b39fc5 adjust bus stop and crosswalk icons after thinner sidewalks. deactivate 
turn cycler when hovering on bus stops (and other objects)
 2020-01-29 11:13:45 -08:00
Dustin Carlino
b2216bb482 not all lanes have to be the same width. make sidewalks a bit thinner. 2020-01-28 17:26:14 -08:00
Dustin Carlino
5048c69750 scrape named amenities from OSM, match to buildings 2020-01-28 15:57:45 -08:00
Dustin Carlino
8a966395af prevent a crash with spawning agents around intersections. tiny tutorial tweaks 2020-01-28 14:33:55 -08:00
Dustin Carlino
e733fe9d94 plumb real time passed through Update event, just base off of that 2020-01-28 09:39:44 -08:00
Dustin Carlino
8d3f58f214 whoa, time_limited_step always jumped too much 2020-01-28 09:07:09 -08:00
Dustin Carlino
6c0d42ffe7 open bus analytics from an individual bus. open up bus analytic actions 
in tutorial mode.
 2020-01-27 15:57:34 -08:00
Dustin Carlino
bef513ec8b inactive buttons in tutorial mode 2020-01-27 15:22:53 -08:00
Dustin Carlino
07995fb060 starting a tutorial for bus lanes too 2020-01-27 12:38:51 -08:00
Dustin Carlino
426ebdc606 let vehicles spawn on all lanes from a border. lets the bike tutorial have a better solution 2020-01-27 11:54:36 -08:00
Dustin Carlino
2747ca5181 bike trips were counting as driving trips 2020-01-27 11:01:02 -08:00
Dustin Carlino
0d3cfb90ec wire up edit mode in tutorial properly. add end condition to bike lane 
tutorial [rebuild]
 2020-01-26 09:31:03 -08:00
Dustin Carlino
1c7764843a reorder and tune some info panel contents 2020-01-25 14:56:30 -08:00
Dustin Carlino
5f82c855ed slidey windows for thruput plots 2020-01-25 14:19:03 -08:00
Dustin Carlino
91cd0e9852 working more on the bike lane tutorial 2020-01-25 10:28:34 -08:00
Dustin Carlino
a45405055a start a tutorial stage to justify bike lanes 2020-01-24 16:04:58 -08:00
Dustin Carlino
4f60d6cb77 make the all-walk conversion idempotent, and some other bugfixes to the 
editor
 2020-01-24 15:30:32 -08:00
Dustin Carlino
09b0c47f3c show better names for maps and scenarios 2020-01-24 14:13:27 -08:00
Dustin Carlino
041b28ad2a remove the last traces of override_colors! 2020-01-24 13:38:15 -08:00
Dustin Carlino
0b528c1eff and buildings with (parked) car. remove the old ShowAssociated debug 
thing -- if I ever need to see agents doing turns or extra shapes
matched to roads again, I'll impl it differently
 2020-01-24 13:17:54 -08:00
Dustin Carlino
89e27b5e3d associate cars with owner buildings 2020-01-24 13:10:24 -08:00
Dustin Carlino
6452953370 when an info panel is open, keep an outline on the object. dont quite 
handle peds <-> crowds
 2020-01-24 12:59:34 -08:00
Dustin Carlino
ffdde86fc6 reduce use of override_colors. make ColorerBuilder slightly easier to 
use
 2020-01-24 12:02:40 -08:00
Dustin Carlino
971e8ae3a5 rainy night fixes: 
- skip out-of-bounds turn restrictions during map creation
- don't enter sandbox mode with a tutorial map loaded
- fix intersection demand overlay getting clobbered
- keep updating info panel even when we hover over something else
- tweak bad order in trip details info
 2020-01-23 23:03:07 -08:00
Dustin Carlino
6d016cd01b stop blindly plumbing through no-op events after any input is used. do 
it more explicitly in just a few places.

fixes crash when cycling through turns while sim is running.

this makes modal menus appear laggy, but that's fine; phasing those out
anyway.
 2020-01-23 17:11:29 -08:00
Dustin Carlino
89a269a59e consolidating other button styles, and adjusting signal editor colors 2020-01-23 16:05:35 -08:00
Dustin Carlino
76f5cde433 nicer text button style for the top bar 2020-01-23 15:35:08 -08:00
Dustin Carlino
ee38657a31 change the escort mission to focus on the parked car, since it's so easy to miss the ped getting out 2020-01-23 15:02:58 -08:00
Dustin Carlino
13e139bd84 encode edits as an overlay, let it be shown in sandbox mode too. some 
shuffling around to update the overlay in edit mode
 2020-01-23 14:31:41 -08:00
Dustin Carlino
622072721b make download links and build from source instructions easier to see, 
for #41
 2020-01-22 17:27:24 -08:00
Dustin Carlino
1043008ba8 and bus lanes [rebuild] 2020-01-22 15:55:04 -08:00
Dustin Carlino
1b9d5d7c07 bike lane markings! \o/ 2020-01-22 15:51:42 -08:00
Dustin Carlino
bdd05ee1a7 point out the car to follow 2020-01-22 15:36:17 -08:00
Dustin Carlino
f8501ace6a button in info panels to follow an agent, aka, unpause sim 2020-01-22 15:17:33 -08:00
Dustin Carlino
06b83a5f73 less colors: use sidewalk/road color for building connections 2020-01-22 14:12:12 -08:00
Dustin Carlino
1ff48e728e woops, little crash [rebuild] 2020-01-22 13:02:16 -08:00
Dustin Carlino
c2b4d39efb applying easy tutorial feedback [rebuild] 2020-01-22 12:56:46 -08:00
Dustin Carlino
2bc48d0568 found a fun case entering tutorial. get rid of scary hack a few commits ago by properly recursing when waking up new states [rebuild] 2020-01-22 12:03:40 -08:00
Dustin Carlino
2a194a9bea actually, with the previous fix, now we can get rid of all the transitions that ask for Animation when entering a new state! 2020-01-22 11:57:37 -08:00
Dustin Carlino
75281ed354 when we change states, immediately run through a round of no-op event(). this lets us immediately draw a WizardState without having to flail the mouse a bit to trigger a first event. 
(also, fix release script again)
 2020-01-22 11:47:06 -08:00
Dustin Carlino
9a10c52d92 rename the wrapped managed things, for great sanity 2020-01-22 10:41:58 -08:00
Dustin Carlino
54d7f31097 generalize overlays, stick it in UI. only sandbox and tutorial mode can modify it for now though. 2020-01-22 10:24:52 -08:00
Dustin Carlino
09e87687db more of the minimap tut 2020-01-21 15:45:43 -08:00
Dustin Carlino
95a84fd26a tweaking rustfmt options; the long literal string vecs in tutorial look awful 2020-01-21 15:20:02 -08:00
Dustin Carlino
dfd8d43b83 tutorial stage introducing the minimap. point to widgets more precisely. 2020-01-21 15:01:10 -08:00
Dustin Carlino
42e5597539 warp to certain positions in some tutorial phases, and other polishing 
to the tutorial so far [rebuild]
 2020-01-21 12:17:46 -08:00
Dustin Carlino
f198a6c35f dont insist on prebaked data existing in some places. also go update 
scenarios with the new name, oops.
 2020-01-21 11:50:56 -08:00
Dustin Carlino
6303cf52a4 next tutorial stage, following an agent 2020-01-21 11:23:39 -08:00
Dustin Carlino
a8a55aaaef trying a more declarative way of specifying tutorial stages 2020-01-20 22:45:09 -08:00
Dustin Carlino
389d033ed2 starting a few more tutorial stages 2020-01-20 14:38:43 -08:00
Dustin Carlino
73680948b5 use top-center panel for more things in all challenge modes. remove help 
functions in favor of putting more info in the challenge description
 2020-01-20 13:52:11 -08:00
Dustin Carlino
67ebb76f94 tiny refactor of rounded_rectangle. pad time panel 2020-01-20 12:36:27 -08:00
Dustin Carlino
3eb8d61dd2 adjust title screen layouting [rebuild] 2020-01-19 17:59:37 -08:00
Dustin Carlino
562f462519 draw an icon on parked cars 2020-01-19 15:48:41 -08:00
Dustin Carlino
e9d40fe494 just kidding, use two counters in meters panel 2020-01-19 15:34:53 -08:00
Dustin Carlino
7ce3d5dd24 adjust agent meters panel (move info button there, display (un)finished 
trips more succinctly)
 2020-01-19 15:20:19 -08:00
Dustin Carlino
ca6b81099c rename scenarios to be less confusing 2020-01-19 14:39:46 -08:00
Dustin Carlino
1e49d4b6eb adjust parking heatmap color. start changing sandbox mode's top-center 
panel
 2020-01-19 14:04:59 -08:00
Dustin Carlino
790e860632 start poking at tutorial mode again. don't expect much yet. 2020-01-18 20:04:15 -08:00
Dustin Carlino
7d238ceff5 jump to stop sign editor from sandbox mode too 2020-01-18 16:57:15 -08:00
Dustin Carlino
afcd694524 fade out map when a blocking menu is open 2020-01-17 14:33:35 -08:00
Dustin Carlino
901b938b31 dont let screenspace things see cursor if it's in mapspace. fixes clicking buttons hidden by clipping. 2020-01-17 14:11:07 -08:00
Dustin Carlino
4327322ea4 turn edit mode's lane brushes into a proper Composite 2020-01-17 13:44:58 -08:00
Dustin Carlino
6bdd557c80 make ModalMenu optional for gameplay modes, now that we dont need it for unfollowing agents. stop using it in freeform and play scenario modes. 2020-01-17 11:24:13 -08:00
Dustin Carlino
44310ffe28 refactor some color legend stuff 2020-01-17 11:07:50 -08:00
Dustin Carlino
d5653e42ab use info panel for finished trips 2020-01-17 10:53:09 -08:00
Dustin Carlino
b6d7acd385 er, we need to do a little caching when hovering on routes after all. such lag. 2020-01-17 10:17:28 -08:00
Dustin Carlino
3cf916a2bc adjust info panel dims slightly [rebuild] 2020-01-16 18:19:30 -08:00
Dustin Carlino
f63577e2b7 no more toggling on permanent routes. still show little preview when hovering. 2020-01-16 17:21:35 -08:00
Dustin Carlino
3636f7afdc fold trip explorer into info panel 2020-01-16 17:11:51 -08:00
Dustin Carlino
eb0281a294 just move info panel handling code 2020-01-16 16:42:25 -08:00
Dustin Carlino
610f8f7e46 totally remove route explorer, the wonky warping slider one 2020-01-16 16:30:01 -08:00
Dustin Carlino
2068ef2d9e follow agents automatically when info panel is open. drastically simpler 
impl.
 2020-01-16 16:26:25 -08:00
Dustin Carlino
ad49e37706 gracefully exit info panels for agents that go away 2020-01-16 16:13:21 -08:00
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