a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-22 13:51:33 +03:00
Code Issues Projects Releases Wiki Activity
6,611 Commits 85 Branches 166 Tags 395 MiB
9f22d4893a
Commit Graph

2497 Commits

Author SHA1 Message Date
Dustin Carlino
b192bda583 couple edit mode with sandbox mode. always return to sandbox mode, reseting the sim with the correct gameplay mode retained 2019-10-31 14:22:58 -07:00
Dustin Carlino
ef01501509 overhaul finished trips graph. record times in order, build the graph later 2019-10-31 13:46:26 -07:00
Dustin Carlino
c89c0d2a11 remove time travel feature entirely for now. broken, not performant, unused 2019-10-31 12:50:23 -07:00
Dustin Carlino
857a8a4a67 actually, just overlay bus route display, dont use a warping item slider 2019-10-31 12:41:31 -07:00
Dustin Carlino
11af01d0ea prevent bus routes near borders from being filtered out 2019-10-31 12:07:35 -07:00
Dustin Carlino
561a883e19 filling out optimize bus gameplay mode 2019-10-31 10:25:34 -07:00
Dustin Carlino
06170784cb organizing functionality by gameplay mode. can switch scenarios sometimes. cant spawn stuff unless in freeform mode. 2019-10-31 10:14:44 -07:00
Dustin Carlino
1d08181eaa parameterize sandboxmode by a gameplaymode. makes the reset sim button 
reinitialize scenarios properly
 2019-10-31 09:59:03 -07:00
Dustin Carlino
ccf12edde8 adding a sidebar to sandboxmode to show stuff related to the challenge -- time between bus stops, to start. setting this up from the challenge mode screen. lots of tweaks needed. 2019-10-31 09:04:47 -07:00
Dustin Carlino
53bd77332e start structuring the UI for selecting and running a challenge 2019-10-30 20:44:27 -07:00
Dustin Carlino
7833346fa2 cleaning up speed controls 2019-10-30 18:15:03 -07:00
Dustin Carlino
a94e210c22 changing speed controls to be a panel of manually arranged buttons. not 
done, but functionality is cutover. fix details later.
 2019-10-30 15:01:11 -07:00
Dustin Carlino
9d828abbd0 move bus explorer to sandbox mode. make it start at the current stop 2019-10-30 12:20:04 -07:00
Dustin Carlino
6ffa5fbf6e move savestating under a save menu 2019-10-30 10:26:44 -07:00
Dustin Carlino
9995bed6ab improve dead-ends by using a shared sidewalk corner, not a crosswalk 2019-10-30 10:10:28 -07:00
Dustin Carlino
1d5064ca1b track all bus arrivals, show distribution. track total number of 
passengers per route
 2019-10-29 22:11:56 -07:00
Dustin Carlino
7faeafd998 nice hatching for construction lanes, hackily encoded 2019-10-29 17:19:36 -07:00
Dustin Carlino
a5892daedb add a new lane type for road closures 2019-10-29 17:04:57 -07:00
Dustin Carlino
d757b45bff manually workaround y inversion with stretched textures by modifying the 
images
 2019-10-29 16:36:19 -07:00
Dustin Carlino
0575e57584 tweaks to buttons 2019-10-29 15:45:26 -07:00
Dustin Carlino
aae6d6d998 cleanup: collapse the old separated modal menu groups 2019-10-29 15:37:19 -07:00
Dustin Carlino
c2fd82328a move more controls under a general menu 2019-10-29 15:31:55 -07:00
Dustin Carlino
7574869798 tie together a popup menu and a button in a really simple way. move some 
info and location things there
 2019-10-29 15:14:17 -07:00
Dustin Carlino
00253d2783 using textures for the hide/show buttons. making it easier to sometimes 
upload expensive textures. draw show/hide buttons on top of modal menus,
even when they sometimes overlap.
 2019-10-29 13:47:04 -07:00
Dustin Carlino
49ecf2e792 move time stepping controls to speed panel, where they belong 2019-10-29 13:08:59 -07:00
Dustin Carlino
41d9588266 apply zorder in unzoomed view 2019-10-28 17:30:43 -07:00
Dustin Carlino
6f50cbaa30 finishing the big cutover from stable to original IDs. main path works, 
now looking at map editor
 2019-10-28 12:40:09 -07:00
Dustin Carlino
75e155fec6 filter out parking lanes without any sidewalks at all nearby (and also 
warn about them)
 2019-10-26 17:53:09 -07:00
