Commit Graph

513 Commits

Author SHA1 Message Date
Mike Morris
3442403e67 parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping 2014-05-30 00:07:22 -04:00
Justin R. Miller
7b2355c696 Merge branch 'master' into bezier 2014-05-29 16:12:10 -07:00
Vladimir Agafonkin
841cee7750 change default cubic bezier for easings 2014-05-29 23:41:49 +03:00
Dane Springmeyer
07767951ee use std::abs 2014-05-29 13:24:26 -07:00
Dane Springmeyer
b4d5b1ca65 use std::pow 2014-05-29 13:24:26 -07:00
Dane Springmeyer
88f89d0150 initialize variables 2014-05-29 13:24:26 -07:00
Dane Springmeyer
829f9d1197 [build] another missing <memory> include 2014-05-29 12:36:22 -07:00
Dane Springmeyer
42c233b8b4 fix -Wformat-security warning with dodgy fprintf 2014-05-29 12:33:00 -07:00
Young Hahn
72a71c6f70 Lookup shaping value by string key. Refs #272. 2014-05-29 12:13:56 -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
99396478ff Use 256 sized rangeglyphs. Switch to mapbox API VTs. 2014-05-29 11:41:35 -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
f48999dc13 Treat out of range glyphs as belonging to 0-127 for now. 2014-05-29 05:37:30 -04:00
Young Hahn
d5349f9cd3 Don't call varint() more than once. 2014-05-29 05:19:15 -04:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Young Hahn
36796490de More educated guess. 2014-05-28 23:12:26 -04:00
Young Hahn
25803b4b98 Guesses. 2014-05-28 22:57:32 -04:00
Dane Springmeyer
97683460c1 fix compile of glyph_store.cpp 2014-05-28 19:57:26 -07:00
Dane Springmeyer
5c46bef717 fallback to boost::locale on linux 2014-05-28 19:57:01 -07:00
Dane Springmeyer
c85a0c3da2 comment unfinished FontStack code 2014-05-28 19:44:11 -07:00
Dane Springmeyer
56c55d0b02 add include <algorithm> needed for std::replace on linux 2014-05-29 02:36:47 +00:00
Young Hahn
944167296a replace comes from regex 2014-05-28 18:53:54 -04:00
Young Hahn
a66db39a06 Monkey patching to get linux compile working. 2014-05-28 18:45:47 -04:00
Konstantin Käfer
83b3b0bb6a create a copy 2014-05-28 22:18:18 +02:00
Konstantin Käfer
6f68cd3676 return font stack 2014-05-28 22:12:31 +02:00
Konstantin Käfer
193b2aacb7 add second labelling pass 2014-05-28 22:00:00 +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
1749aa3de2 switch to glyph/shaping-less endpoint 2014-05-28 15:51:29 +02:00
Konstantin Käfer
cca9d81ee7 add debug warnings 2014-05-28 15:51:09 +02:00
Konstantin Käfer
192b5a30e4 make PropertyTransitions optional 2014-05-28 10:49:56 +02:00
Konstantin Käfer
e304f6629f only change pass parameters if we actually need to 2014-05-28 09:47:55 +02:00
Konstantin Käfer
4074db512f fix stylesheet parse typo
refs #192
2014-05-28 06:34:29 +02:00
Konstantin Käfer
a17c86840f Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-05-27 19:38:42 +02:00
Konstantin Käfer
f32c996348 fixed subtle clip id generation bug
refs #206
2014-05-27 18:51:09 +02:00
Vladimir Agafonkin
00d6cc6bdd simplify glyph boxes handling 2014-05-27 19:33:26 +03: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
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
2029763b71 only blur if we actually need to 2014-05-26 16:11:23 +02:00
Konstantin Käfer
e40ed2729d use lambda initialization for matrix 2014-05-26 15:43:12 +02:00
Konstantin Käfer
2d0037b112 don't respect opacity when prerendering tile; we do opacity at composite-time 2014-05-26 15:38:51 +02:00
Konstantin Käfer
6ed5c0ddf3 use sigma 1 for blur by default 2014-05-26 15:35:08 +02:00
Konstantin Käfer
9b5c75cef0 add isVisible function to Properties 2014-05-26 15:34:50 +02:00