Commit Graph

1671 Commits

Author SHA1 Message Date
Dustin Carlino
05efb41ef6 bus layer can toggle trains/buses 2020-07-15 16:06:13 -07:00
Dustin Carlino
891a1746d6 try to figure out border endpts for routes for #190. just visualize
them, dont enforce connectivity yet. so many problems...

regenerate stuff, to unbreak map binary format
2020-07-15 15:35:57 -07:00
Dustin Carlino
91a9a9a1bc start revamping bus route data model for #190. routes are one-way. make
buses appear at the first stop and vanish at the last.

not regenerating anything yet
2020-07-15 13:15:32 -07:00
Dustin Carlino
0ad14d17ac settle on american spelling of center 2020-07-15 11:37:37 -07:00
Dustin Carlino
ccf0b2f647 improve car/bike zordering when crossing z levels 2020-07-15 10:04:47 -07:00
Dustin Carlino
4a118c8103 import berlin city centre for #119 2020-07-15 09:42:45 -07:00
Dustin Carlino
5806e60eec represent cancelled trips differently than aborted trips 2020-07-15 09:11:01 -07:00
Dustin Carlino
98b9115f88 better tool to explore degenerate roads 2020-07-14 21:02:33 -07:00
Dustin Carlino
614354271a see modified trips in the table and info panels 2020-07-14 16:10:50 -07:00
Dustin Carlino
7341c0189a plumb through which trips (and people) are affected by an experiment. no
UI exposure yet.
2020-07-14 14:49:04 -07:00
Dustin Carlino
5b7cf6d532 refactor BulkSelect. use it for access-restricted zones too! 2020-07-14 14:20:40 -07:00
Dustin Carlino
2c27c89796 correctly detect the current tab, even when inner settings change. also
make tab per object type sticky, so you can (for example) click arrivals
on one border, then click a different border and be on the same tab!
2020-07-14 13:37:13 -07:00
Dustin Carlino
7cd0c77068 plot scheduled arrival rate at borders. downtown is crazy. 2020-07-14 12:57:58 -07:00
Dustin Carlino
7880d646ca rewrite AgentColorScheme, add the parking color to the legend 2020-07-14 10:09:17 -07:00
Dustin Carlino
d31ead5788 clearly show cars just cruising around trying to park, so it's
abundantly clear when parking availability is squeezed. need to change
the minimap legend now.
2020-07-14 09:33:10 -07:00
Mateusz Konieczny
289b3561df
it is just city center, not entire one (#193)
neither Bronowice, nor Nowa Huta are included

Entire one should included airport terminal on West ( https://www.openstreetmap.org/?mlat=50.0701&mlon=19.7960#map=12/50.0701/19.7960 )
and reach main steelwork entrance on East ( https://www.openstreetmap.org/?mlat=50.0787&mlon=20.0682#map=12/50.0787/20.0682 )

Current area is fitting (capable of running on my laptop) and good one if one wants to play solely with city center, just name is misleading.
2020-07-14 07:55:38 -07:00
Dustin Carlino
33c5ffef4c first wave of character art from holly!!! 2020-07-13 21:09:36 -07:00
Dustin Carlino
0f82c21560 - manually fix a few crazy signals downtown.
- interpret tags to make 3rd Ave bus-only. cars technically allowed
  sometimes, but bus-only is more accurate for now.
- also remove austin from bundled maps. maintaining it has a cost, and
  the point was just to have at least one non-seattle city kept up to
  date.  krakow now satisfies that.
2020-07-13 13:40:46 -07:00
Dustin Carlino
b68e233125 trying to handle gridlock near tiny roads for #114. treat the entire
sequence as one thing to lock -- don't start it until it's clear, and
prevent new conflicting turns once started. disable block-the-box
protection inside.

I'm not sure this is helping at all yet. maybe it's just more complex.
2020-07-13 12:30:24 -07:00
Dustin Carlino
52ab8b5ec3 get zorder correct for unzoomed roads/intersections. regenerate this
layer when making edits, since intersections can change (interesting to
not) and also roads (access restrictions)
2020-07-12 09:31:30 -07:00
Dustin Carlino
faedffae99 finally flushed out one of the common crashes: shifting some car bodies
to make wheels breaks sometimes. just skip the wheels.
2020-07-11 17:10:36 -07:00
Dustin Carlino
0c283d0da7 finish up the grand geom stabilization with ring and some docs.
regenerated everything from scratch. one effect is more parking
blockface gets matched onto border roads, but that's fine.
2020-07-11 16:05:26 -07:00
Dustin Carlino
07ed1fec95 more polyline work... get rid of Warn<>. extremely spammy and hasn't
been helpful in ages.
2020-07-11 15:17:16 -07:00
Dustin Carlino
f8b8c501ae tighten up more PL scariness 2020-07-11 14:51:25 -07:00
Dustin Carlino
cce624edd8 start the big one: Polyline::new 2020-07-11 13:42:19 -07:00
Dustin Carlino
0593aa52d9 more caution in Line API 2020-07-11 13:05:34 -07:00
Dustin Carlino
98c6f46c78 the first real big change: Line::new always returns Option 2020-07-11 12:37:38 -07:00
Dustin Carlino
0dd3199f7a cut down variations of pt2d<->gps. mostly we want to forcibly convert.
possible semantic change: soundcast border matching now includes ALL
borders, even if the center is slightly OOB
2020-07-11 12:02:12 -07:00
Dustin Carlino
0f11da79bd start replacing assertions and panics with results or better error
messages. covering all of the easy things in the geom crate.
2020-07-11 11:35:03 -07:00
Dustin Carlino
4919fbf90f autodetect ICs across the whole map, not just when there are complex
turn restrictions

and... enable the new "run the red light" after starting an uber-turn. I
can get to 6am on downtown with a few simple edits now.
2020-07-10 17:39:25 -07:00
Dustin Carlino
05c47852b0 color buildings with some amenity slightly differently. and grab fresh krakow osm data 2020-07-10 11:20:56 -07:00
Dustin Carlino
d00bbb31c3 filter parcels outside of the boundary polygon. speed up the kml viewer 2020-07-10 10:56:02 -07:00
Dustin Carlino
873c14a5b6 when previewing traffic signals after deleting phases, need to possibly
reset the phase counter to fix #179
2020-07-10 09:34:45 -07:00
Dustin Carlino
585ba4f137 when sidewalks=separate, don't put sidewalks on both sides of a one-way.
this is a complete guess, but seemingly a better one for some sample
cases in seattle and krakow. helps with #178.

also opt krakow into screenshot diff testing; it has enough different
things happening that it's worth watching more carefully how importing
changes affect it.
2020-07-09 18:53:15 -07:00
Dustin Carlino
3ecf05e1bb add/rm roads from zones. not handling merges/splits yet. 2020-07-09 16:38:19 -07:00
Dustin Carlino
19409dfc8c add krakow as an optional city. need to specify more customization for #171, and given how much work is focused here, using the one-shot importer no longer makes sense 2020-07-09 14:33:39 -07:00
Dustin Carlino
ead4a99682 prototype a better random traffic generator 2020-07-09 13:04:41 -07:00
Dustin Carlino
4340ad585b convert the rest of usize IDs to u32. savings:
maps: 645mb -> 625mb
scenarios: 431mb -> 390mb (before all the u32 optimizations, this as
500mb!!!)
prebaked: 80mb -> 73mb

and while I'm at it, grab fresh OSM, with lots of manual lane fixes,
especially near divided highways
2020-07-09 11:43:34 -07:00
Dustin Carlino
3370aae83b don't spawn new traffic on the screensaver every time we bounce off the
screen edge. the scenario generator starts person IDs from 0, so was
breaking. fixes #172
2020-07-09 10:08:58 -07:00
Javed Nissar
c8b12c40bb
Resolve #13 by adding traffic to the title screen in order to make the (#144)
title screen more visually interesting
2020-07-08 19:38:58 -07:00
Dustin Carlino
d94c993b9b debug #113 2020-07-08 16:18:54 -07:00
Dustin Carlino
95626d5b64 fix rendering crash 2020-07-08 15:57:19 -07:00
Dustin Carlino
7c0aaed370 the first link light rail has left the staton. #numtot 2020-07-08 14:29:02 -07:00
Dustin Carlino
14010e3be2 transform trip mode, filtering on existing mode and departure time range 2020-07-08 10:46:23 -07:00
Dustin Carlino
94512d95b9 change LaneID from usize to u32. savings:
scenarios: 458MB -> 431MB
maps: 676MB -> 638MB
prebaked: 85MB -> 80MB

also fix #163
2020-07-08 08:47:02 -07:00
Dustin Carlino
df0d07df5e optionally show all roads used by buses in the bus layer. useful to know when edits might affect a route 2020-07-08 07:50:20 -07:00
Dustin Carlino
187c8ad4c5 consider again the possibility of merging some degenerate roads 2020-07-07 21:39:42 -07:00
Dustin Carlino
d1fdcbbd59 fix more relative dir bugs. allow different directory for player data too. fixes #160 2020-07-07 16:49:46 -07:00
Dustin Carlino
4aaa41dd13 zip screenshots in dropbox, because managing individual files keeps crashing the daemon 2020-07-07 16:31:52 -07:00
Dustin Carlino
3eb8db3f75 interpret OSM center lines as the physical center of the road (excluding
sidewalks), not as the divider between the two directions. this
dramatically changes geometry everywhere for the better.

thanks to
https://wiki.openstreetmap.org/wiki/Proposed_features/placement for
clear explanations. will be looking next at interpreting this tag.

also temporarily removing screenshots, because uploading individual
files and waiting for dropbox to sync isn't sustainable
2020-07-07 15:52:51 -07:00
Dustin Carlino
35768dfba3 fix the city picker after the relative dir refactor 2020-07-07 13:17:38 -07:00
Dustin Carlino
302363541f better error message for the common case of map data 2020-07-07 13:14:33 -07:00
Dustin Carlino
9f72b3dd51 cleanup after the relative dir fix, and add support for hardcoding the
data dir, for #137
2020-07-07 12:14:02 -07:00
Dustin Carlino
6919c24bf8 detect the data/ dir more intelligently. fixes #73. still need to
- consider collapsing the directory structure in the releases
- fix wasm

[rebuild]
2020-07-07 11:09:35 -07:00
Dustin Carlino
46b340728f quitting from a cutscene should actually cancel the challenge entirely. fixes #153 2020-07-07 07:58:31 -07:00
Dustin Carlino
906a647ade better error messages for turn restrictions. fixes #146 2020-07-07 07:37:02 -07:00
Dustin Carlino
476e0e101f easy wins: make BuildingID u32, not usize. maps from 680MB to 676MB.
scenarios from 500MB to 458MB.

considered going down to u16, but pretty sure there are already maps
with >65k buildings
2020-07-06 17:55:02 -07:00
Dustin Carlino
d52a0e8a35 new scenario mod: force everyone to make a mode change 2020-07-06 16:29:51 -07:00
Dustin Carlino
1e41b48753 squeeze the route select tool into the main bulk select UI 2020-07-06 15:18:12 -07:00
Dustin Carlino
fbff30a869 fix some epsilon issues with deadends and walking turns to get entire
krakow map to import. closes #143
2020-07-06 14:24:31 -07:00
Dustin Carlino
82345767c9 store a bitset of access restrictions per road. derive zones from this only for editing and pathfinding. this unblocks editing zones 2020-07-06 13:09:49 -07:00
Dustin Carlino
c3858b9cdd mark construction lanes appropriately. this broke when adapting to the new tagging on the west seattle bridge, but there are some roads tagged this way in krakow.
(not regenerating all the maps yet, expecting to do more work on this
today)
2020-07-06 07:43:42 -07:00
Dustin Carlino
8ba32f3b86 simplify the UX for finishing a challenge with unsaved edits. finally fixes #110 [rebuild] 2020-07-05 14:47:25 -07:00
Dustin Carlino
5bc7954de3 simplify the UX for quitting sandbox with unsaved edits. almost done
with #110
2020-07-05 14:33:08 -07:00
Dustin Carlino
d987879389 gracefully handle editing the currently active traffic signal phase live in the challenge mode 2020-07-05 14:18:00 -07:00
Dustin Carlino
5427d8ea40 also express lane type changes using the new approach 2020-07-05 14:04:49 -07:00
Dustin Carlino
6e8eef8d09 start refactoring how edits are validated. need to deal with lane types
next
2020-07-05 13:20:19 -07:00
Dustin Carlino
5daab4fdbc allow closing intersections in maps with sidewalks that start off disconnected. just dont allow disconnecting anything new. 2020-07-05 11:37:03 -07:00
Dustin Carlino
422889e543 lazily render lanes, same as road labels. greatly speeds up start-up times (helps with #125), doesnt melt the GPU on large maps. also paves the way for dynamically adjusting z-order rendering (for #126)
because we no longer try to upload massive gobs of data to the GPU at
once, huge_seattle on my system goes from initially loading in about a
minute down to 11s
2020-07-05 11:30:34 -07:00
Dustin Carlino
8b7658c48f dont crash when closing a traffic signal with disconnected sidewalks 2020-07-04 18:08:54 -07:00
Dustin Carlino
181de12409 woops, 72d0171300 broke signal editor by
crashing if you were missing a turn. dont validate in the middle of
editing. still seeing a problem with traffic signal -> construction
2020-07-04 17:51:45 -07:00
Dustin Carlino
5a677eb2ec optionally dont draw in jump-to-time, to help with #125 2020-07-04 13:37:29 -07:00
Dustin Carlino
068b4223c8 prototype controls for hiding z-orders, for #126 [rebuild] 2020-07-04 13:18:27 -07:00
Dustin Carlino
f02fa8bddd add a tool to export roads to https://github.com/d-wasserman/shared-row 2020-07-04 11:29:45 -07:00
Dustin Carlino
505311a93f improve the signal synchronization a bit for #8. hardcode a few small
intersections to make the downtown map make more progress. make it
easier to copy OSM node IDs.
2020-07-04 08:53:13 -07:00
Dustin Carlino
575dcfb782 snap bus vehicle/sidewalk positions to the correct side of the road and
a more appropriate lane. also fix #122
2020-07-03 19:00:20 -07:00
Dustin Carlino
ac88a96f61 use a different icon for train stops 2020-07-03 17:49:36 -07:00
Dustin Carlino
0dc42d7e19 use bus stops from OSM instead of gtfs. expose the stop name and the
driving position in the info panel. some issues with the driving
positions, but this is the way forward for light rail.
2020-07-03 15:22:13 -07:00
Dustin Carlino
4f507ef96a refactor Composite style 2020-07-03 13:01:54 -07:00
Dustin Carlino
8b006c037d slim down sidewalk corners, at the repeated urging of julian 2020-07-02 17:12:08 -07:00
Dustin Carlino
ec2411fb8b experiment with isochrones. nothing yet. 2020-07-02 13:41:24 -07:00
Dustin Carlino
6b409b42d0 make the UI understand deleting a zone 2020-07-02 12:48:20 -07:00
Dustin Carlino
0a499f65e2 start changing access restrictions for an entire zone. found a way to
represent the edits. no support yet for changing what roads are in a
zone.
2020-07-02 12:15:37 -07:00
Dustin Carlino
7d4cf4cd5b follow up to #59. when we do the no-op events, have to plumb back
updates. this is needed when we push on new states to warp somewhere or
jump to a time or do anything else requesting updates
2020-07-01 22:07:54 -07:00
Dustin Carlino
72d0171300 fix #111 by delaying constructing ControlTrafficSignal from edits. also
fix time warp screen issue after the UpdateType changes [rebuild]
2020-07-01 19:34:15 -07:00
Dustin Carlino
a62e3133db cleanup after #59:
- cargo fmt
- update some comments
- remove EventLoopMode
- if no updates are requested, that's the equivalent of InputOnly
2020-07-01 17:57:43 -07:00
Javed Nissar
1f58cbf16d
Refactor event update loop (#59)
* Refactor event update loop to enable multiple game update types

* Implement pan event to improve panning with cursor at edge of screen and
fixed formatting
2020-07-01 17:47:30 -07:00
Dustin Carlino
1422643973 finish the ezgui layout refactor. most things are way more consistent now, and with less code 2020-07-01 15:39:04 -07:00
Dustin Carlino
834f060462 yet more layout refactor 2020-07-01 15:31:52 -07:00
Dustin Carlino
f9cfe136e0 new save edits UI, not using wizard. using for:
- save as dialog
- loading new edits

still TODO:

- leaving sandbox mode
- final score challenge screen

part of #110
2020-07-01 13:11:58 -07:00
Dustin Carlino
ef51a8b9b8 more layout refactor 2020-07-01 12:11:00 -07:00
Dustin Carlino
c61371a777 variant of row/col that have good default margins. starting a big
refactor to make everything consistent. not sure mechanical refactor is
right here. lots left, but a start.
2020-07-01 09:50:35 -07:00
Dustin Carlino
c191ffde9a filter out broken edits (which happen due to schema changes) 2020-06-30 19:48:25 -07:00
Dustin Carlino
2c7440b03f start representing access restrictions by mode 2020-06-30 13:15:57 -07:00
Dustin Carlino
2b4bf1172b start a UI for modifying access restrictions of zones. mostly just the
skeleton right now
2020-06-30 12:16:08 -07:00
Dustin Carlino
2b50e7969c refactor position 2020-06-29 20:55:36 -07:00
Dustin Carlino
1617a3d3c1 skip missing maps in the city picker 2020-06-29 09:36:37 -07:00
Dustin Carlino
c97bd0fe4b some cleanup after #106. unbreak importer 2020-06-28 11:13:35 -07:00
phimuemue
a675e72d25
Avoid collect et al (#106)
* Avoid unconditional collect in get_lane_types

* Introduce Road::children(fwds)

Simplifies direction-aware lane retrieval.

* Simplify all_lanes

* Avoid unneeded collect

* Avoid some Vec copying

* Avoid unconditional collect

* Avoid some collect

* Avoid clone

* Avoid collect

* Avoid collect

* Avoid collect

* Avoid collect

* Avoid collect

* Avoid collect

Co-authored-by: Dustin Carlino <dabreegster@gmail.com>
2020-06-28 11:00:09 -07:00
Dustin Carlino
63d16a16c3 speed up the trip table tab. on lakeslice at 8am, down from ~0.3s to
~0.005s in release mode
2020-06-28 10:44:21 -07:00
Dustin Carlino
bb3da1f8eb Make a very primitive form of adaptive traffic signal phases. It should
be easier to write better policies now; this mostly does the work of
changing the map model and UI to handle variable timing. A small step
towards #91
2020-06-28 10:20:47 -07:00
Dustin Carlino
ae6c099bd5 start bringing in private broadmoor roads. omit from the CH, so trips will just fail without a path for now. 2020-06-27 16:19:48 -07:00
Dustin Carlino
a6b90d00d8 very simple modifier to cancel all trips for some percentage of people 2020-06-27 14:20:25 -07:00
Dustin Carlino
90b556ac1f carve out a way to modify the weekday scenario in the UI. express the 5 day repeat using this 2020-06-27 11:56:45 -07:00
Dustin Carlino
2881341b63 make parking lots hideable. dont snap parking and sidewalk hints to
light rail. not regenerating all the maps again yet to avoid some churn
2020-06-26 17:02:14 -07:00
Dustin Carlino
eab0988bd8 hello light rail! just import the tracks, represent as a new lane type.
make clipping handle starts and ends separately
2020-06-26 16:47:18 -07:00
Dustin Carlino
16beebd1de use underlining to refer to edits, not quotes. only in some places. :\ 2020-06-26 14:13:12 -07:00
Dustin Carlino
bfd1b9c190 rotate labels on buses, now that i figured out how to do it reasonably on roads 2020-06-26 11:31:27 -07:00
Dustin Carlino
77fa6eb43d switch to upstream usvg, now with support for a loaded-once fontdb that
only uses bundled fonts, not system fonts. side effect is that
apparently the overpass font doesn't have ▼, so switch to a silly down
arrow for now
2020-06-26 11:22:22 -07:00
Dustin Carlino
7fa26dfc90 add a mode to draw every zoomed agent, to help flush out bugs like #98 and #72 faster 2020-06-25 10:55:17 -07:00
Dustin Carlino
b3a480b4c1 clean up old trip positions from Sim. implement the all-route debugger
in a more straightforward way
2020-06-25 09:20:54 -07:00
Dustin Carlino
bc6482c522 include camera state and edits in the crash report. would make it easier to repro #98 and #72 2020-06-25 09:02:50 -07:00
Jeff Raymakers
56277bbbad
fix math in city picker to use scale factor (#102)
Co-authored-by: Jeff Raymakers <jephy@gmail.com>
2020-06-24 23:02:05 -07:00
Tim Newsome
4ccd13c8e1
Round time to 10 minutes in jump to dialog (#100)
This allows me to quickly and precisely jump to the same time every
time.
2020-06-24 20:55:18 -07:00
Dustin Carlino
097b33c80a release another attempt at a windows fix 2020-06-24 17:20:21 -07:00
Dustin Carlino
915713babb to mitigate #95, add a setting to adjust scroll speed 2020-06-24 14:26:15 -07:00
Dustin Carlino
dd13ade952 more fluidly jump from lane editor to intersection editors. but not vice
versa, because it'd be too easy to accidentally lose complicated
intersection edits
2020-06-24 13:49:09 -07:00
Dustin Carlino
2de540ed46 load edits also includes proposals. if opened, it makes a local copy 2020-06-24 13:28:02 -07:00
Dustin Carlino
e586760ef7 autosave was a lie. actually do it after any edit, not just when loading new edits 2020-06-24 12:06:06 -07:00
Dustin Carlino
8a8d088ceb show number of finished trips in the time warp screen, as a quick proxy for if a change is helping/hurting gridlock 2020-06-24 11:53:25 -07:00
Dustin Carlino
d933352d93 fix unintentional trip timeline spacing 2020-06-24 08:53:56 -07:00
Dustin Carlino
07bf9725d4 use a regularly spaced marking for construction instead of the weird
stripes. clean up the hack in the shader
2020-06-24 08:36:47 -07:00
Dustin Carlino
626636ece7 remove turn lookup. have always found myself using the src lane. edits invalidated it anyway 2020-06-23 18:36:45 -07:00
Dustin Carlino
684bf72dde recalculate stop signs when lanes change; construction->driving was
breaking the west seattle bridge. fixes #68. include a built-in proposal
to fix the bridge. ;)
2020-06-23 17:46:35 -07:00
Dustin Carlino
d707969af5 remove mt_baker map and replace it with a much wider south_seattle map,
per request [rebuild]
2020-06-23 16:41:36 -07:00
Dustin Carlino
b267997554 add debugging for #65 and try setting the initial window size differently [rebuild] 2020-06-23 10:59:56 -07:00
Dustin Carlino
7f6beb73db mac keyboards maybe dont have right ctrl, use left ctrl instead [rebuild] 2020-06-23 10:38:41 -07:00
Dustin Carlino
05cf8c113f depend on rust-native TLS to fix #77 and adjust some wording to fix #80 2020-06-23 09:00:41 -07:00
Dustin Carlino
a9b2a33ffc windows fixes:
- the updater script was clobbering clobber data/
- window resize events seem to capture title bar (#65)
[rebuild]
2020-06-22 15:51:42 -07:00
Dustin Carlino
6ff190065c hold the presses!
- dont scale the lyon-powered thick lines by the DPI, to help #61
- move the message panel to the left for one part of the tutorial, to
help #62
- adjust some tutorial wording
- let people skip tutorial stages
[rebuild]
2020-06-21 23:04:35 -07:00
Dustin Carlino
9672565efd - still reset edits after saving them and continuing
- hide unfinished uber-turn editor
[rebuild]
2020-06-21 16:59:31 -07:00
Dustin Carlino
eedf80bfef tiny tweaks from final testing:
- cutscene wording
- elide traffic tab on parking lanes
- dont crash when traffic signal data needs fixing, just warn more
loudly. this lets lanes near some signals actually be modified
2020-06-21 11:38:34 -07:00
Dustin Carlino
506077a7b7 fix road labels. enable them by default! 2020-06-20 15:26:54 -07:00
Dustin Carlino
b231809ba2 cap hill's rainbow crosswalks! [rebuild] 2020-06-20 10:05:47 -07:00
Dustin Carlino
4dd2835cd4 fix most of the angle inversion mess! 2020-06-19 20:25:47 -07:00
Dustin Carlino
c66564dd9d try out a new style for road labels 2020-06-19 20:12:25 -07:00
Dustin Carlino
5a9fb4ceef starting work on a brute-force traffic signal heuristic. organizing
existing code better.
2020-06-19 13:07:42 -07:00
Dustin Carlino
f5385b83df restore raw throughput counts deleted in
ca33695431, flagged off, for further
exploration of compressed representations. also, apparently lakeslice
prebaked results have been missing for a while due to dropbox snafu! fix
2020-06-19 11:04:07 -07:00
Dustin Carlino
288e90e530 use lyon for stroking line plots 2020-06-18 17:44:12 -07:00
Dustin Carlino
a25994123b lift filtering out of scatter and line plots. makes everything
responsive by default and is way simpler. [rebuild]
2020-06-18 15:48:46 -07:00
Dustin Carlino
4aeb80cfce recompute scatter plot avg when filtering stuff. but actually, should
probably implement the filtering differently anyway...
2020-06-18 14:50:48 -07:00
Dustin Carlino
b5e9d64a9b optionally use arrow keys to pan the map. need this for filming a trailer. fixes #10. also make the settings panel layout less horrific 2020-06-18 12:44:47 -07:00
Dustin Carlino
bc8f352600 when people are riding a bus, map them to the bus instead of just crashing 2020-06-18 11:23:09 -07:00
Dustin Carlino
6d395cbe5c slightly adjust the compare throughput layer. fixing crash with cached
routes in timeline [rebuild]
2020-06-18 10:47:38 -07:00
Dustin Carlino
26cdde056c fix throughput and delay max_x and disable comparison by default 2020-06-17 15:05:31 -07:00
Dustin Carlino
ca9202c1e8 group the before/after series in line plots 2020-06-17 14:33:27 -07:00
Dustin Carlino
0dddd1d6c1 one last pass for polishing all layers. layout and text tweaks 2020-06-17 14:01:05 -07:00
Dustin Carlino
d2c674eb9a per suggestion of a cugos member, color all parked cars the same. distinguishing moving cars is helpful, but not parked ones 2020-06-17 11:15:14 -07:00
Dustin Carlino
82ba62df29 quick round of refactoring layer code 2020-06-17 10:56:06 -07:00
Dustin Carlino
1d252bbc40 cleaning up the last of Colorer, and quick_menu too while I'm at it 2020-06-17 10:36:18 -07:00
Dustin Carlino
140ee166be refactoring more color scale stuff 2020-06-16 15:28:17 -07:00
Dustin Carlino
52470ed9ff switching to proper gradients for heatmaps too 2020-06-16 14:33:20 -07:00
Dustin Carlino
dd84087398 cleaning up more layers. got rid of ::scaled finally. refactoring
percentile handling. got rid of old color scales
2020-06-16 12:51:06 -07:00
Dustin Carlino
458b44bef9 tearing down Colorer::scaled in favor of a newer, simpler thing. also
switching more layers to a monochrome gradient. just a first step...
2020-06-16 11:38:43 -07:00
Dustin Carlino
0477d38c09 consistently showing layers while zoomed. it's useless in some cases,
but helpful in many. just need to find a better way to show detail on
lanes.
2020-06-16 09:54:15 -07:00
Dustin Carlino
50de52439f tune wording of tutorial. finally introduce the drone [rebuild] 2020-06-15 17:33:37 -07:00
Dustin Carlino
647eb99fe6 put the intro story in front of the tutorial 2020-06-15 16:01:17 -07:00
Dustin Carlino
851237bed5 clamp minimap recentering a bit better [rebuild] 2020-06-15 14:25:04 -07:00
Dustin Carlino
6c1fdcace1 overhaul worst traffic jam layer 2020-06-15 14:07:16 -07:00
Dustin Carlino
c1e1a9c37d refactoring some gradient lerping stuff 2020-06-15 13:11:54 -07:00
Dustin Carlino
a86ef0fa12 start revamping layers. for delay, have zoomed and unzoomed views. always use gradients. 2020-06-15 12:51:32 -07:00
Dustin Carlino
bfaefe1df3 implement new, better word wrap. remove the old way. applied everywhere
except tutorial instructions, since those need rewriting soon anyway
2020-06-15 11:42:09 -07:00
Dustin Carlino
d1695e904e trigger [rebuild] 2020-06-14 19:20:14 -07:00
Dustin Carlino
915c734849 organizing layer picker 2020-06-14 13:59:58 -07:00
Dustin Carlino
501b65c1e6 finishing up signal editor arrow outlines 2020-06-14 13:28:15 -07:00
Dustin Carlino
64fba66e42 add links to proposal write-ups and adjust the UI for that page 2020-06-14 13:04:28 -07:00
Dustin Carlino
5cda64d6fd adjusting start/end marker icons 2020-06-14 12:32:44 -07:00
Dustin Carlino
d437152be4 add an intro story cutscene to motivate the whole game [rebuild] 2020-06-13 20:44:46 -07:00
Dustin Carlino
57651fd270 fix crash with loading edits. still draw modified layer in edit mode.
communicate autosaving a bit better
2020-06-13 16:37:13 -07:00
Dustin Carlino
d92f4536e2 introduce superblock proposal [rebuild] 2020-06-12 21:14:09 -07:00
Dustin Carlino
7cc8c4724a start reviving the edit mode changelist. time is a flat circle? 2020-06-12 18:21:30 -07:00
Dustin Carlino
01d55991c8 quick fixes after meeting:
- tweaks to demand panel
- put missing turns first
- "before changes" -> "before 'edits name'"
2020-06-12 15:40:47 -07:00
Dustin Carlino
75fa0b8373 recenter minimap when dragging until the camera is out of frame 2020-06-12 13:00:45 -07:00
Dustin Carlino
c20a8ea36b tuning plot appearance: labels, grid, titles, bg and outline 2020-06-12 12:12:01 -07:00
Dustin Carlino
14c7518787 break down delay by agent 2020-06-12 11:37:12 -07:00
Dustin Carlino
e059ebdb36 starting to fix up signal editor colors. simple bugfix to maybe prevent
all cases of turn icons overlapping? [rebuild]
2020-06-11 18:12:11 -07:00
Dustin Carlino
269bdc9171 dont force reset from midnight in survivor mode! 2020-06-11 16:30:31 -07:00
Dustin Carlino
4e746cc033 more carefully ban some edits in survivor mode 2020-06-11 15:24:46 -07:00
Dustin Carlino
dfb9e7e349 move gameplay meters to the side. also start capturing logs for linux
and mac too
2020-06-11 14:55:56 -07:00
Dustin Carlino
be3b93625d dont compute pathfinding upfront by default. [rebuild] 2020-06-11 12:20:51 -07:00
Dustin Carlino
294a619407 improve minimap from yuwen's ideas [rebuild] 2020-06-11 11:49:00 -07:00
Dustin Carlino
906566c05b er, unbrick clicking on the minimap. and get rid of the uselss pan buttons [rebuild] 2020-06-10 14:10:55 -07:00
Dustin Carlino
aa5288d1b7 try a much more aggressive minimap [rebuild] 2020-06-10 13:54:08 -07:00
Dustin Carlino
4495d5a1dc use persistent split in edit mode 2020-06-10 12:16:20 -07:00
Dustin Carlino
0cff318d0a start a layer to compare delay. needs work. 2020-06-10 11:04:48 -07:00
Dustin Carlino
bd19f4c7db be able to see private parking spots, but not by default 2020-06-09 18:28:32 -07:00
Dustin Carlino
727bd3deb9 pick better colors for borders 2020-06-09 18:23:22 -07:00
Dustin Carlino
ffc9da9c3d cut out old debugging from scenario debugger. popdat viewer and the WIP commute map re better 2020-06-09 17:47:34 -07:00
Dustin Carlino
e9355f0b64 using a proper gradient for comparing thruput! [rebuild] 2020-06-09 17:13:08 -07:00
Dustin Carlino
cb829558b4 adjust jump-to-time UI 2020-06-09 15:58:52 -07:00
Dustin Carlino
c34034a016 now we can add a meter showing the currently worst intersection 2020-06-09 15:35:45 -07:00
Dustin Carlino
c54128e9d2 now we can properly detect score in traffic sig challenge 2020-06-09 15:11:07 -07:00
Dustin Carlino
287d56efd9 generalizing the old gridlock checker. removing unused savestate_every
support. reimpl it later using the callbacks if needed.
2020-06-09 14:29:35 -07:00
Dustin Carlino
2445bddeb9 prepping to work on sim step 2020-06-09 12:39:31 -07:00
Dustin Carlino
17ea321d75 fix dropdowns getting clobbered in a few layers 2020-06-09 10:11:25 -07:00
Dustin Carlino
e87b2aca05 fancier slider finally 2020-06-09 09:45:46 -07:00
Dustin Carlino
6a875d9ec0 add task popup and hints to commute challenge. retune optimize challenge [rebuild] 2020-06-08 17:05:29 -07:00
Dustin Carlino
6e40fddb08 hint 2020-06-08 15:52:02 -07:00
Dustin Carlino
4975260911 adding challenge task description, independent of cutscene 2020-06-08 15:17:40 -07:00
Dustin Carlino
03c63ab34d working on new cutscene UI 2020-06-08 13:25:21 -07:00
Dustin Carlino
0a6fba0397 adjust signal editor layout 2020-06-08 12:33:28 -07:00
Dustin Carlino
f8f815d094 tightening up more tutorial stages:
- spawn a better amount of trips for low parking
- adjust contention stage so there's only one real problem to fix

also try to fix building the new clipboard dep [rebuild]
2020-06-07 16:59:20 -07:00
Dustin Carlino
863593708a tool to copy OriginalLane to clipboard. also fix wasm build breakage [rebuild] 2020-06-07 16:25:42 -07:00
Dustin Carlino
c2563ae15f fix the escort tutorial stage once and for all. fixes #52 [rebuild] 2020-06-07 12:39:14 -07:00
Dustin Carlino
7529809978 omit wheels instead of crashing when polyline shifting gets really wonky 2020-06-07 11:39:45 -07:00
Dustin Carlino
ce66d6aaf6 fix starting from a savestate on the CLI 2020-06-07 11:31:56 -07:00
Dustin Carlino
2c67eaf4ef just kick off a [rebuild] 2020-06-07 09:40:45 -07:00
Dustin Carlino
fafcf57240 make most offstreet spots private 2020-06-06 18:37:20 -07:00
Dustin Carlino
dd9d4317ab stop mapping everything to roads in parking layer 2020-06-06 17:54:55 -07:00
Dustin Carlino
b15664727d flesh out info panels for parking lots 2020-06-06 14:23:47 -07:00
Dustin Carlino
65b500509e make peds use front paths for parking lots too 2020-06-06 14:04:09 -07:00
Dustin Carlino
a643f039ad most of the sim changes to use parking lots! need to work on pedestrians
using the front paths
2020-06-06 13:42:39 -07:00
Dustin Carlino
051d6bca24 finish cleaning up geombatch apis 2020-06-05 21:01:03 -07:00
Dustin Carlino
63067656b8 whittle away weird geombatch APIs. more left 2020-06-05 11:14:17 -07:00
Dustin Carlino
0b1760cbce add OSD to bulk select UI, fill in intersections too 2020-06-05 06:55:43 -07:00
Dustin Carlino
1401c1b415 prototype a lasso select 2020-06-04 17:18:57 -07:00
Dustin Carlino
07d931d9f8 same for roads 2020-06-04 15:54:17 -07:00
Dustin Carlino
abc5379b81 new idea for building labels 2020-06-04 15:40:17 -07:00
Dustin Carlino
7bc78905ca full CRUD for markers 2020-06-04 12:59:28 -07:00
Dustin Carlino
bd17ebaf8e fleshing out story map editor more 2020-06-04 12:05:26 -07:00
Dustin Carlino
957ee65fc9 starting to place markers for story map. cleaning up inconsistent order
of (app, ctx)
2020-06-04 11:00:19 -07:00
Dustin Carlino
a3724e4b4d boilerplate for a story map editor. also make close buttons consistent 2020-06-03 21:52:54 -07:00
Dustin Carlino
1b774b13b0 reviving tutorial...
- pick another building, now that the montlake market is demolished
- layouting (i understand flexbox now \o/)
- finally listen to reason and get rid of the extra "inspect" action.
  not many per-object actions remaining at this point
- handle window resizing much better, making the --tutorial flag useful
  again
2020-06-03 17:38:02 -07:00
Dustin Carlino
bf426bb6d1 the last spawner bug: handle parking blackholes 2020-06-03 13:45:29 -07:00
Dustin Carlino
6482772b73 lots of bug fixes in spawner involving borders, invalidating paths when
changing modes
2020-06-03 13:37:34 -07:00
Dustin Carlino
e1cfd52e32 always spawn buses. otherwise can't really interactively spawn agents and have buses at the same time 2020-06-03 12:55:40 -07:00
Dustin Carlino
ea6a5c0f9d encode parking spots cheaply, compute up-front 2020-06-03 11:50:46 -07:00
Dustin Carlino
b69d155812 clipping parking aisles to the lots, in most cases 2020-06-03 10:51:59 -07:00
Dustin Carlino
971ee0f819 cleaning up the parking lot rendering a bit 2020-06-02 15:59:26 -07:00
Dustin Carlino
d4e5acd4e3 improve parking space inference. expose the estimated count 2020-06-02 14:43:07 -07:00
Dustin Carlino
b497a9926f start rendering parking aisles. lots of issues to cleanup, but VERY
solid start
2020-06-02 13:30:37 -07:00
Dustin Carlino
d7ecb133b9 select lane->road zoomed in for bulk select 2020-06-02 12:24:52 -07:00
Dustin Carlino
0ed3dff0a1 shortcut to starting a trip 2020-06-02 11:14:26 -07:00
Dustin Carlino
749d0809f7 fold in the intersection spawning controls a bit 2020-06-02 11:04:06 -07:00
Dustin Carlino
0f608da151 detect parking lots overlapping roads too 2020-06-01 18:42:54 -07:00
Dustin Carlino
b7a679868f adjusting UX of spawner tool 2020-06-01 18:35:59 -07:00
Dustin Carlino
11e9435e68 subsuming the tool for spawning multiple agents 2020-06-01 18:23:52 -07:00
Dustin Carlino
2e25c77f36 nix the old single agent spawner in favor of the new, simpler thing 2020-06-01 17:44:36 -07:00
Dustin Carlino
aceadef79f refactoring some trip spawning stuff from importer, using it in the new agent spawner too 2020-06-01 17:37:54 -07:00
Dustin Carlino
ac752fccfe working on new agent spawner 2020-06-01 17:04:31 -07:00
Dustin Carlino
30eafea94a start representing OSM parking lots in the map model and rendering layer 2020-06-01 12:51:14 -07:00
Dustin Carlino
4a06806a3d starting a new UI for spawning agents. just some boilerplate 2020-06-01 11:02:33 -07:00
Dustin Carlino
49dee41b3c bin Counter values based on value, handling dupes. particularly
noticeable for bike lane layer
2020-06-01 09:35:29 -07:00
Dustin Carlino
855d8f4d22 update glutin, winit, glium now that a fix for linux startup time is upstreamed in glutin. and a few other packages too. ditch geo-offset dependency, since it uses old versions and isn't being used yet 2020-06-01 09:18:17 -07:00
Dustin Carlino
1161591b6b fix bike layer when there's no traffic yet 2020-05-30 13:12:57 -07:00
Dustin Carlino
204b2962b1 add a debug tab to try to understand people's schedules better 2020-05-29 16:37:12 -07:00
Dustin Carlino
27179ee87d better faces. go back to hiding a few things in debug mode [rebuild] 2020-05-29 13:09:46 -07:00
Dustin Carlino
2bb36124bd add random nicknames to people 2020-05-29 11:37:21 -07:00
Dustin Carlino
f9d9011aad fiddle with drawing order so intersections underneath bridges dont look so strange unzoomed 2020-05-29 10:12:50 -07:00
Dustin Carlino
b7790dca40 start doing screenshot diff tests for udistrict and downtown too 2020-05-29 08:00:59 -07:00