Commit Graph

180 Commits

Author SHA1 Message Date
Konstantin Käfer
af3bae59d6 limit matte to full hd 2014-03-11 12:16:54 +01:00
Konstantin Käfer
978b714de8 two render passes
Conflicts:
	resources/style.pbf
	src/renderer/painter.cpp
	src/style/resources.cpp
2014-03-11 12:15:06 +01:00
Konstantin Käfer
a1ebf3f264 move tile size to a cpp file 2014-03-11 12:12:05 +01:00
Konstantin Käfer
420cb58a5d fix pedantic warnings 2014-03-11 12:10:07 +01:00
Konstantin Käfer
b7b2812d30 remove debug uniform 2014-03-11 12:09:39 +01:00
Konstantin Käfer
4de8674f20 Merge branch 'variant' 2014-03-11 11:55:00 +01:00
Konstantin Käfer
09731cfa19 define GL_ARB_vertex_array_object 2014-03-11 11:53:57 +01:00
Konstantin Käfer
69a5c0e15f better support for gles2 2014-03-05 16:58:46 +01:00
Konstantin Käfer
b97a9778ea move tile urls to static consts rather than macros 2014-03-05 16:51:38 +01:00
Konstantin Käfer
e9981f0c15 properly include gl includes 2014-03-05 16:50:30 +01:00
Konstantin Käfer
b0cb2b85b1 return meaningful error codes 2014-03-05 16:46:27 +01:00
Konstantin Käfer
fc53caf99a use proper initializers 2014-03-05 16:45:47 +01:00
Konstantin Käfer
3718721689 only use vertex array objects if they are supported 2014-03-05 16:44:35 +01:00
Konstantin Käfer
a3a1b812c8 don't pass around pointers if all we need is the state 2014-03-05 09:56:36 +01:00
Konstantin Käfer
027c6f33b3 implement tile wrapping
fixes #14
2014-03-05 09:40:32 +01:00
Konstantin Käfer
b0ddabd6ac rename Tile to TileData 2014-03-04 17:53:16 +01:00
Konstantin Käfer
ba5070bf52 Port scanline algorithm from _getCoveringTiles()
fixes #22
2014-03-04 14:50:17 +01:00
Konstantin Käfer
ba4ec7f8c7 iOS GL specific API alias 2014-03-04 11:33:56 +01:00
Konstantin Käfer
e85304d510 use depth buffer to avoid writing to opaque fragments 2014-03-04 11:21:42 +01:00
Konstantin Käfer
4d5715c973 atomic state 2014-03-03 16:38:26 +01:00
Konstantin Käfer
0a6dbc8064 Merge branch 'nostencil'
Conflicts:
	macosx/main.mm
	src/map/map.cpp
2014-03-03 16:02:13 +01:00
Konstantin Käfer
2e0681e2d6 Merge pull request #49 from mapbox/tessellation
Try out tessellating polygons
2014-03-03 15:08:48 +01:00
Konstantin Käfer
e13b519745 we're not doing recursive locking 2014-03-03 13:05:01 +01:00
Konstantin Käfer
f1f146b01e remove thread naming 2014-03-03 13:01:09 +01:00
Konstantin Käfer
f850856cec move requests to global threadpool 2014-03-03 12:55:32 +01:00
Konstantin Käfer
c076da0ae2 make threadpool implementation callback agnostic 2014-03-03 12:26:04 +01:00
Konstantin Käfer
b26f3d319b add threadpool implementation 2014-03-03 12:17:32 +01:00
Konstantin Käfer
e134e6a8f3 add threadpooled requests 2014-03-02 11:26:54 +01:00
Konstantin Käfer
6c58101b12 multithreaded curl for linux 2014-03-01 13:05:13 +01:00
Konstantin Käfer
5d7ff19994 fix compile 2014-02-28 12:27:29 +01:00
Konstantin Käfer
4e73a4d47c Merge branch 'master' into tessellation
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/fill_bucket.cpp
	src/renderer/painter.cpp
2014-02-28 12:25:45 +01:00
Konstantin Käfer
eadafede08 use clipper and add missing vertices to avoid missing triangles 2014-02-27 16:00:49 +01:00
Konstantin Käfer
8d68bd73e7 draw a checkerboard stencil clipping mask initially 2014-02-26 12:24:17 +01:00
Konstantin Käfer
70ec13e302 fix compile error 2014-02-26 10:48:12 +01:00
Konstantin Käfer
f87e21b6e8 Merge branch 'tessellation' into nostencil
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/painter.cpp
2014-02-26 10:44:09 +01:00
Justin R. Miller
0afc5f6967 remove now-unnecessary tile references in platform 2014-02-25 16:42:14 -08:00
Justin R. Miller
55b28aaf65 allow for cancellable request, track in tiles, and cancel when obsolete 2014-02-25 16:33:06 -08:00
Justin R. Miller
0406a82299 add tile state 'loaded' 2014-02-25 15:34:32 -08:00
Justin R. Miller
78ab66b06c rename tile state ready -> parsed 2014-02-25 15:26:12 -08:00
Justin R. Miller
e59a5f1c1a Merge branch 'master' into tile-cancels 2014-02-21 14:18:48 -08:00
Konstantin Käfer
32da0768b7 add missing include for size_t 2014-02-21 13:12:31 +01:00
Konstantin Käfer
e382cab17d make implicit type conversions explicit 2014-02-21 13:08:13 +01:00
Konstantin Käfer
4418f2d1c8 remove remnants of emscripten 2014-02-21 12:34:39 +01:00
Konstantin Käfer
5f64ecc3cc Merge branch 'master' into linux-wrapper
Conflicts:
	include/llmr/style/sprite.hpp
2014-02-21 12:26:16 +01:00
Konstantin Käfer
0306e77ff0 remove void* parameter from platform::restart() 2014-02-21 12:18:11 +01:00
Konstantin Käfer
1fb4451192 Merge pull request #68 from mapbox/poi-render
refs #60: first cut of POI rendering
2014-02-21 12:07:46 +01:00
Konstantin Käfer
bd2d865fc4 trigger a bogus mouse move event to interrupt glfwWaitEvents()
see https://github.com/glfw/glfw/issues/218
2014-02-21 12:05:27 +01:00
Konstantin Käfer
d5c611d707 add timeouts for panning,scaling,rotating 2014-02-21 11:31:24 +01:00
Justin R. Miller
fded15dab0 add tile-specific platform HTTP request 2014-02-19 18:40:17 -08:00
Justin R. Miller
66a2c994ac clean up platform comments 2014-02-19 17:54:00 -08:00