Commit Graph

57 Commits

Author SHA1 Message Date
Konstantin Käfer
898c6d6714 fix for retina screens 2014-05-19 11:13:22 +02:00
Konstantin Käfer
13575330f7 use sprite atlas 2014-05-19 10:48:36 +02:00
Konstantin Käfer
ab22f68970 fix comment 2014-05-02 10:30:52 +02:00
Konstantin Käfer
1216a061d3 move to libuv for the rendering loop 2014-04-30 12:01:26 +02:00
Konstantin Käfer
666f593803 use an event loop per map that is not the render thread 2014-04-25 14:26:59 +02:00
Konstantin Käfer
a0d935eac7 unify request object to use uv_queue_work for both corefoundation + curl 2014-04-24 17:39:19 +02:00
Konstantin Käfer
1ecff57829 use libuv event loop in the glfw view
Integrates libuv's default loop with GLFW's glfwWaitEvents() call. See https://github.com/joyent/libuv/issues/1246 for more details on integrating event loops.

fixes #149
2014-04-22 16:54:55 +02:00
Konstantin Käfer
7e3f374bd4 Merge branch 'master' of github.com:mapbox/llmr-native 2014-04-16 15:41:33 -04:00
Konstantin Käfer
57c5a00907 add (commented out) command line render tree visualization 2014-04-16 14:30:35 -04:00
Konstantin Käfer
73b26f0a93 fix include order 2014-04-16 08:40:22 -07:00
Konstantin Käfer
797f590cfb cleanup + unused arguments 2014-04-16 10:55:06 -04:00
Konstantin Käfer
3c656d2bf2 add debug markers for easier gl debugging 2014-04-15 14:30:05 -04:00
Konstantin Käfer
78c10c0701 Merge remote-tracking branch 'remotes/origin/pr/127'
Conflicts:
	include/llmr/map/map.hpp
	src/map/map.cpp
	src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Konstantin Käfer
f18aa61e33 derive from GLKViewController
this handles resizing the view/framebuffer much better

fixes #130, #131, #133, #118
2014-04-14 18:50:17 -04:00
Konstantin Käfer
305e688a3a clean up os x + ios request code
fixes #129
2014-04-14 11:47:57 -04:00
Justin R. Miller
f60a46229d refs #101: first cut of basic hacky data sources 2014-04-02 11:07:22 -07:00
Konstantin Käfer
3413ee536d Merge branch 'master' into sdf
Conflicts:
	include/llmr/map/tile_data.hpp
	include/llmr/shader/shaders.hpp
	src/map/map.cpp
	src/map/tile_data.cpp
	src/platform/platform.cpp
	src/shader/shaders.cpp
2014-03-21 13:36:32 +01:00
Justin R. Miller
00a3245ce8 fixes #70: raster tile rendering as toggleable mode from vector 2014-03-18 16:57:17 -07:00
Konstantin Käfer
3c5bac0f6b add debug window showing the glyph atlas 2014-03-14 12:43:42 +01:00
Konstantin Käfer
bdfa761c39 remove code duplication between osx/glfw and linux/glfw programs 2014-03-14 11:33:45 +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
09731cfa19 define GL_ARB_vertex_array_object 2014-03-11 11:53:57 +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
ba4ec7f8c7 iOS GL specific API alias 2014-03-04 11:33:56 +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
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
e59a5f1c1a Merge branch 'master' into tile-cancels 2014-02-21 14:18:48 -08:00
Konstantin Käfer
4418f2d1c8 remove remnants of emscripten 2014-02-21 12:34:39 +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
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
Justin R. Miller
1f2150fcd7 add argument clarity to platform::request_http declaration 2014-02-19 17:53:45 -08:00
Justin R. Miller
828d8ba26f refs #60: first cut of POI rendering
* add basic marker style to stylesheet
 * pass through marker style to PBF conversion
 * marker/point tile parsing, bucket, buffer, shaders, etc.
 * new sprite hosting for 1x/2x variants
 * sprite load accepts screen scale argument
2014-02-14 18:13:12 -08:00
Konstantin Käfer
565a23785c remove unused functions and run http_request in other operation queue 2014-02-13 12:15:01 +01:00
Konstantin Käfer
cbe70c7648 use a publicly accessible sprite image 2014-02-07 17:54:27 +01:00
artemp
d6654ccaed c++
* fix typedef's
* fix virtual dtor's
* make ctor's with one argument explicit
* util::noncopyable utility class  ( class my_object : private noncopyable {} )
* update kTileURL
2014-02-06 10:33:46 +00:00
Konstantin Käfer
c922980eeb change back to use web-provided version of resources 2014-02-05 18:15:18 +01:00
Konstantin Käfer
e30d8eb48f move to vertex array objects 2014-02-05 18:06:16 +01:00
Konstantin Käfer
b629f56f68 add aliases for VAOs 2014-02-05 13:59:26 +01:00
Justin R. Miller
ca75b2a351 refs #24: Gyp-built iOS test app 2014-02-04 12:10:20 -05:00
Justin R. Miller
2b2ff9fb3f abstract hardcoded URLs for now 2014-02-04 11:46:06 -05:00
Dane Springmeyer
f1e74215fd compile fixes on ubuntu precise/g++-4.8 - refs #27 2014-02-03 21:57:46 +00:00
Konstantin Käfer
44a3ffbd57 alternative http_request function 2014-02-03 14:53:59 +01:00
Konstantin Käfer
202e0270f7 add rapidjson for parsing sprite json files 2014-02-03 11:36:34 +01:00
Konstantin Käfer
c7b012ba42 create async() function 2014-01-31 13:40:38 +01:00
Konstantin Käfer
04c855bd64 add request_http() function
refs #23
2014-01-30 16:57:38 +01:00