a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-27 16:36:02 +03:00
Code Issues Projects Releases Wiki Activity
5,641 Commits 85 Branches 166 Tags 395 MiB
5c04923dff
Commit Graph

148 Commits

Author SHA1 Message Date
Dustin Carlino
fec2bb51ca start organizing ezgui internal constants into a Style struct 2020-04-05 11:57:27 -07:00
Dustin Carlino
06bb5e08e6 refactoring Color / FancyColor. remove hatching style 1 2020-03-30 16:15:32 -07:00
Dustin Carlino
69dab9e27d typography overhaul... [rebuild] 2020-03-26 15:42:37 -07:00
Dustin Carlino
4df64b4c83 remove last users of ModalMenu. so long, (some variant of) the original widget. 2020-03-22 20:59:44 -07:00
Dustin Carlino
d63c79d87c popup info in map editor only when a key is held. lock down old 
blocking_text methods a little more
 2020-03-18 11:13:40 -07:00
Dustin Carlino
812c7fa640 start support driving on the left, more carefully tracking all the dependencies. part of #27. lots of bugs left, but it doesn't break anything for driving on the right. 2020-03-16 17:40:12 -07:00
Dustin Carlino
6e8846bf85 bring back elevation data before the hackathon. manual revert of 35b7c18df9 2020-03-11 11:08:49 -07:00
Dustin Carlino
51745d2675 add a better bg for tooltips, centralized in one place 2020-02-27 11:28:57 -08:00
Dustin Carlino
c65b120044 get map_editor working on wasm target 2020-02-14 16:04:33 -08:00
Dustin Carlino
dd9667b95e make map_editor compile again 2020-02-10 12:06:38 -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
d3aa02cee4 improve loading screen text rendering time. don't double-render text, 
use fixed dims, adjust lyon tolerance
 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
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
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
1ab3c5200a limit max unzoom based on actual map dims 2020-01-13 14:39:02 -08:00
Dustin Carlino
e2de6b24d9 start windows maximized 2020-01-10 11:23:52 -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
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
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
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
ee598b6ae4 round of clippy. not fixing everything. 2019-12-11 16:17:15 -08:00
Dustin Carlino
61ef9f0b33 adding turn lanes to the tutorial level 2019-12-07 10:44:05 -08:00
Dustin Carlino
81a19eb78d remove the experimental hi-res grass and park textures and all the 
flagged off textures. going to experiment in a different branch instead.
 2019-12-05 09:37:05 -08:00
Dustin Carlino
f3f4562e00 simple solution for adjusting map boundaries in editor 2019-12-04 13:03:47 -08:00
Dustin Carlino
3501aa6d72 reviving some way of saving and using purely synthetic maps. creating a 
few for the traffic signal tutorial.
 2019-12-04 12:19:17 -08:00
Dustin Carlino
a043a9ba05 clean up more of abstutil path/filesystem API 2019-12-03 09:59:43 -08:00
Dustin Carlino
720f9b8b30 similar for writing 2019-12-02 20:41:09 -08:00
Dustin Carlino
808c3da141 panic early with a nice error if we cant read a binary or json file 2019-12-02 20:35:20 -08:00
Dustin Carlino
082ae0cea1 simple polygon translate API -- no use in taking distances. pt2d isnt natively expressed in meters, and mostly using this for screenspace anyway 2019-11-27 09:15:46 -08:00
Dustin Carlino
1440a8630b prototyping a text button, using it for a title screen 2019-11-24 15:23:28 -08:00
Dustin Carlino
bdc66526a6 tool to clear interior points of road, nice for fixing dangling borders 2019-11-20 12:45:39 -08:00
Dustin Carlino
0e6f89f88b for now, just clobber turn restrictions when merging roads. want to move forward with fixing other maps. also remove label from previous fixes 2019-11-20 11:27:22 -08:00
Dustin Carlino
463ed7022e small fixes/cleanups to map layer: 
- print highest cost in heatmap over all turns
- rm defunct label support for roads/bldgs
- trim out unused methods from Map
- making spawner go through sim layer to get paths, consolidating a bit
 2019-11-18 10:33:36 -08:00
