Commit Graph

3099 Commits

Author SHA1 Message Date
Max Shenfield
f89bdbab86 Fix cs2cs call when generating popdat.bin (#5)
* Fix cs2cs call when generating popdat.bin

I got the following error when running `cs2cs`

```
cannot instantiate source coordinate system
program abnormally terminated
```

[The "+init=esri:1234" syntax is deprecated](https://pyproj4.github.io/pyproj/dev/gotchas.html#init-auth-auth-code-should-be-replaced-with-auth-auth-code). This just uses
the new "esri:1234" syntax, which runs on Mac OSx.

* Also update the corresponding command comment
2019-11-24 08:02:13 -08:00
Dustin Carlino
a2ea691fa3 fix the 16 texture limit on mac properly, by using texture arrays for icons 2019-11-24 07:38:32 -08:00
Dustin Carlino
3ca998b08e properly fix the crashing border intersection 2019-11-23 20:27:00 -08:00
Dustin Carlino
0814974885 fix more stuff... 2019-11-23 13:15:05 -08:00
Dustin Carlino
e1c5edc76d remove lightrail map for now; precompute crashes on it, not an important one right now 2019-11-23 12:48:05 -08:00
Dustin Carlino
640fcae07e temporary workarounds for the hackathon, will revert later 2019-11-23 12:03:23 -08:00
Dustin Carlino
10c291f7ed new release before hackathon 2019-11-22 19:06:00 -08:00
Dustin Carlino
3ee73d40f0 guarantee protected turns actually get first dibs in the scheduler 2019-11-22 18:56:39 -08:00
Dustin Carlino
1145bbc8e6 overhaul ControlTrafficSignal to natively understand TurnGroups. but
it... didn't solve the problem of a left turn yield going first?!
2019-11-22 18:42:44 -08:00
Dustin Carlino
715fc80e04 make stop signs and traffic signals behave a bit more correctly -- protected turns get first dibs. problem is now that we need to make turn groups be the primitive, so conflict makes more sense 2019-11-22 16:14:04 -08:00
Dustin Carlino
15a401205b preview stuff using a traffic signal from the editor 2019-11-22 15:10:03 -08:00
Dustin Carlino
e7bda09978 simple perf boosts: avoiding some unnecessary GPU uploads every frame 2019-11-22 14:06:44 -08:00
Dustin Carlino
44128b3615 hanle turn groups a bit more correctly in ControlTrafficSignal... but
not yet natively
2019-11-22 12:11:04 -08:00
Dustin Carlino
17c5532aca store the turn groups in the traffic signal 2019-11-22 11:36:50 -08:00
Dustin Carlino
a3f1261557 precompute TurnGroup stuff 2019-11-22 10:55:04 -08:00
Dustin Carlino
1f972e5afb handle crosswalks too 2019-11-21 16:55:40 -08:00
Dustin Carlino
55eead8ec7 improve turn block rendering 2019-11-21 16:04:53 -08:00
Dustin Carlino
aa1d7faa00 prototyping turn grouping for editing and understanding traffic signals.
half-baked, but worth moving forwards. starting to rip out old turn icon
stuff (oops, accidentally squished into this commit)
2019-11-21 15:09:57 -08:00
Dustin Carlino
318b467f69 add in traffic signal offset end-to-end 2019-11-21 10:18:01 -08:00
Dustin Carlino
f39bb7c6cb center pedestrians on bldg front paths, and group them into crowds when
appropriate
2019-11-21 09:57:01 -08:00
Dustin Carlino
d40002bb17 restrict types of edits in traffic signal fixing challenge 2019-11-21 09:24:49 -08:00
Dustin Carlino
54a58f865c argh, fix the nondeterminism. when i refactored flags a while ago, this happened. prevent from happening again. 2019-11-20 21:57:52 -08:00
Dustin Carlino
81dc3b6fea report trip mode accurately for peds trying to drive! 2019-11-20 17:30:00 -08:00
Dustin Carlino
aa4805cfeb some tools to debug why prebaked analytics arent matching 2019-11-20 17:01:12 -08:00
Dustin Carlino
608ecd4075 refactor how overlays are constructed 2019-11-20 16:28:17 -08:00
Dustin Carlino
7b4dc902af starting a new challenge, just focusing on fixing traffic siggies 2019-11-20 16:09:19 -08:00
Dustin Carlino
60d59c4fc1 dont let player leave traffic sig editor with missing turns 2019-11-20 15:42:25 -08:00
Dustin Carlino
6fa9003898 turbocharge speed controls in dev mode 2019-11-20 12:52:51 -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
a5c517851e trying fixes again, for 23rd. i think the problem was making montlake
fixes, then more huge_seattle fixes that invalidated the montlake fixes.
it's not hard to do the last-minute border trimming, so be willing to
restart that.

but actually, also have to skip deleting intersections if roads are
connected. urgh.
2019-11-20 12:39:10 -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
8b76c2d6e6 stop crashing in downtown -- change pointless bike trip to walking 2019-11-19 18:33:07 -08:00
Dustin Carlino
ba2206d02a be able to start and end bike trips on bike lanes. use driving
blackholes for now.
2019-11-19 14:10:02 -08:00
Dustin Carlino
ade23dac5f also prompt to save edits before loading different edits. refactor some of the flow 2019-11-19 12:27:11 -08:00
Dustin Carlino
e26a6640a5 last chance to save unnamed edits when quitting 2019-11-19 12:05:58 -08:00
Dustin Carlino
c7fbaaf7e1 reset edits when leaving sandbox mode 2019-11-19 11:47:40 -08:00
Dustin Carlino
c0fea0811f analyze a bike route and warn when bike lanes arent used 2019-11-18 14:01:15 -08:00
Dustin Carlino
e435f5f4f5 add edits to the challenge splash screen 2019-11-18 13:51:11 -08:00
Dustin Carlino
71fec285b8 draw buildings on top of tunnels in zoomed-in view too 2019-11-18 13:03:31 -08:00
Dustin Carlino
2e6e0f3e79 fix bug where clicking another button with a popup menu would choose that entry 2019-11-18 12:42:52 -08:00
Dustin Carlino
788258288d make bulk lane edit safer too 2019-11-18 11:17:21 -08:00
Dustin Carlino
7b05276b68 do same validity checks before reverting lane types. otherwise you can orphan a bus stop 2019-11-18 11:03:54 -08:00
Dustin Carlino
0c2bd1ec0c no need to clobber stop signs when lanes nearby are edited. also, er, i
bricked setting lane types -- fixed ><
2019-11-18 10:43:53 -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
bafd5069f1 new release 2019-11-17 19:03:31 -08:00
Dustin Carlino
c58694ac8d avoid no-op edits 2019-11-17 18:48:28 -08:00
Dustin Carlino
c148016877 compress edits when saving 2019-11-17 18:36:07 -08:00
Dustin Carlino
bd108b8d9a redraw stop signs and traffic signals as changes happen 2019-11-17 18:05:35 -08:00
Dustin Carlino
8c2d383fd7 undo button, and displaying last 5 edits 2019-11-17 17:02:14 -08:00
Dustin Carlino
83352965b0 woops, forgot about a block of commented stuff in apply_edits. prevent
orphaning a bus stop
2019-11-17 12:44:24 -08:00