Commit Graph

388 Commits

Author SHA1 Message Date
Dane Springmeyer
c9a1d9efd4 remove unused member variable 2014-05-29 14:17:22 -07:00
Dane Springmeyer
f83f4a6d63 include <memory> / fix compile issues with g++-4.9 2014-05-29 12:16:25 -07:00
Young Hahn
6c38107e4d Merge branch 'glyphrange' into glyphrange-yh-guesses 2014-05-29 12:19:05 -04:00
Mike Morris
67a3e4651f include locale, ref #270 2014-05-29 12:08:37 -04:00
Young Hahn
bdb16b9ae7 Merge branch 'master' into glyphrange-master
Conflicts:
	bin/style.js
	src/text/placement.cpp
2014-05-29 11:59:12 -04:00
Young Hahn
86ae823306 Merge branch 'glyphrange-boost-locale' into glyphrange-yh-guesses
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-29 06:06:57 -04:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Dane Springmeyer
da0d436572 missing semicolon 2014-05-28 20:28:37 -07:00
Dane Springmeyer
6b0465448d fix utf.hpp linux compile 2014-05-28 20:04:40 -07:00
Dane Springmeyer
5c46bef717 fallback to boost::locale on linux 2014-05-28 19:57:01 -07:00
Dane Springmeyer
45eba8d29f fix #268 2014-05-28 19:20:37 -07:00
Konstantin Käfer
6f68cd3676 return font stack 2014-05-28 22:12:31 +02:00
Konstantin Käfer
906b4839c6 parse glyph pbf 2014-05-28 21:55:14 +02:00
Konstantin Käfer
ed7b86a134 add glyph store and load glyph pbfs 2014-05-28 20:51:13 +02:00
Vladimir Agafonkin
7dc706b063 Merge pull request #257 from mapbox/optimize-placement
Ignore flipped glyphs when placing labels for perf
2014-05-28 17:17:34 +03:00
Konstantin Käfer
cca9d81ee7 add debug warnings 2014-05-28 15:51:09 +02:00
Konstantin Käfer
5b38927c5f use an unordered map for bucket name => bucket 2014-05-28 14:54:54 +02:00
Konstantin Käfer
192b5a30e4 make PropertyTransitions optional 2014-05-28 10:49:56 +02:00
Vladimir Agafonkin
88a5de2aa6 ignore flipped glyphs when placing labels for perf 2014-05-27 18:49:18 +03:00
Vladimir Agafonkin
6ab1dcbeeb remove some leftover code 2014-05-27 18:19:24 +03:00
Konstantin Käfer
23da773667 a few preliminary speed improvements 2014-05-27 12:08:36 +02:00
Konstantin Käfer
708fb01276 used unordered_maps 2014-05-27 11:55:40 +02:00
Konstantin Käfer
9477097f0f Revert "refs #253: support blur function property values"
This reverts commit 34b90476b4.
2014-05-27 09:59:35 +02:00
Justin R. Miller
34b90476b4 refs #253: support blur function property values 2014-05-26 23:48:50 -07:00
Konstantin Käfer
1b58fb30a3 use unordered map, don't make copies (auto usage!) and swap maps 2014-05-26 18:40:47 +02:00
Konstantin Käfer
4ad3a1ee76 Merge branch 'master' into blur
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
2014-05-26 17:30:31 +02:00
Konstantin Käfer
3a9f353a1e move a view calls to generic functions 2014-05-26 16:33:38 +02:00
Konstantin Käfer
9b5c75cef0 add isVisible function to Properties 2014-05-26 15:34:50 +02:00
Konstantin Käfer
6350dc5235 move blurring to texture object 2014-05-26 13:31:51 +02:00
Konstantin Käfer
4b8e3faa70 consolidate stylesheet cascading 2014-05-26 12:43:49 +02:00
Konstantin Käfer
e506d6bcdd generalize stylesheet parse function 2014-05-26 12:30:27 +02:00
Konstantin Käfer
a7c3b8b6f5 derive properties from a generic class 2014-05-26 11:58:37 +02:00
Justin R. Miller
661860d12f foundations of delegate/callback API 2014-05-23 18:32:55 -07:00
Justin R. Miller
8d678e3e9c Merge branch 'master' of github.com:mapbox/llmr-native 2014-05-23 18:25:19 -07:00
Justin R. Miller
3c5a2c7935 disallow/undo rotation at low zooms and near world edge 2014-05-23 18:24:58 -07:00
Justin R. Miller
07e15927af remove unneeded headers 2014-05-23 11:29:58 -07:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Konstantin Käfer
7d767f518b add keys to stylesheet 2014-05-23 13:38:59 +02:00
Konstantin Käfer
ce2270eafc use boost optional to mark initialized values 2014-05-23 13:14:11 +02:00
Justin R. Miller
1ff173a049 fixes #48: constrain min zoom/vertical pan to within world 2014-05-22 16:11:21 -07:00
Justin R. Miller
aa92e92595 support for style transitions 2014-05-22 12:46:53 -07:00
Konstantin Käfer
084e7af377 better sprite warnings 2014-05-22 15:19:51 +02:00
Konstantin Käfer
6ae0b71bbb fix framebuffer drawing on ios 2014-05-22 14:15:51 +02:00
Konstantin Käfer
67ab9ff6f5 add cleanup call for destroying framebuffers 2014-05-22 12:41:17 +02:00
Konstantin Käfer
5bf52bfcd7 fix compile on ios 2014-05-22 12:28:19 +02:00
Konstantin Käfer
bb2cda34a7 make sure we're not calling functions that aren't threadsafe 2014-05-22 12:12:19 +02:00
Konstantin Käfer
ab4bc4ae30 add vec2 * mat4 multiplication 2014-05-21 19:23:20 +02:00
Konstantin Käfer
53a6992728 fix alpha blending + add depth/stencil buffers 2014-05-21 18:34:41 +02:00
Konstantin Käfer
16a79b42ca show tile parse warnings 2014-05-21 14:18:25 +02:00
Konstantin Käfer
834ef2eee8 don't require a style for composited layers 2014-05-21 13:40:59 +02:00