Commit Graph

470 Commits

Author SHA1 Message Date
Dustin Carlino
1412a888d6 move Scroller to ezgui lib 2019-08-02 16:49:31 +02:00
Dustin Carlino
721037e2fb actual scrolling logic! 2019-07-31 16:08:53 +02:00
Dustin Carlino
5b65cb139a switching to a generic scroller widget thing, which doesnt actually
scroll yet ;)
2019-07-28 17:06:00 +02:00
Dustin Carlino
c3c467343a add dummy buttons to scroll traffic signal diagram 2019-07-28 15:35:56 +02:00
Dustin Carlino
6192a1357d at last, add controls to hover on and select a cycle 2019-07-28 12:26:53 +02:00
Dustin Carlino
557db1d3fe wrapping up something to interact with a diagram, using in signal editor
and standalone diagram explorer
2019-07-28 12:12:46 +02:00
Dustin Carlino
16926d57a1 upgrade glium, glutin, etc. fix the HIDPI issues properly! 2019-07-26 17:25:19 +02:00
Dustin Carlino
84ac102d05 fix major perf regression from modal menus getting sections. need to
call draw_queued for text once per frame, otherwise cache gets ruined
2019-07-26 16:26:41 +02:00
Dustin Carlino
3c2d794c62 sliders coupled with text boxes in wizards for picking times 2019-07-21 11:26:11 +02:00
Dustin Carlino
de929a5fb9 user-defined shortcuts 2019-07-14 11:22:37 +01:00
Dustin Carlino
d08c794cfe woops, didnt use GeomBatch for all the new ModalMenu stuff 2019-06-26 15:20:25 -07:00
Dustin Carlino
5e97c9f548 add a minimize/expand icon to modal menus 2019-06-26 12:14:43 -07:00
Dustin Carlino
8d1581241f render separators between groups of menu items. very messy
implementation, but many other ideas fell through, and this works.
2019-06-25 10:58:40 -07:00
Dustin Carlino
f7b5cf9a9f organize all modal menus into groups. dont render them yet. 2019-06-24 15:43:22 -07:00
Dustin Carlino
3958ec556e state transitions for nicely handling a few things... in particular,
clearing splash screen wizard state so we dont get stuck on a choice ;)
2019-06-22 20:05:12 -07:00
Dustin Carlino
6738de2488 draw text beneath Sliders, not in the ModalMenu 2019-06-20 14:48:32 -07:00
Dustin Carlino
cdacaef1a6 refactor menu text for all ItemSliders 2019-06-17 17:22:20 -07:00
Dustin Carlino
efb6954a97 refactor the combination of ItemSlider and Warper 2019-06-14 14:17:08 -07:00
Dustin Carlino
8c055312b4 refactor Warper to an ezgui widget, to use it in fix_map_geom 2019-06-14 12:45:46 -07:00
Dustin Carlino
1f34e591e0 debug_initialmap: use loading screens, stop depicting half-roads, draw
OSM tags non-invasively on the side, rename it, highlight degenerate
intersections
2019-06-13 13:20:24 -07:00
Dustin Carlino
0adeac1d53 remove the single point associated with intersections, now that we're
actually going to be mucking with geometry. it wasnt doing anything
useful anyway. also a round of clippy.
2019-06-12 10:10:04 -07:00
Dustin Carlino
47654b61cf make wizard acknowledge a bit easier to use. name psrc scenarios by time
range and fix some filename parsing
2019-06-10 13:29:23 -07:00
Dustin Carlino
53d87afa6e move hex parsing 2019-06-08 13:15:31 -07:00
Dustin Carlino
6221fd858b make edit mode's cross hatches less intrusive 2019-06-06 13:29:45 -07:00
Dustin Carlino
36cddbf5df recalculate current selection in all the places that used to before a big UI refactor. if not, hovering on agent + jumping savestates can crash badly. also refactor how mouseover is detected 2019-06-06 12:51:49 -07:00
Dustin Carlino
34e637773d simplify wizard.wrap API slightly 2019-06-05 13:13:33 -07:00
Dustin Carlino
b2ad0b5ae7 converting PSRC trips to a repeatable scenario. along the way,
parallelizing and refactoring a bit of psrc stuff
2019-06-05 12:58:06 -07:00
Dustin Carlino
0c6a93d38f introducing a basic slider to adjust speed of all route viz player and
sim. code duplication.
2019-06-04 14:22:11 -07:00
Dustin Carlino
0c4399e683 use mem::replace, not clone, for swapping TimeTravel states 2019-05-30 15:34:33 -07:00
Dustin Carlino
53addc79b9 use ItemSlider for time travel 2019-05-30 15:20:43 -07:00
Dustin Carlino
602a936440 using nom to create Text with inline colors. just using in a few places;
still buggy and kind of inconvenient actually.
2019-05-30 14:14:38 -07:00
Dustin Carlino
9faa2bf143 using MultiKey a bit more consistently 2019-05-29 14:13:46 -07:00
Dustin Carlino
53e2c3e905 hack in a way to easily check for ctrl+key. use to jump between
sandbox, debug, and edit modes
2019-05-29 14:08:59 -07:00
Dustin Carlino
35b3e4b7be round of clippy / unbreaking the build 2019-05-29 13:01:33 -07:00
Dustin Carlino
17b31582cb delete ModalMenu::hacky_new 2019-05-29 11:34:53 -07:00
Dustin Carlino
cce1b6ff88 making an ItemSlider to handle the common case of scrolling through items 2019-05-29 11:31:01 -07:00
Dustin Carlino
110140f391 union make_arrow polygon 2019-05-28 18:05:10 -07:00
Dustin Carlino
f2f16ad992 make slider just operate on percentages. use for scrolling time in all trip viz 2019-05-28 14:56:09 -07:00
Dustin Carlino
28b2734d59 starting a slider widget, using in easy places where the range is usize 2019-05-28 12:13:22 -07:00
Dustin Carlino
1cdbe0ea81 refactor parallelized pathfinding and use it in trip viz too 2019-05-24 12:50:01 -07:00
Dustin Carlino
788cd237a8 upload traffic signal Drawable once per state change 2019-05-23 11:31:28 -07:00
Dustin Carlino
d2dc7e52eb draw the traffic signal diagram on the left. stop caring where the
bottom left of a modalmenu is
2019-05-21 14:13:48 -07:00
Dustin Carlino
3a625f9a32 print percentages and number of samples in bar chart 2019-05-20 14:57:17 -07:00
Dustin Carlino
09493f9b7b remove old color shifting 2019-05-20 11:58:35 -07:00
Dustin Carlino
381883b357 display the stats with simple bar charts 2019-05-20 11:56:00 -07:00
Dustin Carlino
de51b1c154 simplify some render/ code by using GeomBatch 2019-05-17 13:14:58 -07:00
Dustin Carlino
222ddf6a96 use Distance, not f64, for some params in geom/ layer, simplifying other code 2019-05-17 12:42:36 -07:00
Dustin Carlino
db04553626 batch traffic signal drawing 2019-05-16 17:55:26 -07:00
Dustin Carlino
d5aebd4d4a prevent double-use of Escape key between context and modal menus 2019-05-15 11:02:02 -07:00
Dustin Carlino
5b6e541f9c fix mac scrolling and the directory name in the release script 2019-05-15 10:06:42 -07:00
Dustin Carlino
639ce25d09 hatching shader's stripes are now in map-space, are crosses, and have
color/size tuned
2019-05-12 18:35:12 -07:00
Dustin Carlino
f4620c1951 add basic hatching support to fragment shader. use it to visualize map
edits when zoomed in
2019-05-12 17:59:12 -07:00
Dustin Carlino
240efa5ad7 make warping be slightly snappier with impatient keypressing and a
minimum speed
2019-05-08 12:07:32 -07:00
Dustin Carlino
939f2fefdd adding hands to the bikes 2019-05-06 18:33:01 -07:00
Dustin Carlino
b0ca4429ad make turn blinkers work even when sim is paused 2019-05-06 12:56:19 -07:00
Dustin Carlino
26ee29ff62 actually do need to throttle redraws on loading screen 2019-05-05 19:07:54 -07:00
Dustin Carlino
272503873c avoid menu flickering and incorrect entries by sending a NoOp after used events 2019-05-05 18:23:36 -07:00
Dustin Carlino
08282186a7 only keep so many lines in the loading screen logger 2019-05-05 09:47:57 -07:00
Dustin Carlino
af30d93ba8 also reprint Timer lines -- has a bug, but this is a start 2019-05-04 17:47:02 -07:00
Dustin Carlino
73f32854be fix up other ezgui apps, run clippy 2019-05-04 17:25:05 -07:00
Dustin Carlino
a921469da9 dont special-case having a loading screen during make_gui. pass in EventCtx to make_gui to undo some hacks 2019-05-04 17:19:45 -07:00
Dustin Carlino
798a7b5354 be able to trigger a loading screen anywhere 2019-05-04 17:07:07 -07:00
Dustin Carlino
eed33931de proof-of-concept for gluing Timer to loading screen. hacky and not
featurefull yet.
2019-05-04 16:41:01 -07:00
Dustin Carlino
951e2f37ce flush text to display immediately, not at the end. prerequisite to drawing scaled text better 2019-05-04 15:36:40 -07:00
Dustin Carlino
2f66c8ca5c remember if modal menus are hidden or not 2019-05-04 09:30:44 -07:00
Dustin Carlino
625d9890d7 dont allow dupe keys in menus 2019-05-03 14:55:40 -07:00
Dustin Carlino
3db78d1ddd hacky way of showing context menu hotkeys in OSD 2019-05-03 14:21:43 -07:00
Dustin Carlino
4b4e6f17a0 start a really basic OSD 2019-05-02 12:38:12 -05:00
Dustin Carlino
08e1d3f353 place the context menu onscreen, be smart about going OOB 2019-05-02 12:02:15 -05:00
Dustin Carlino
96c3907655 combo calls to update prompt for ModalMenu 2019-05-01 21:45:34 -05:00
Dustin Carlino
a0b69db71e recalculate modal menu when resizing, hiding, updating prompt... 2019-05-01 17:00:23 -07:00
Dustin Carlino
bc3b883e2f optional modal menu keys 2019-05-01 16:22:14 -07:00
Dustin Carlino
3b6ecbf4af draw everything from ezgui in screencap mode 2019-05-01 16:14:15 -07:00
Dustin Carlino
913ec8d4c7 remove top menu from ezgui. unused right now, can restore it later if needed 2019-05-01 16:06:40 -07:00
Dustin Carlino
e767a704d3 remove old modal menu stuff from ezgui 2019-05-01 16:02:50 -07:00
Dustin Carlino
36df2e7908 convert more to NewModalMenu 2019-05-01 14:55:47 -07:00
Dustin Carlino
d10cbd9b7c manage the ModalMenu directly in each state, not in ezgui. convert 2
uses of it to start.
2019-05-01 14:00:46 -07:00
Dustin Carlino
1eb1b0ea40 slightly refactoring Text creation 2019-05-01 11:46:22 -07:00
Dustin Carlino
c904e9cdcf get rid of set_mode_with_extra; legend plugin is gone 2019-05-01 11:27:28 -07:00
Dustin Carlino
b42bba799d ModalMenus can be mostly hidden 2019-05-01 11:17:30 -07:00
Dustin Carlino
3b2c1a1d73 new warp function that autocompletes street names 2019-04-30 12:48:00 -07:00
Dustin Carlino
8b2d74cad8 simplify instructions after all the GUI refactor 2019-04-28 20:24:37 -07:00
Dustin Carlino
aa6f8f61fd make escape key work in modal menus 2019-04-28 20:16:27 -07:00
Dustin Carlino
2f6cc5fe4d remove vestiges of top menu being in the way 2019-04-28 20:10:00 -07:00
Dustin Carlino
8f69d5bbac woops, ModalMenus and context menus broke if the top menu didnt exist. :P decouple them 2019-04-28 18:06:17 -07:00
Dustin Carlino
a72e779a89 remove legacy mode, UI's new_event, the top_menu... impl GUI on Game, no
more forwarding to UI ever
2019-04-28 18:00:44 -07:00
Dustin Carlino
01628624c0 hotkeys on the wizard splash screen 2019-04-27 13:48:22 -07:00
Dustin Carlino
ce25f8bbf6 making menus support multi-line prompts 2019-04-24 16:51:35 -07:00
Dustin Carlino
2384157108 simplify ezgui API -- event takes &mut EventCtx 2019-04-23 21:28:03 -07:00
Dustin Carlino
6c247d376c clean up ezgui draw() API by putting screencap and naming_hint inside GfxCtx 2019-04-23 15:42:15 -07:00
Dustin Carlino
51db6887fa combine SplashScreen and About modes by adding LogScroller functionality to Wizard natively 2019-04-23 15:30:53 -07:00
Dustin Carlino
e627930757 draw text in map-space, except drawing zoomed-in text is extremely slow! 2019-04-23 14:12:30 -07:00
Dustin Carlino
320c91faf7 bam, variable font size 2019-04-22 20:17:18 -07:00
Dustin Carlino
008b2f9de5 preps for variable font size 2019-04-22 20:02:18 -07:00
Dustin Carlino
4eece7bae7 borrow text to draw, stop cloning everywhere 2019-04-22 13:29:24 -07:00
Dustin Carlino
26fd30191d removing controls from LogScroller, which doesn't do the right thing and
also crashes if you try to scroll
2019-04-22 11:06:07 -07:00
Dustin Carlino
45083198ea load different maps from splash menu 2019-04-21 15:59:04 -07:00
Dustin Carlino
17870baf9d actually start with a menu. just play and quit right now. 2019-04-21 13:32:28 -07:00
Dustin Carlino
8ff293bdc4 dont plumb last_data through ezgui layer. apps can just... store that themselves. removes unnecessary plumbing. 2019-04-21 13:20:40 -07:00
Dustin Carlino
0b4694dcba start splash screen wrapping everything. doesn't do anything yet 2019-04-21 13:05:03 -07:00
Dustin Carlino
4b1107bf57 clean up ezgui runner API 2019-04-20 15:10:03 -07:00
Dustin Carlino
a1176e053b use hotkey color in OSD, to make OSD slightly more readable 2019-04-19 16:05:06 -07:00
Dustin Carlino
46d24a7c58 compile on mac 2019-04-19 09:23:36 -07:00
Dustin Carlino
b610139f89 woops, screencap everything cut off the bottom and right 2019-04-15 11:42:38 -07:00
Dustin Carlino
9a2699aab9 take a single screenshot (hiding menus and stuff) 2019-04-15 10:07:50 -07:00
Dustin Carlino
0772e6e3c8 make_arrow only for PolyLine, simplify and improve the result in most
cases
2019-04-12 15:06:44 -07:00
Dustin Carlino
a9afc3efdd improve arrow API, at least -- creating them from a polyline is fine 2019-04-11 17:39:07 -07:00
Dustin Carlino
94d08efd61 clicking outside of a menu shouldnt do anything 2019-04-03 15:16:54 +09:00
Dustin Carlino
35d6995a7b starting a plugin to visualize a scenario, by just displaying
neighborhood polygons
2019-04-03 15:03:07 +09:00
Dustin Carlino
0cf9e1a1cd draw a simple loading screen 2019-04-03 08:24:06 +09:00
Dustin Carlino
7100900714 load different glsl versions 2019-03-18 14:58:41 -07:00
Dustin Carlino
8bf8b958d7 supporting glsl 110 as well as 140 2019-03-18 12:26:40 -07:00
Dustin Carlino
3eb5270d51 trying to cross-compile to windows. making some unix-only dependencies
optional.
2019-03-11 17:09:47 -07:00
Dustin Carlino
5ca359998c upgrade some dependencies and list data source licenses in README 2019-03-11 16:04:47 -07:00
Dustin Carlino
cab95e91e2 dont redraw on ignored Update events either 2019-03-11 13:15:16 -07:00
Dustin Carlino
0c26e3e127 dont redraw if key release event was unused 2019-03-11 13:08:57 -07:00
Dustin Carlino
40206eccc3 removing most log usage from editor 2019-02-20 11:29:36 -08:00
Dustin Carlino
1848387ef0 starting to organize warnings in a much more reasonable way. 2019-02-20 10:08:02 -08:00
Dustin Carlino
e4e07e7ba6 make it easier to debug areas 2019-02-18 15:56:15 -08:00
Dustin Carlino
5830908604 version control checksums of screencaps for all maps... well,
still not small_seattle. :P
2019-02-17 14:27:48 -08:00
Dustin Carlino
e445f972dd move ToggleableLayers out of ezgui, stop associating a zoom with them 2019-02-14 16:51:27 -08:00
Dustin Carlino
c3cbd47645 organize DES model code a bit 2019-02-14 14:00:44 -08:00
Dustin Carlino
06c8ed72a9 flag-based profiling of GUI 2019-02-14 13:16:43 -08:00
Dustin Carlino
a2e2c3311e drawing border arrows way better 2019-02-12 14:42:03 -08:00
Dustin Carlino
6a573dfbd0 use better glium buffer types 2019-02-11 14:08:43 -08:00
Dustin Carlino
d655bdc588 pass color to GPU as u8, not f32 2019-02-11 13:52:17 -08:00
Dustin Carlino
72e823c2c6 only have one Prerender object constructed, simplifying the plumbing of the Cell counters 2019-02-11 12:14:43 -08:00
Dustin Carlino
1d3e4284a7 do some tracking of video memory used by RenderMap 2019-02-11 12:02:29 -08:00
Dustin Carlino
8693bbc1e3 import residential building dataset 2019-02-10 19:24:34 -08:00
Dustin Carlino
ec01207369 try upgrading rand and serde again 2019-02-10 15:57:28 -08:00
Dustin Carlino
72b044c64f plugin to show roads connected to intersection. surprisingly useful for debugging merged intersections sometimes 2019-02-09 11:46:31 -08:00
Dustin Carlino
579097dbb1 fiddling with the event loop. simplified code, but didn't fix issues. 2019-02-06 12:58:26 -08:00
Dustin Carlino
e1155a1d9c WIP stabilize screenshotting 2019-02-05 15:18:02 -08:00
Dustin Carlino
72b39b0401 aha, a slight optimization to not call draw() when events happen that aren't even sent to the application 2019-02-05 15:10:15 -08:00
Dustin Carlino
40d3c6b0ca count all Prerender uploads, not just the ones that happen in draw() 2019-02-05 15:02:10 -08:00
Dustin Carlino
e0fd39bb7c stop requiring hotkeys for TopMenu folders 2019-02-02 16:09:30 -08:00
Dustin Carlino
d08751fb64 preupload pedestrian geometry 2019-02-02 13:44:27 -08:00
Dustin Carlino
61d1d2fe83 revamp handling of onscreen stuff. no more callback plumbing, and can
plumb prerender successfully into dynamic stuff. just can't do as much
work directly in DrawMap.
2019-02-02 12:32:07 -08:00
Dustin Carlino
e4b95c936b organizing ezgui into subdirectories 2019-02-01 09:55:25 -08:00
Dustin Carlino
06b8c26716 split ezgui runner into setup and loop functions 2019-02-01 09:30:01 -08:00
Dustin Carlino
bd7d18592b simplify screenshot internals 2019-02-01 09:23:16 -08:00
Dustin Carlino
8c80755bbd moving screenshot code into a module 2019-02-01 09:09:27 -08:00
Dustin Carlino
5181a3db34 starting to move some text drawing code out of canvas 2019-01-31 23:40:15 -08:00
Dustin Carlino
64573ea0ea own canvas inside of ezgui, not in applications. lots of refactoring
unlocked now...
2019-01-31 22:33:36 -08:00
Dustin Carlino
7519fdf584 using strong Distance types in many more places 2019-01-30 15:54:54 -08:00
Dustin Carlino
4d5bafd551 slightly simplify interaction between Canvas and text module 2019-01-26 10:25:08 -08:00
Dustin Carlino
067ee108c7 make screencap work (and more simply) with custom event loop 2019-01-26 10:04:20 -08:00
Dustin Carlino
8afe83162b collapsing all lane markings into a single Drawable 2019-01-25 11:21:46 -08:00
Dustin Carlino
25bc02fb32 using prerender for lanes... a good start. 2019-01-25 10:38:40 -08:00
Dustin Carlino
623e578665 inverting the ezgui/GUI control to plumb Prerender 2019-01-25 10:19:58 -08:00