Dustin Carlino
0d948cef91 share camera state between game and map_editor 2019-10-26 16:16:32 -07:00
Dustin Carlino
4d2f77e90c simple heatmapish overlay to show the bike lane network 2019-10-26 13:04:58 -07:00
Dustin Carlino
ee02ff9944 display when a bus last served a stop. move some of these analytics to 
be owned by sim
 2019-10-26 12:33:00 -07:00
Dustin Carlino
7d7bfef5ea filter out parking garages with 0 spots. render water on top of parks, 
to workaround issue of the green lake park polygon covering everything
up
 2019-10-26 11:37:10 -07:00
Dustin Carlino
1a4cf8c1a0 fix crash in all trip viz. path request might not even be possible 2019-10-26 10:29:44 -07:00
Dustin Carlino
e0bb2f97e0 debug floodfill from sidewalks, now that i'm really messing with that 
connectivity
 2019-10-25 14:40:52 -07:00
Dustin Carlino
3dfeae8b2c introduce a proper closed polyline abstraction, sub it in 2019-10-25 13:14:05 -07:00
Dustin Carlino
fe14e1709b implement PartialEq on Pt2D using the old epsilon_eq. too many places in the codebase are inconsistent. 2019-10-25 12:24:18 -07:00
Dustin Carlino
1e903c6cee pass a flag to disable using mapfixes, since it's annoying to keep temporarily deleting these 2019-10-25 10:09:47 -07:00
Dustin Carlino
a8490aa16f tweaking some map colors 2019-10-24 16:00:27 -07:00
Dustin Carlino
cb4720946c experiment with texturing cars, with some fun UV coordinates. looks half 
reasonable when it works. breaks on duplicate points, not sure what's
wrong yet
 2019-10-24 14:07:03 -07:00
Dustin Carlino
90e1277152 another attempt: weighted arrows 2019-10-24 13:19:47 -07:00
Dustin Carlino
6f3f9d085f weird heatmpish thing of all paths to/from a border or building. not too 
useful.
 2019-10-24 12:52:30 -07:00
Dustin Carlino
820a660132 experiment with building roofs 2019-10-23 23:36:01 -07:00
Dustin Carlino
17e02ebdf0 adding in support for rotating textures, except missing y-inversion 2019-10-23 16:30:23 -07:00
Dustin Carlino
d133dfd152 experimentally use textures for pedestrians. add support for stretching 
texture coordinates
 2019-10-23 15:46:00 -07:00
Dustin Carlino
299b5bb77f remove old functionality for creating only partial PSRC scenarios. 
rename the main scenario to be much more enticing
 2019-10-23 08:04:55 -07:00
Dustin Carlino
25ab691946 add basic usage instructions 2019-10-22 12:27:47 -07:00
Dustin Carlino
c9db056c3a start representing shared left turn lanes. nothing uses them yet, 
just draw them (without the left turn markings)
 2019-10-21 16:14:16 -07:00
Dustin Carlino
7ead5f9281 make traffic signal diagram always be a fixed width; zoom the intersection based on that 2019-10-21 15:17:21 -07:00
Dustin Carlino
c9a6f0a7d8 call out agents that've been blocked in an intersection for a while. 
this is basically a fast gridlock detector
 2019-10-20 12:49:25 -07:00
Dustin Carlino
28bb1ba194 interactively spawn a parked car in a garage 2019-10-19 17:17:33 -07:00
Dustin Carlino
5b9a8dd914 seeding buses more robustly. spot fixes to maps to prevent regressions 2019-10-19 16:54:54 -07:00
Dustin Carlino
7020544073 show which bus a ped is waiting for 2019-10-19 16:00:55 -07:00
Dustin Carlino
f1f951fc1c Revert "distinguish parked cars that have a trip scheduled or not" 
This reverts commit dba7ced094.

Is slow, not so useful. Could implement more intelligently, but not
worthwhile yet.
 2019-10-19 15:24:40 -07:00
Dustin Carlino
6989c72aa1 show location of all buses serving a route 2019-10-19 13:40:24 -07:00
Dustin Carlino
28f11e4ab3 draw entire bus route in explorer, with labeled stops 2019-10-19 13:02:17 -07:00
Dustin Carlino
b4b4e8fae8 solid yellow lines for oneways. dashed looks really strange with offside parking. 2019-10-18 15:08:30 -07:00
Dustin Carlino
c78486f039 fixes to short roads in 23rd. full day with freeform policy no longer 
gridlocks! starting a vague tracking doc of outstanding issues per map
 2019-10-18 14:19:32 -07:00
