Commit Graph

1323 Commits

Author SHA1 Message Date
Dustin Carlino
c4b7196570 fixing some text positioning bugs 2019-01-23 12:30:48 -08:00
Dustin Carlino
9b14206be0 implementing GfxCtx forking... aka, reset uniforms 2019-01-23 12:22:26 -08:00
Dustin Carlino
d9d89e93dd using glium_glyph... things initially kind of work 2019-01-23 12:10:17 -08:00
Dustin Carlino
ca00dda8be drawing circles in glium 2019-01-23 10:00:36 -08:00
Dustin Carlino
5dc8542856 upload data once per polygon, not once per triangle. derp. 2019-01-22 23:19:48 -08:00
Dustin Carlino
03215a5836 disable unneeded depth testing. enable antialiasing and alpha blending 2019-01-22 23:10:14 -08:00
Dustin Carlino
099846437c dont redraw unnecessarily 2019-01-22 22:30:36 -08:00
Dustin Carlino
fa075766cc fix y inversion. camera now feels totally correct 2019-01-22 18:20:20 -08:00
Dustin Carlino
f896e92d25 simplifying camera math drastically... passing in stuff to the vertex
shader, which does transformations not using matrices! \o/
2019-01-22 17:43:25 -08:00
Dustin Carlino
fb7a809892 tweaked camera based on canvas. workable, not great. 2019-01-22 17:12:48 -08:00
Dustin Carlino
af7596f9a5 remove piston stuff, cut over to glutin in some basic way. nothing
displays now. :D
2019-01-22 16:51:02 -08:00
Dustin Carlino
974b04e74d start to move ezgui to glium. just copying extra code in, not deleting
existing stuff yet
2019-01-22 16:11:49 -08:00
Dustin Carlino
6064aa10af changing glium example to draw a few colored triangles, not the teapot 2019-01-22 13:47:23 -08:00
Dustin Carlino
87b885fcd7 importing and simplifying glium teapot example 2019-01-22 13:09:27 -08:00
Dustin Carlino
08db3bf27f rendering traffic signal diagrams with lights per lane... needs work, so
disabling it
2019-01-22 11:58:56 -08:00
Dustin Carlino
88099c73b5 tiny preps for a variant of short road merging that can happen later and
look at road length after it's trimmed to the intersection. not going to
work on it just yet.
2019-01-22 09:56:03 -08:00
Dustin Carlino
63ad2c410d fix trace when last step is contraflow 2019-01-21 16:33:35 -08:00
Dustin Carlino
6dee096a0e zorder for cars/peds too... had to rework get_objects_onscreen 2019-01-21 14:51:57 -08:00
Dustin Carlino
1e7b8f2dfc end interactive trips at border nodes 2019-01-21 13:53:24 -08:00
Dustin Carlino
a129adeaa1 refactoring spawning plugin so far 2019-01-21 12:43:35 -08:00
Dustin Carlino
c87c7b32ae make interactive driving trips still end at a building 2019-01-21 12:21:26 -08:00
Dustin Carlino
4b42f70da4 actually spawning walking trips... 2019-01-21 11:59:59 -08:00
Dustin Carlino
0d297b9dac let mouseover happen at low zoom for the agent spawner plugin 2019-01-21 11:47:44 -08:00
Dustin Carlino
f58f8a7ef1 make single spawn work from bldg to bldg or driving lane to driving lane 2019-01-21 11:34:22 -08:00
Dustin Carlino
998c27ddff starting a plugin to interactively spawn specific agents 2019-01-20 19:31:07 -08:00
Dustin Carlino
11045fd44f zorder for lanes and intersections 2019-01-20 14:15:50 -08:00
Dustin Carlino
f018158aa3 remove copyright comment from remaining files 2019-01-20 13:57:55 -08:00
Dustin Carlino
e83e87786f use new polygon code for two-ways as well, but trim back roads that don't change at all by some minimum amount 2019-01-20 09:17:18 -08:00
Dustin Carlino
ae6438e8b7 show sidewalk corners when zoomed out 2019-01-19 21:19:49 -08:00
Dustin Carlino
4ca6571e2f warp by stable intersection ID 2019-01-19 21:10:54 -08:00
Dustin Carlino
fad89ddffa include more pts in the intersection polygon to only cover area from the original road bands. also fix a bug deduping points in the polygon. 2019-01-19 20:56:03 -08:00
Dustin Carlino
e403a6388d a much simpler, general approach for intersection polygons. needs a
little work, but it replaces lots of other code.

disabled, but adding a few more cases to the list of manually merged short roads
2019-01-19 19:07:07 -08:00
Dustin Carlino
b279e37bab trying to handle remaining 3-ways as degenerate 2-ways and just trimming
things back kinda arbitrarily
2019-01-18 15:40:09 -08:00
Dustin Carlino
e2579dfbdb dont prematurely edit road centers 2019-01-18 14:53:49 -08:00
Dustin Carlino
c0a81ebe59 using the new threeway code for some more cases 2019-01-18 14:04:51 -08:00
Dustin Carlino
a7cc077a77 got something working for i2, but WIP generalizing it 2019-01-18 13:26:34 -08:00
Dustin Carlino
48179d5d32 fix number of lanes for oneways and link roads 2019-01-18 11:41:05 -08:00
Dustin Carlino
f5850d1953 disabled option to automatically merge all originally-short roads 2019-01-18 10:42:11 -08:00
Dustin Carlino
317c6ecd6c organizing TODOs... well, some of them 2019-01-17 22:26:35 -08:00
Dustin Carlino
d76c0d0652 use StableRoadID directly in synthetic model 2019-01-17 19:31:57 -08:00
Dustin Carlino
0c32faa40c moving neighborhood to map_model crate, so convert_osm can stop depending on sim 2019-01-17 15:29:00 -08:00
Dustin Carlino
76dc85d5c8 remove unnecessarily boxed closures, and use generics instead 2019-01-17 15:22:31 -08:00
Dustin Carlino
61128f098b make my own retain for btreemap. also refine the loop-road filtering in
the experimental road merger
2019-01-17 15:09:09 -08:00
Dustin Carlino
63c24ce5a7 improve robustness of image diffing script, even when intersection IDs change 2019-01-17 14:29:31 -08:00
Dustin Carlino
98ab06bd4e try manually merging some intersections again, without needing to modify geometry 2019-01-17 14:21:34 -08:00
Dustin Carlino
be9a9b86fe dont modify geometry of ways touching roundabouts, now that we have raw roads pointing to intersections 2019-01-17 12:03:08 -08:00
Dustin Carlino
761008b3ac make raw roads directly refer to intersections 2019-01-17 11:30:58 -08:00
Dustin Carlino
3422877d3d adding a stable ID for raw roads and intersections. way easier to refer to things in the midst of deletions. 2019-01-17 11:10:05 -08:00
Dustin Carlino
dfe50dcee4 reasonable support for roundabouts... collapse it to a single
intersection, which usually gets treated like a stop sign, and has
reasonable geometry
2019-01-16 15:05:44 -08:00
Dustin Carlino
802cf333b8 list possible easy simplifications in the geom validator plugin 2019-01-16 12:48:40 -08:00