Dustin Carlino
53bbf4e272 manually trim a few disconnected sidewalks 2019-11-13 15:01:53 -08:00
Dustin Carlino
5aecb96d8f refactor turn restriction handling in map_editor... no behavioral changes yet 2019-11-09 16:10:18 -08:00
Dustin Carlino
179009de32 stop coloring synthetic/original stuff in map editor. not useful now that it's normal to modify existing stuff 2019-11-06 10:16:06 -08:00
Dustin Carlino
ada5484501 finishing up the montlake map, no gridlock by default 2019-11-04 12:55:04 -08:00
Dustin Carlino
03e2c0b3f2 one master set of fixes in huge_seattle coordinate space, then a single override per map. start over with fixes... again. for the last time?! all the tricky cases from last time work now... 2019-11-04 09:50:59 -08:00
Dustin Carlino
a5892daedb add a new lane type for road closures 2019-10-29 17:04:57 -07:00
Dustin Carlino
aae6d6d998 cleanup: collapse the old separated modal menu groups 2019-10-29 15:37:19 -07:00
Dustin Carlino
b3611707c8 transforming fixes into huge_seattle coordinate space, to avoid most 
border issues.
 2019-10-28 22:26:39 -07:00
Dustin Carlino
8e4bc6961b montlake is completely fixed of short roads! also turn restrictions 
around 520, crosswalks over 2 one-ways, decided to use one fix file per
map
 2019-10-28 19:08:44 -07:00
Dustin Carlino
ca43e6fb43 woops, wasnt deleting turn restrictions from world layer. fix up 
montlake/520 once again, modulo turn restrictions
 2019-10-28 16:16:25 -07:00
Dustin Carlino
6771c965b4 fix bug in road creation. montlake roundabout as the test case. 2019-10-28 14:42:18 -07:00
Dustin Carlino
1f7c113267 fix road merging. simpler now that roads only have one object 
associated. require turn restrictions to be deleted first. fix the
boston area as a test
 2019-10-28 14:33:10 -07:00
Dustin Carlino
ea50371d64 rip out stable IDs in favor of orig IDs. the extra layer is confusing for things like MapFixes. stop modifying orig IDs when merging roads. 
NOT done with this transition yet, just pushing to not lose work
 2019-10-28 12:08:11 -07:00
Dustin Carlino
ecc86b6d6a revamping MapFixes. very straightforward full override of synthetic/normal stuff, including geometry. no more semantically weird hints like merging roads. some bugs left. 2019-10-27 17:15:27 -07:00
Dustin Carlino
9cfd22d5e0 allow creating new internal points for roads in the editor 2019-10-26 16:32:01 -07:00
Dustin Carlino
0d948cef91 share camera state between game and map_editor 2019-10-26 16:16:32 -07:00
Dustin Carlino
e881d13014 find all the short lanes, from map_editor 2019-10-26 15:01:27 -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
5784a389c1 quick sidewalk tagger in map_editor, with upstreaming 2019-10-23 14:12:49 -07:00
Dustin Carlino
f7ca317422 optionally use real intersection polygons in map editor, including for grabbing 2019-10-23 13:38:58 -07:00
Dustin Carlino
996eceea92 with the new traffic signal, add back the 520 EB onramp 2019-10-22 15:00:56 -07:00
Dustin Carlino
468fd65021 copy over highway type too for coloring. fill out some metadata in the 
520 fixes.
 2019-10-18 12:15:51 -07:00
Dustin Carlino
4eadcc29f5 allow toggling parking when blockface hints are different through the way. just warn. 2019-10-17 11:36:03 -07:00
Dustin Carlino
10f2f6008f improve map_editor's intersection preview 
- timer for setting up world
- preview all intersections
- move world to map_editor; it's too oddly specialized
- dont show circle while previewing intersection geom
- show overlapping intersection polygons
 2019-10-16 15:08:22 -07:00
Dustin Carlino
22df33f66a try to clean up crashes with showing_pts state 2019-10-16 08:58:14 -07:00
Dustin Carlino
84c5241506 when toggling parking, make sure hints applied uniformly to the entire way. warn if not. 2019-10-16 08:47:48 -07:00
Dustin Carlino
1fc9792378 finish producing the osm change 2019-10-15 18:49:06 -07:00
Dustin Carlino
76f5dc21be steps towards producing an osm change file 2019-10-15 13:43:47 -07:00
Dustin Carlino
74372c64b6 count how many roads have been audited. apply default tags (and mark 
them inferred) to everything, to count properly.
 2019-10-15 12:17:38 -07:00
Dustin Carlino
9a4da1e610 display inferred parking in map editor. fast key to toggle between 4 
parking states. propagate change to all roads with same way ID.
 2019-10-15 12:00:15 -07:00
