Commit Graph

43 Commits

Author SHA1 Message Date
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
8c9f980271 correctly build shaders if the optimizer is not present 2014-04-11 16:23:06 -04:00
Konstantin Käfer
ebc9a0a0d7 add xcode project builds 2014-04-11 15:13:55 -04:00
Konstantin Käfer
ed657c42d5 remove ds_store file
[skip ci]
2014-04-11 14:30:46 -04:00
Konstantin Käfer
0768600a70 clean up build system and reuse previously built libraries in other targets 2014-04-11 11:29:18 -07:00
Konstantin Käfer
ee2f17d2b4 fix build on travis 2014-04-11 08:50:43 -07:00
Konstantin Käfer
662562d9fe use mapnik-packaging to build all dependencies 2014-04-09 15:57:21 -04: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
d2491939e9 move to naming like on web 2014-04-02 15:12:42 -07:00
Justin R. Miller
9b487f2e00 refs #83: move all POIs to min-based enabling 2014-03-26 14:25:59 -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
4b6b5b3b22 fail hard if the shader optimizer is unavailable 2014-03-26 11:51:15 +01:00
Konstantin Käfer
249b42a29d move node modules to bin/ folder to fix build 2014-03-26 11:51:05 +01:00
Konstantin Käfer
77f58960c4 build shaders for either desktop gl or gles2 2014-03-25 13:16:48 +01:00
Konstantin Käfer
d5b4c1162d add shader optimizer and reorder components 2014-03-25 12:10:19 +01:00
Konstantin Käfer
9621038d8a implement alwaysVisible 2014-03-24 17:38:10 +01:00
Konstantin Käfer
76d3d7badb explicitly specify font size in class 2014-03-24 17:21:14 +01:00
Konstantin Käfer
31912731d4 update style 2014-03-24 14:43:23 +01:00
Konstantin Käfer
d9589573bc extract label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
29e4ecb977 add text styling 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
207358b598 change datasource => source for compliance with js 2014-03-12 12:46:28 +01:00
Konstantin Käfer
26a91d29f5 remove unneeded file 2014-03-12 11:24:58 +01:00
Konstantin Käfer
91d42911fb parse the json stylesheet 2014-03-12 11:23:01 +01:00
Justin R. Miller
7a48e8ddce move to linear properties for POI opacity 2014-02-21 16:22:45 -08:00
Justin R. Miller
495d47ab42 refs #60: add some more point styles 2014-02-21 16:00:01 -08: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
Justin R. Miller
4ff01fb07f allow for easier editing of style in Xcode
* write protobuf directly to file instead of stdout (for Gyp)
 * add style.js to editable sources
 * add build phases for pbf conversion & resources updates
 * update README style directions
2014-02-13 16:24:00 -08:00
Konstantin Käfer
bec0ad10c4 drawing lines with triangles 2014-02-11 15:51:54 +01:00
Konstantin Käfer
e3db9b1ef1 add textured water 2014-02-04 11:40:28 +01:00
Konstantin Käfer
82c79b7bda remove c99 features
fixes #26
2014-02-03 23:21:50 +01:00
Konstantin Käfer
9ab9eeec13 textured fills
fixes #15
2014-02-03 22:51:21 +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
74dc256799 let roads show up till z30 2014-01-29 12:28:00 +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
50f99e414e define as extern 2014-01-21 15:44:56 +01:00
Konstantin Käfer
5aa22b9c32 move shaders to cpp file 2014-01-20 11:30:06 +01:00
Konstantin Käfer
29c10b7835 update style protobuf 2014-01-18 12:11:44 +01:00
Konstantin Käfer
4f8556a6b8 add protobuf encoding of style 2014-01-08 12:10:46 +01:00
Konstantin Käfer
528eaf475e emscripten support 2014-01-07 16:52:23 +01:00