Dustin Carlino
56a277a284 show live parking counts in that analytics legend 2019-10-18 12:35:49 -07:00
Dustin Carlino
d6a9e0e541 just one copy of the code to calculate parked car seeding per bldg, in popdat. remove variant in scenario manager 2019-10-18 11:47:03 -07:00
Dustin Carlino
73a2482b6a after escaping from instantiated scenario, wind up back at splash screen, not scenario manager 2019-10-18 11:25:01 -07:00
Dustin Carlino
dba7ced094 distinguish parked cars that have a trip scheduled or not 2019-10-17 14:54:30 -07:00
Dustin Carlino
70ac1a4495 interactive spawner can force using parked cars. revamping that terrible 
code.
 2019-10-17 13:44:14 -07:00
Dustin Carlino
0a97482a16 er, dont need parking hints on buildings and areas. also adjust traffic 
signal box color; needed updating after changing colors a while ago
 2019-10-17 12:44:00 -07:00
Dustin Carlino
c70a57e7ae click to cancel info panel 2019-10-17 11:29:02 -07:00
Dustin Carlino
a55a7d3c48 cleaning up info panel for each case so far, bringing in any lingering stuff from the old sidebar branch 2019-10-14 14:23:48 -07:00
Dustin Carlino
f6865fac43 Get rid of ID::Trip, not sure why that ever made sense 2019-10-14 13:57:37 -07:00
Dustin Carlino
4df994a6c9 moving debug mode's tooltips into a popup info panel, hopefully the precursor to a sidebar 2019-10-14 13:42:22 -07:00
Dustin Carlino
430b1245c4 working on a new traffic signal scroller. disabled. decent start. 2019-10-13 18:44:19 -07:00
Dustin Carlino
5358931a5e fixing up a few lingering places in the game that were constructing text prompts 2019-10-13 15:43:11 -07:00
Dustin Carlino
85ff33e72d basic, but working, impl of cars lane-changing opportunistically 2019-10-13 14:30:20 -07:00
Dustin Carlino
a077276275 rewriting the wizard menu from scratch too. also making sure to update 
master GUI state (where's the cursor?) up-front. that's independent from
letting the canvas pan, a client decision
 2019-10-12 10:24:07 -07:00
Dustin Carlino
f548ded8cc most modalmenus will maintain layout themselves. also stop doing 
layouting in constructors; the first event will work fine.
 2019-10-11 20:45:27 -07:00
Dustin Carlino
f1cae9bd37 dont show info when modalmenu hidden, just title. simplify setting info 
from outside.
 2019-10-11 20:10:12 -07:00
Dustin Carlino
419017a295 small refactor btwn sandbox and abtest mode 2019-10-11 14:01:56 -07:00
Dustin Carlino
05b953d639 split sim summary onto two nice lines 2019-10-11 13:25:41 -07:00
Dustin Carlino
81addd9c8c making menu label swaps more ergonomic 2019-10-11 13:15:14 -07:00
Dustin Carlino
f71d229594 ability to change menu labels. use for speed controls and debug mode. 2019-10-11 13:09:32 -07:00
Dustin Carlino
88be94e789 simple stacked layouting for text box, slider, and modal menu (rewritten 
from scratch). not fully done, but perfectly usable and clean!
 2019-10-11 12:37:48 -07:00
Dustin Carlino
2edb275d3c rename cycle -> phase, match the literature 2019-10-09 15:27:25 -07:00
Dustin Carlino
21aa42891d parameterizing slider dims, making them match menus 2019-10-09 15:03:23 -07:00
Dustin Carlino
e0ae1d5195 tooltip with key bindings for hide/expand icons. doesn't look great 
though.
 2019-10-09 10:29:11 -07:00
Dustin Carlino
7e40f6797e avoid crash in individ_trips 2019-10-08 17:09:32 -07:00
Dustin Carlino
ee5462e7c4 woops, wasnt keeping menu state synced when pausing externally 2019-10-08 11:20:26 -07:00
Dustin Carlino
258f3d4528 reverse lane direction as a new edit. might be a few determinism issues, 
but seems to mostly work.
 2019-10-07 18:04:31 -07:00
Dustin Carlino
98d7f26f2d change pause/resume button to say the appropriate thing, now that it's easy 2019-10-07 14:58:55 -07:00
Dustin Carlino
7c3a26fed8 making ItemSlider and all trip viz also combine menu and slider better 2019-10-07 14:54:42 -07:00
Dustin Carlino
5b6eb8629c color buildings by number of cars needed 2019-10-07 13:19:45 -07:00
Dustin Carlino
3459d9c8fd change default font size by flag 2019-10-07 10:39:09 -07:00
Dustin Carlino
e7507bad85 plumbing initial settings to ezgui better 2019-10-07 09:45:53 -07:00
Dustin Carlino
f09b9f8a19 share shortcuts between maps 2019-10-07 09:34:11 -07:00
Dustin Carlino
1df7c580f3 hack in a way for ModalMenu to work alongside a slider. use in 
SpeedControls.
 2019-10-05 17:01:33 -07:00
Dustin Carlino
47ccf2c70b making normal ModalMenu be able to add/remove items. killing off DynamicMenu. 2019-10-05 14:59:59 -07:00
Dustin Carlino
13976ea0c5 start undoing the separate DynamicMenu experiment. move agent colorscheme back into main modalmenu 2019-10-05 14:23:52 -07:00
Dustin Carlino
d0879117f3 modernizing chokepoints finder too 2019-10-05 14:13:21 -07:00
Dustin Carlino
bbbfc4a064 fold trip stats into new exclusive analytics thing, so it also auto-updates 2019-10-05 13:56:43 -07:00
Dustin Carlino
85ebb225cd unifying parking availability, intersection delay, thruput stats into one exclusive thing that consistently auto-updates 2019-10-05 13:34:30 -07:00
Dustin Carlino
b40b26def8 dont draw agents when unzoomed and showing some kind of heatmap 2019-10-04 16:07:07 -07:00
Dustin Carlino
1a10e8982a basic heatmap showing busiest roads and intersections. have to revive 
Sim Events kind of.
 2019-10-04 15:33:26 -07:00
Dustin Carlino
0d27a11b2b map_editor tool to quickly absorb name, speed limit, lanes of nearby road for synthetic roads 2019-10-02 12:11:11 -07:00
Dustin Carlino
5f9cf2accd display basic labels on trip stats 2019-10-01 19:28:03 -07:00
Dustin Carlino
393eaff249 compacting SimOptions and SimFlags 2019-10-01 14:22:00 -07:00
Dustin Carlino
6f75cf32eb mvp of graphing finished trips over time 2019-10-01 14:09:17 -07:00
Dustin Carlino
db4db7e0d9 very basic tool to point out intersections with the most contention 2019-09-30 11:39:55 -07:00
Dustin Carlino
2e5649bf7e show count of aborted trips in scoreboard too 2019-09-29 19:19:51 -07:00
Dustin Carlino
1edb3cf81b digging into why synthetic roads are getting connected to weird places. 
warping functionality, more ID debugging
 2019-09-29 12:30:48 -07:00
Dustin Carlino
2554b08641 upgrade to rust 1.38, fix new clippy errors 2019-09-26 14:38:50 -07:00
Dustin Carlino
ffc8050623 refactoring OSD text construction 2019-09-25 10:36:22 -07:00
Dustin Carlino
15db77a82b show trips to/from borders, not just bldgs 2019-09-25 10:25:18 -07:00
Dustin Carlino
23166b1aa8 switch to turn restriction enums, so we can easily use IDs in map_editor 2019-09-24 18:58:06 -07:00
Dustin Carlino
b11f33f7f6 trying out a different type of menu for agent controls. explicitly 
add/remove actions, and grow/shrink the menu based on temporarily
activated things
 2019-09-24 13:02:23 -07:00
Dustin Carlino
39f555a788 trying out traffic signals rendered per lane, resuming from hackathon. 
progress, but still doesnt look comprehensible. also flip intersection
color to blend in with roads more -- black doesn't look right, but
matching the parking lanes actually looks reasonable.
 2019-09-24 10:20:31 -07:00
Dustin Carlino
fe41fcc858 robustify kml rendering 2019-09-23 17:38:45 -07:00
Dustin Carlino
c54cffe694 render yellow center lines as dashed 2019-09-23 16:42:49 -07:00
Dustin Carlino
536df84844 rename raw_data layer of stuff for easier importing, disambiguation 2019-09-23 15:00:55 -07:00
Dustin Carlino
0ae0a88abb actually, serialize MapFixes as json for now. will switch to binary when this is large later, but for now, this is easier to handle schema changes and debug. 2019-09-19 14:39:31 -07:00
Dustin Carlino
9a58136fc1 remove two debuggers (original roads and reattempting intersection geom) from game. not useful, and this could work better in synthetic or fix_map_geom. also lets us stop copying an extra polyline in the final map 2019-09-19 14:16:50 -07:00
Dustin Carlino
fbb7d8ac96 cleaning up CmdArgs usage 2019-09-19 10:42:16 -07:00
Dustin Carlino
f18fc72265 finish structopt removal 2019-09-18 17:29:34 -07:00
Dustin Carlino
ad8f984359 the convenience of a --dev flag 2019-09-17 16:49:29 -07:00
Dustin Carlino
1e4f36dec1 duplicate OSM ids in tag maps universally, to simplify some other places 2019-09-17 15:37:11 -07:00
Dustin Carlino
af22daaf69 hop to debug mode from a/b test mode, and make it a proper pushed state 
from edit and sandbox mode too
 2019-09-15 13:28:38 -07:00
Dustin Carlino
1f2c4e3797 make route viewer also handle mode changes and trips ending 2019-09-15 13:07:58 -07:00
Dustin Carlino
5c2d86ee95 improve a/b scoreboard colors and duration printing 2019-09-15 12:25:57 -07:00
Dustin Carlino
ece53430a1 point out the A and B in the a/b test menu 2019-09-15 10:28:10 -07:00
Dustin Carlino
fa898a9c70 fix more a/b test setup bug -- have to reset sim after applying edits. 
doh.
 2019-09-14 19:34:24 -07:00
Dustin Carlino
f52ab43752 fix HUGE a/b test setup bug... secondary was instantiating scenario, THEN applying map edits. possibly still broken though?! 2019-09-14 14:46:51 -07:00
Dustin Carlino
8730884eb4 dont allow setting up abtest with same edits for both 2019-09-14 13:48:21 -07:00
Dustin Carlino
974e4d43b7 fix debug mode's overlapping UIs... dont keep trying to draw all the special debug mode stuff in nested states. also stop double-drawing when using {Road,Building}Colorer 2019-09-14 13:42:43 -07:00
Dustin Carlino
1248dac270 nicer API for appending bits of text 2019-09-13 15:23:25 -07:00
Dustin Carlino
97361317ed greying out choices in scoreboard that have no trips 2019-09-11 12:51:07 -07:00
Dustin Carlino
c8e3e9ce4b rearrange colorscheme changing, so it doesnt happen in irrelevant modes 2019-09-11 12:43:06 -07:00
Dustin Carlino
612b02d526 migrating all callers off old methods. decided to keep choose_string 2019-09-11 12:32:17 -07:00
Dustin Carlino
aa3fed3395 builder-based API for wizard choosing stuff. need to convert other 
callers now.
 2019-09-11 11:52:34 -07:00
Dustin Carlino
224461fcdc plumb hatching bit in the style vertex attrib, not this awkward stateful uniform value 2019-09-11 11:06:57 -07:00
Dustin Carlino
9ed38c849c be able to flag off using textures, and sub a fallback color. also move texture loading into the loading screen. and fix the release script 2019-09-10 17:04:33 -07:00
Dustin Carlino
9867619c9c generalize ezgui Color to also cleanly represent textured things 2019-09-10 16:41:35 -07:00
Dustin Carlino
9a624397e0 supporting up to 10 textures 2019-09-10 15:44:07 -07:00
Dustin Carlino
fdd770088d very hacky, minimal impl of texturing water 2019-09-10 15:21:58 -07:00
Dustin Carlino
c4b47aeeb5 make other_crosswalk_ids aware of the degenerate intersection quadruple case, and avoid quadruple-rendering 2019-09-09 14:55:53 -07:00
Dustin Carlino
d98ff19c1d fix route viewer when skipping fwd in time 2019-09-09 14:39:45 -07:00
Dustin Carlino
2d3c079db5 spawn agent from sidewalk 2019-09-09 11:20:06 -07:00
Dustin Carlino
ed559bd71e geom debugger does warping 2019-09-09 09:51:15 -07:00
Dustin Carlino
43c2c72e71 importing street sign dataset to override bad parking categories from blockface. the signs look overeager... so disabling 2019-09-08 17:23:53 -07:00
Dustin Carlino
105f526e9e contextual_action takes &str or String 2019-09-07 13:56:00 -07:00
Dustin Carlino
cacd5174ad make legend crisper by removing transparency 2019-09-07 13:50:34 -07:00
Dustin Carlino
19135c7461 debug feature to kill off a stuck car 2019-09-07 13:46:47 -07:00
Dustin Carlino
caaf0954ab rename the main editor crate to game -- map editing is just a tiny piece ;) 2019-09-07 13:09:09 -07:00