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 |
|
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
|
56e06f527c
|
remove unused glyphs from atlas again
|
2014-03-14 12:50:28 +01:00 |
|
Konstantin Käfer
|
99cef810ac
|
move tile parsing to its own object
|
2014-03-14 11:36:10 +01:00 |
|
Konstantin Käfer
|
be44b6b31f
|
add glyph atlas to map
|
2014-03-14 11:36:10 +01:00 |
|
Konstantin Käfer
|
d9589573bc
|
extract label shaping
|
2014-03-14 11:36:10 +01:00 |
|
Konstantin Käfer
|
a26ddf8bce
|
parse feature objects so that we can access all tags
|
2014-03-14 11:36:10 +01:00 |
|
Konstantin Käfer
|
8171c7bb43
|
add empty classes for rendering glyphs
|
2014-03-14 11:36:10 +01:00 |
|
Konstantin Käfer
|
f8a096a4fa
|
use templated function to reduce code
|
2014-03-14 11:36:10 +01:00 |
|
Konstantin Käfer
|
1fbaa95b02
|
fix tile loading
|
2014-03-05 16:40:07 +01:00 |
|
Konstantin Käfer
|
a3a1b812c8
|
don't pass around pointers if all we need is the state
|
2014-03-05 09:56:36 +01:00 |
|
Konstantin Käfer
|
027c6f33b3
|
implement tile wrapping
fixes #14
|
2014-03-05 09:40:32 +01:00 |
|
Konstantin Käfer
|
b0ddabd6ac
|
rename Tile to TileData
|
2014-03-04 17:53:16 +01:00 |
|