Commit Graph

161 Commits

Author SHA1 Message Date
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
Justin R. Miller
1f2150fcd7 add argument clarity to platform::request_http declaration 2014-02-19 17:53:45 -08:00
Konstantin Käfer
7f5a674a91 add texture settings 2014-02-19 18:14:42 +01:00
Konstantin Käfer
9710fbef99 enable texture interpolation during rotating and scaling 2014-02-19 15:39:44 +01:00
Konstantin Käfer
504b60b93e don't used element arrays 2014-02-19 14:46:50 +01:00
Konstantin Käfer
ea80daa129 allow switching the vao if we switch the style from plain color to pattern fill 2014-02-18 15:56:23 +01:00
Konstantin Käfer
c0997961aa don't use std::string to hold the image 2014-02-17 17:58:34 +01:00
Konstantin Käfer
3843bf1ce5 better allocator defaults 2014-02-17 16:35:12 +01:00
Konstantin Käfer
b087c35c98 add tessellation library 2014-02-17 12:45:57 +01: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
d1910f0e04 Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-02-14 11:27:46 +01:00
Justin R. Miller
257ccd16bb clean up settings mechanism (fixes #9 & #62)
* init, load, persist, sync, clear
 * clean up frequent disk syncs which impacted iOS performance
 * insert disk sync into various iOS/OS X lifecycle events
 * implement clear
 * implement save on iOS
 * cleaner dictionary syntax
2014-02-13 12:21:35 -08:00
Konstantin Käfer
a868602069 use proper tile size 2014-02-13 17:37:32 +01:00
Konstantin Käfer
b0357e8ea7 move tile size to constants.hpp 2014-02-13 17:34:08 +01:00
Konstantin Käfer
51f526dd6a remove addDegenerate() 2014-02-13 16:36:30 +01:00
Konstantin Käfer
da06a52056 cut down on redundant gl uniform changes 2014-02-13 16:21:51 +01:00
Konstantin Käfer
f5846e1ebb change line_strip drawing for outlines to indexed lines 2014-02-13 15:32:25 +01:00
Konstantin Käfer
54454ed66a optimizations + reorder vertex index 2014-02-13 14:10:04 +01:00