Konstantin Käfer
48019ae85c
make more members of StyleLayer const
2014-06-27 18:39:42 +02:00
Konstantin Käfer
d75f0075f3
even more refactoring
2014-06-27 16:42:44 +02:00
Konstantin Käfer
aff667d742
add filter expressions
2014-06-26 15:04:18 +02:00
Konstantin Käfer
b95d023a98
remove debug statements
2014-06-24 19:01:41 +02:00
Konstantin Käfer
ba4294ae0c
saving current state
2014-06-23 18:05:25 +02:00
Konstantin Käfer
71d2b230a1
separate bucket render properties and change naming
2014-06-16 11:49:11 +02:00
Konstantin Käfer
ef76be64a2
separate out token replacer as a standalone function in preparation for #300
2014-06-04 10:53:08 +02:00
Konstantin Käfer
f59424b00b
skip background layer early
2014-06-04 10:09:38 +02:00
Konstantin Käfer
fbd983f104
don't make a copy of the glyph store
2014-06-03 18:11:19 +02:00
Dane Springmeyer
3289009584
use boost::regex on linux - refs #286
2014-05-30 16:45:13 -07:00
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
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
942da9cecc
don't convert twice
2014-05-30 13:23: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
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
cca9d81ee7
add debug warnings
2014-05-28 15:51:09 +02:00
Konstantin Käfer
084e7af377
better sprite warnings
2014-05-22 15:19:51 +02:00
Konstantin Käfer
16a79b42ca
show tile parse warnings
2014-05-21 14:18:25 +02:00
Ansis Brammanis
2b348ccfd4
Merge branch 'master' of github.com:mapbox/llmr-native
2014-05-19 17:36:50 -04:00
Ansis Brammanis
4d38e4eb15
fix rotation range check in text shader
...
fixes #215
2014-05-19 17:35:55 -04:00
Konstantin Käfer
13575330f7
use sprite atlas
2014-05-19 10:48:36 +02:00
Konstantin Käfer
27f8ed29e4
encode icon texture coordinate in buffer so we can render all pois with 1 draw call
2014-05-19 10:48:36 +02:00
Konstantin Käfer
fda64b67af
rename point => icon
2014-05-15 14:51:02 +02:00
Konstantin Käfer
0bfd7b0f43
Calculate clip IDs with a huffman prefix tree
...
This changes the clip IDs from sequential to a huffman prefix tree, meaning that
parent tiles share the same prefix with child tiles (but are shorter). This allows
us to use the same checkerboard pattern to draw all tiles.
TODO:
- make sure we're not overflowing the 8 bit limit of the stencil buffer
- draw all checkerboard fields at the same time, with one draw call
- fix raster drawing (fading, clipping)
refs #132
2014-05-09 18:10:28 +02:00
Justin R. Miller
2b9fbb0731
squashed stylequest merge
...
* uses OSM Bright style
* adds dot shader
* adds layer translation
* adds dashed line support
* adds style array parsing
* improves background layer parsing
* improves style constant parsing
* fixes sprite JSON pixel ratio parsing
2014-05-07 10:37:25 -07:00
Konstantin Käfer
74768abeb8
make sure we call the sprite load callback
2014-04-30 12:58:38 +02:00
Konstantin Käfer
666f593803
use an event loop per map that is not the render thread
2014-04-25 14:26:59 +02:00
Justin R. Miller
e5713f31a6
move to raster buckets & tile parser handling raster decoding
2014-04-09 11:38:42 -07: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
67a8882457
use the correct glyphs
2014-03-24 11:13:20 +01:00
Konstantin Käfer
4ee0cf1791
port remainder of the the placement algorithm
2014-03-19 18:58:50 +01:00
Konstantin Käfer
99cef810ac
move tile parsing to its own object
2014-03-14 11:36:10 +01:00
