Commit Graph

280 Commits

Author SHA1 Message Date
Konstantin Käfer
c45378a88c Merge branch 'master' of github.com:mapbox/llmr-native
Conflicts:
	src/map/tile_data.cpp
2014-04-11 10:51:41 -04:00
Konstantin Käfer
320bb0b131 prebuild shaders 2014-04-11 10:49:51 -04:00
Konstantin Käfer
0b347a4f3c use satellite tiles 2014-04-11 10:20:08 -04:00
Konstantin Käfer
442d9ce4ec we only need 2px lines here 2014-04-10 14:30:00 -04:00
Konstantin Käfer
8faae8c137 be more verbose about source of tile errors 2014-04-10 14:29:41 -04:00
Justin R. Miller
27e33ef8b8 log failed tile for more info 2014-04-10 11:20:20 -07:00
Konstantin Käfer
06bcab9560 correctly update the map dimensions on rotate
refs #37
2014-04-10 14:07:36 -04:00
Konstantin Käfer
eb499e77c1 fix linejoin drawing on retina 2014-04-10 11:49:43 -04:00
Konstantin Käfer
524c8737e4 add missing header 2014-04-09 18:28:23 -04:00
Konstantin Käfer
bb5152d851 add libboost back to build system 2014-04-09 16:18:23 -04:00
Justin R. Miller
1915c39eee change sprite URL to more reliable endpoint 2014-03-29 10:01:37 -07:00
Konstantin Käfer
0c6f993695 add min/max functions and refactor FunctionProperty
fixes #83
2014-03-26 12:21:33 +01:00
Justin R. Miller
4bd62d3b94 Merge branch 'master' of github.com:mapbox/llmr-native 2014-03-25 14:39:43 -07:00
Konstantin Käfer
016c7d3a4f fix text fading preventing render idling
fixes #108
2014-03-25 14:09:36 +01:00
Konstantin Käfer
1250ea1be2 fix urls 2014-03-25 13:55:18 +01:00
Konstantin Käfer
21f7b0f706 use unique_ptr for buckets rather than shared_ptrs 2014-03-25 13:49:55 +01:00
Konstantin Käfer
85f0d9392b do not use shared pointers for buffers 2014-03-25 13:41:20 +01:00
Konstantin Käfer
67b1d8df51 fix build by changing to enabled 2014-03-25 13:40:47 +01:00
Konstantin Käfer
e427f51dd4 remove generated files 2014-03-25 13:25:35 +01:00
Konstantin Käfer
166305fb14 change hidden to enabled
refs #83
2014-03-25 13:23:51 +01:00
Konstantin Käfer
77f58960c4 build shaders for either desktop gl or gles2 2014-03-25 13:16:48 +01:00
Konstantin Käfer
25e2d8504b debug changes 2014-03-25 12:24:56 +01:00
Konstantin Käfer
3a9a904378 reorder vertices 2014-03-25 12:14:33 +01:00
Konstantin Käfer
d5b4c1162d add shader optimizer and reorder components 2014-03-25 12:10:19 +01:00
Konstantin Käfer
afe27ed74c only animate when we need to fade the text 2014-03-24 18:00:03 +01:00
Konstantin Käfer
b4a67a959c remove commented out js code 2014-03-24 17:39:37 +01:00
Konstantin Käfer
9621038d8a implement alwaysVisible 2014-03-24 17:38:10 +01:00
Konstantin Käfer
76d3d7badb explicitly specify font size in class 2014-03-24 17:21:14 +01:00
Konstantin Käfer
5c11bcf5c0 don't treat negative values as placement failure 2014-03-24 17:15:54 +01:00
Konstantin Käfer
8b573f9fa2 fix glyphs that have no pixels but an advance (e.g. spaces) 2014-03-24 15:19:39 +01:00
Konstantin Käfer
541c626cd3 update style.cpp 2014-03-24 14:48:39 +01:00
Konstantin Käfer
75cd64de58 add toString method for Value variant 2014-03-24 14:47:21 +01:00
Konstantin Käfer
1455291386 parse text-specific style properties 2014-03-24 14:46:44 +01:00
Konstantin Käfer
f9759d72a6 set correct strata 2014-03-24 14:45:56 +01:00
Konstantin Käfer
c00ec64205 exponential functions 2014-03-24 14:45:33 +01:00
Konstantin Käfer
5c613b5455 normalizedZoom() == zoom level of the visual appearance 2014-03-24 14:44:44 +01:00
Konstantin Käfer
67a8882457 use the correct glyphs 2014-03-24 11:13:20 +01:00
Konstantin Käfer
af8c936c10 fix color parsing 2014-03-24 10:55:05 +01:00
Justin R. Miller
dcdb8089fa Merge branch 'master' of github.com:mapbox/llmr-native 2014-03-21 17:53:38 -07:00
Konstantin Käfer
ea6b24d02d add text rendering code 2014-03-21 17:36:29 +01:00
Konstantin Käfer
a7b9b96d4d add textshader 2014-03-21 14:26:25 +01: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
Konstantin Käfer
0730ca640b get rid of float division 2014-03-21 13:32:03 +01:00
Konstantin Käfer
a4cda4ce20 fix Tile::parent() for negative x coords 2014-03-21 13:17:42 +01:00
Justin R. Miller
acd95168eb re-bind texture in right circumstances 2014-03-19 14:26:15 -07:00
Justin R. Miller
4dc6aa9aec don't attempt texture binding before the texture pool is setup 2014-03-19 14:22:00 -07:00
Konstantin Käfer
4ee0cf1791 port remainder of the the placement algorithm 2014-03-19 18:58:50 +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
98bb797a4a explicit names 2014-03-18 17:57:51 +01:00
Konstantin Käfer
6c61fb7fa5 missing braces 2014-03-17 16:58:26 +01:00