Commit Graph

263 Commits

Author SHA1 Message Date
Konstantin Käfer
c5fd7a0cdd add token replacement system
fixes #212
2014-05-30 21:13:55 +02:00
Konstantin Käfer
da29a16370 skip second loop 2014-05-30 21:13:55 +02:00
Ansis Brammanis
0dd78c96e3 Merge remote-tracking branch 'origin/linebreak' 2014-05-30 13:06:25 -04:00
Konstantin Käfer
d5e63cea21 retain the uv loop until all things deconstructed
fixes #261
2014-05-30 17:32:09 +02:00
Konstantin Käfer
78fda8bb62 make sure we retain shared state when destructing the map object
refs #261
2014-05-30 17:00:47 +02:00
Young Hahn
2d0b3482ec Merge branch 'master' into linebreak
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
2014-05-30 09:00:29 -04:00
Konstantin Käfer
31d9dbefea pass shaping directly instead of looking it up 2014-05-30 14:01:53 +02:00
Konstantin Käfer
461a19dfa2 fallback to default properties instead of not rendering when we don't have a style
refs #272
2014-05-30 13:36:53 +02:00
Konstantin Käfer
942da9cecc don't convert twice 2014-05-30 13:23:48 +02:00
Konstantin Käfer
2aa9174507 Merge pull request #281 from mapbox/cleanup
post-glyphrange cleanup
2014-05-30 11:24:48 +02:00
Ansis Brammanis
9ac55e0d74 add text letterSpacing 2014-05-30 04:02:23 -04:00
Ansis Brammanis
41c310c762 add verticalAlign for text
Default is center. Other options are "top" and "bottom"
2014-05-30 03:11:57 -04:00
Mike Morris
3442403e67 parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping 2014-05-30 00:07:22 -04:00
Young Hahn
6e53a0328b Remove VectorTileGlyph, VectorTileFace, IndexedFaces, Faces and glyph related parts of vector_tile.proto. Refs #274. 2014-05-29 22:54:46 -04:00
Dane Springmeyer
f5394a7638 release mode: silent debug output + ifdef any potentially expensive calls 2014-05-29 18:07:19 -07:00
Dane Springmeyer
b4d5b1ca65 use std::pow 2014-05-29 13:24:26 -07: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
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
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
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
ed7b86a134 add glyph store and load glyph pbfs 2014-05-28 20:51:13 +02: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
e304f6629f only change pass parameters if we actually need to 2014-05-28 09:47:55 +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
9b5c75cef0 add isVisible function to Properties 2014-05-26 15:34:50 +02:00
Justin R. Miller
661860d12f foundations of delegate/callback API 2014-05-23 18:32:55 -07:00
Justin R. Miller
3c5a2c7935 disallow/undo rotation at low zooms and near world edge 2014-05-23 18:24:58 -07:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Justin R. Miller
3f55302fb5 reset angle on resize to small zooms 2014-05-22 16:54:04 -07:00
Justin R. Miller
dbd877cb80 disallow/undo rotation at low zooms 2014-05-22 16:47:17 -07: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
12594ce8f1 clearer comments 2014-05-22 14:24:54 -07:00
Justin R. Miller
bccba97020 style cascading needs to happen every render for transitions 2014-05-22 14:22:54 -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
bb2cda34a7 make sure we're not calling functions that aren't threadsafe 2014-05-22 12:12:19 +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
Konstantin Käfer
13939b26d9 first shot at composited blending
still missing:
- stencil+depth mask
- alpha compositing
2014-05-21 10:55:09 +02:00