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,629 Commits 85 Branches 166 Tags 395 MiB
0bed515bc6
Commit Graph

857 Commits

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