Konstantin Käfer
604e558d46
add missing include header
2014-05-10 10:32:30 +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
Konstantin Käfer
7f4f327166
make sure we're not converting too relaxedly
2014-05-08 13:42:54 +02:00
Konstantin Käfer
115afe3b10
add relaxed comparsion function + tests
2014-05-08 13:03:59 +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
1216a061d3
move to libuv for the rendering loop
2014-04-30 12:01:26 +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
Konstantin Käfer
78c10c0701
Merge remote-tracking branch 'remotes/origin/pr/127'
...
Conflicts:
include/llmr/map/map.hpp
src/map/map.cpp
src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Konstantin Käfer
eb499e77c1
fix linejoin drawing on retina
2014-04-10 11:49:43 -04:00
Justin R. Miller
e5713f31a6
move to raster buckets & tile parser handling raster decoding
2014-04-09 11:38:42 -07:00
Justin R. Miller
1215f6f1fe
refs #101 : data sources with styling
...
* add second, satellite class to stylesheet
* get rid of tile clipping masks for now
* flesh out raster styling properties
2014-04-04 13:24:11 -07:00
Justin R. Miller
2eca1c419b
add support for background opacity in style
2014-04-02 16:09:31 -07:00
Konstantin Käfer
0c6f993695
add min/max functions and refactor FunctionProperty
...
fixes #83
2014-03-26 12:21:33 +01:00
Konstantin Käfer
e427f51dd4
remove generated files
2014-03-25 13:25:35 +01:00
Konstantin Käfer
166305fb14
change hidden to enabled
...
refs #83
2014-03-25 13:23:51 +01:00
Konstantin Käfer
9621038d8a
implement alwaysVisible
2014-03-24 17:38:10 +01:00
Konstantin Käfer
75cd64de58
add toString method for Value variant
2014-03-24 14:47:21 +01:00
Konstantin Käfer
c00ec64205
exponential functions
2014-03-24 14:45:33 +01:00
Konstantin Käfer
ea6b24d02d
add text rendering code
2014-03-21 17:36:29 +01:00
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
Konstantin Käfer
4ee0cf1791
port remainder of the the placement algorithm
2014-03-19 18:58:50 +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
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
277bc1586d
add constants and move style parser to its own class
2014-03-12 13:26:24 +01:00
Konstantin Käfer
c44d056c24
respect style background color
2014-03-12 11:42:17 +01:00
Konstantin Käfer
91d42911fb
parse the json stylesheet
2014-03-12 11:23:01 +01:00
Konstantin Käfer
4de8674f20
Merge branch 'variant'
2014-03-11 11:55:00 +01:00
Konstantin Käfer
e382cab17d
make implicit type conversions explicit
2014-02-21 13:08:13 +01:00
Konstantin Käfer
5f64ecc3cc
Merge branch 'master' into linux-wrapper
...
Conflicts:
include/llmr/style/sprite.hpp
2014-02-21 12:26:16 +01:00
Konstantin Käfer
c0997961aa
don't use std::string to hold the image
2014-02-17 17:58:34 +01:00
Justin R. Miller
828d8ba26f
refs #60 : first cut of POI rendering
...
* add basic marker style to stylesheet
* pass through marker style to PBF conversion
* marker/point tile parsing, bucket, buffer, shaders, etc.
* new sprite hosting for 1x/2x variants
* sprite load accepts screen scale argument
2014-02-14 18:13:12 -08:00
artemp
0939acca30
custom variant type (replaces boost::variant and removes boost dependency altogether)
2014-02-12 14:32:54 +00:00
Konstantin Käfer
bec0ad10c4
drawing lines with triangles
2014-02-11 15:51:54 +01:00
artemp
0157e4f140
c++ - change types order in boost::variant to move std::string to the end
...
("By default, a variant default-constructs its first bounded type..")
2014-02-10 12:24:48 +00:00
Konstantin Käfer
efac401db1
add <memory>
2014-02-04 14:17:53 +01:00
Konstantin Käfer
2df45d0c4a
refactor header includes
2014-02-04 14:07:56 +01:00
Dane Springmeyer
ebedcce508
fix compile on linux
2014-02-03 22:58:59 +00:00
Dane Springmeyer
f1e74215fd
compile fixes on ubuntu precise/g++-4.8 - refs #27
2014-02-03 21:57:46 +00:00
Konstantin Käfer
9ab9eeec13
textured fills
...
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
a6e464b9a7
add sprite object and parse image
...
refs #15
2014-02-03 17:38:40 +01:00
Konstantin Käfer
f1d5f75c4f
add comment about json stylesheets
2014-02-03 14:55:21 +01:00
Konstantin Käfer
9d982c10fd
first part of loading JSON stylesheets
2014-02-03 14:54:16 +01:00
Konstantin Käfer
202e0270f7
add rapidjson for parsing sprite json files
2014-02-03 11:36:34 +01:00
Konstantin Käfer
a8b1df403c
fix errors from rename of style.hpp to resources.hpp
2014-01-30 11:24:39 +01:00
Konstantin Käfer
29f0214eea
linear fades
2014-01-29 14:49:11 +01:00
Konstantin Käfer
d5cae14770
parse line width function and call tile destructor from main thread
2014-01-29 12:25:50 +01:00
Konstantin Käfer
04e16cf2ca
make line drawing work
2014-01-29 11:12:09 +01:00
Konstantin Käfer
918a68f5dd
create line geometry
2014-01-28 17:17:00 +01:00
