Commit Graph

37 Commits

Author SHA1 Message Date
Konstantin Käfer
50d4c97b64 whitespace + comments 2014-03-11 12:09:23 +01:00
Konstantin Käfer
4de8674f20 Merge branch 'variant' 2014-03-11 11:55:00 +01:00
Justin R. Miller
7a48e8ddce move to linear properties for POI opacity 2014-02-21 16:22:45 -08:00
Justin R. Miller
b6d7169b83 refs #60: add support for point colorization & opacity 2014-02-21 16:00:55 -08: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
0306e77ff0 remove void* parameter from platform::restart() 2014-02-21 12:18:11 +01:00
Konstantin Käfer
2602774a9c bind texture 0 2014-02-19 14:48:54 +01:00
Konstantin Käfer
c0997961aa don't use std::string to hold the image 2014-02-17 17:58:34 +01:00
Konstantin Käfer
9fb05741d6 make sure that mapView is initialized before referencing into it 2014-02-17 17:55:47 +01:00
Ansis Brammanis
9d89bc0909 first attempt at linux wrapper 2014-02-17 10:27:31 -05: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
Konstantin Käfer
b0357e8ea7 move tile size to constants.hpp 2014-02-13 17:34:08 +01: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
5e87cfed5a c++ - prefer switch over long-ish if/else (be nice to compiler) 2014-02-10 12:18:52 +00:00
Konstantin Käfer
9553bfa159 revert back to 32767 2014-02-06 15:29:23 +01:00
artemp
2d3abf36b1 c++
* prefer prefix increment operator unless logically necessary
  (it doesn't make any diff foro built-in type but good practice)
2014-02-06 10:50:31 +00:00
artemp
a8fef83564 c++
* use nullptr instead of NULL
2014-02-06 10:39:10 +00:00
Konstantin Käfer
e3db9b1ef1 add textured water 2014-02-04 11:40:28 +01:00
Dane Springmeyer
5b783f4eb1 fix sprite.cpp compile on linux - refs #27 2014-02-03 23:02:02 +00:00
Konstantin Käfer
9ab9eeec13 textured fills
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
e478ae2a2d allow binding the sprite object
refs #15
2014-02-03 17:44:12 +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
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
Dane Springmeyer
b70788a6f1 Merge branch 'master' of github.com:mapbox/llmr-native into unique-cpp-names 2014-01-29 14:00:36 -08:00
Dane Springmeyer
948a0d1922 avoid two cpp files named style.cpp 2014-01-29 13:57:29 -08: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
d153bdeff4 add style object 2014-01-23 15:33:00 +01:00