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 |
|
Konstantin Käfer
|
0b95c1064d
|
add platform function comments
|
2014-01-27 17:53:52 +01:00 |
|
Konstantin Käfer
|
209dd913f9
|
tile => Tile
|
2014-01-20 12:03:36 +01:00 |
|
Konstantin Käfer
|
509b223fbf
|
animate northing
|
2014-01-17 13:33:39 +01:00 |
|
Konstantin Käfer
|
60a8fdca57
|
fix runtime errors
|
2014-01-14 16:29:20 +01:00 |
|
Konstantin Käfer
|
654972bb3f
|
cmake + tile loading
|
2014-01-13 18:07:13 +01:00 |
|
Konstantin Käfer
|
528eaf475e
|
emscripten support
|
2014-01-07 16:52:23 +01:00 |
|
Konstantin Käfer
|
44b43fe5a6
|
glfw version of sample app
|
2014-01-07 12:10:14 +01:00 |
|