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 |
|
Konstantin Käfer
|
f19d5c95db
|
rename stroke=>line, add line painter classes
|
2014-01-28 14:09:07 +01:00 |
|
Konstantin Käfer
|
1538ebaf22
|
cascade styles
|
2014-01-27 17:21:48 +01:00 |
|
Konstantin Käfer
|
e2dbcc95b5
|
draw fills according to the style
|
2014-01-27 14:07:56 +01:00 |
|
Konstantin Käfer
|
2a6e4597e2
|
pass style into painter
|
2014-01-23 16:36:04 +01:00 |
|
Konstantin Käfer
|
d153bdeff4
|
add style object
|
2014-01-23 15:33:00 +01:00 |
|
Konstantin Käfer
|
dba3be9829
|
do not use shared pointers for buckets
|
2014-01-23 15:12:31 +01:00 |
|
Konstantin Käfer
|
50021b730c
|
move to layer system
|
2014-01-23 14:20:22 +01:00 |
|