Dustin Carlino
d6a8b1c1cd automatically show road points of selected thing in map_editor 2019-10-14 15:39:51 -07:00
Dustin Carlino
f82000cff4 just select entire road in map_editor. individual lanes were only for labeling one side of the road, which is only a theoretical feature for test maps. also dont allow swapping lanes uselessly. 2019-10-13 16:42:03 -07:00
Dustin Carlino
f772f12a7d combining info/controls for map_editor sidebar 2019-10-13 16:14:47 -07:00
Dustin Carlino
5304aa6ecf trying out permanent sidebar in map_editor. no more tooltips 2019-10-13 15:31:17 -07:00
Dustin Carlino
df4d37f996 migrate some map_editor stuff to a proper modal menu. display constant 
OSD for info and for controls.
 2019-10-12 19:02:58 -07:00
Dustin Carlino
e7507bad85 plumbing initial settings to ezgui better 2019-10-07 09:45:53 -07:00
Dustin Carlino
cc07d37664 more easily show pts for diff road in editor 2019-10-06 15:56:12 -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
393eaff249 compacting SimOptions and SimFlags 2019-10-01 14:22:00 -07:00
Dustin Carlino
71096cf122 refactoring map_editor, by letting main reach into RawMap and World directly for simple stuff 2019-10-01 12:57:51 -07:00
Dustin Carlino
c82e90bbec allow merging short roads with metadata changes. some fixes around 
madison
 2019-09-30 10:11:45 -07:00
Dustin Carlino
75b18ccfd5 plumb back better errors for not being able to make map_editor changes 2019-09-30 09:49:47 -07:00
Dustin Carlino
a539270beb dont compare GPSBounds exactly, bc floating pt serialization problems. 
add a turn restriction near uw.
 2019-09-30 09:24:17 -07:00
Dustin Carlino
c971a732dd more flexibly merge short roads with stop sign and traffic signal. use it to fix a stuck part of 23rd. 2019-09-29 20:50:14 -07:00
Dustin Carlino
9d237f314b dont conflict between synthetic OSM IDs created by map_editor and by map clipping 2019-09-29 12:43:02 -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
b99dfce763 transform geometry in MapFixes based on GPSBounds. also have to 
abandon the 520 fixes, because something odd is going on with the newer
osm import. :( IDs changed?
 2019-09-29 10:17:02 -07:00
Dustin Carlino
537798d5fd make bulk delete also remove restrictions 2019-09-27 11:49:02 -07:00
Dustin Carlino
0ef002ad30 saving the turn restriction mods 2019-09-27 11:19:27 -07:00
Dustin Carlino
1a678f6e72 revamp osm turn restriction handling. capture the 'via' to disambiguate things, and match to roads way sooner. not persisting to MapFixes again. 2019-09-27 11:05:19 -07:00
Dustin Carlino
00b9fc18e3 working on intersection geometry. few disabled things. 2019-09-26 15:56:31 -07:00
Dustin Carlino
2554b08641 upgrade to rust 1.38, fix new clippy errors 2019-09-26 14:38:50 -07:00
Dustin Carlino
0961475abc some prep to make debugging intersection geometry in map_editor easier. 
showing cursor pt and labeled debug lines.
 2019-09-26 14:29:23 -07:00
Dustin Carlino
837de16c32 preview intersection geometry from map_editor 2019-09-25 12:20:13 -07:00
Dustin Carlino
b9df20de5c save turn restriction edits in MapFixes. some caveats. 2019-09-25 11:51:34 -07:00
Dustin Carlino
1b21f03464 cant add turn restriction btwn unconnected roads 2019-09-25 11:03:12 -07:00
Dustin Carlino
cfa21d4cc3 cant delete roads involving turn restrictions 2019-09-25 10:50:06 -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
dd9827df72 add/delete turn restrictions, without saving in fixes yet. adding is 
buggy.
 2019-09-24 18:35:57 -07:00
Dustin Carlino
02858944f0 draw turn restrictions in map_editor 2019-09-24 17:09:06 -07:00
Dustin Carlino
8046f36936 working on turn restrictions in map_editor 2019-09-24 13:55:41 -07:00
Dustin Carlino
67fb1b39da filling in more validity checks for map_editor... 2019-09-24 13:24:33 -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
18b5d1ae8f goodbye, fix_map_geom. rename synthetic crate to map_editor 2019-09-23 13:54:09 -07:00