Commit Graph

57 Commits

Author SHA1 Message Date
Konstantin Käfer
23da773667 a few preliminary speed improvements 2014-05-27 12:08:36 +02:00
Konstantin Käfer
9477097f0f Revert "refs #253: support blur function property values"
This reverts commit 34b90476b4.
2014-05-27 09:59:35 +02:00
Justin R. Miller
34b90476b4 refs #253: support blur function property values 2014-05-26 23:48:50 -07:00
Konstantin Käfer
1b58fb30a3 use unordered map, don't make copies (auto usage!) and swap maps 2014-05-26 18:40:47 +02:00
Konstantin Käfer
4b8e3faa70 consolidate stylesheet cascading 2014-05-26 12:43:49 +02:00
Konstantin Käfer
e506d6bcdd generalize stylesheet parse function 2014-05-26 12:30:27 +02:00
Konstantin Käfer
7d767f518b add keys to stylesheet 2014-05-23 13:38:59 +02:00
Konstantin Käfer
ce2270eafc use boost optional to mark initialized values 2014-05-23 13:14:11 +02:00
Justin R. Miller
80cb89a6b5 be sure to track previous composites 2014-05-22 12:52:06 -07:00
Justin R. Miller
aa92e92595 support for style transitions 2014-05-22 12:46:53 -07:00
Konstantin Käfer
13939b26d9 first shot at composited blending
still missing:
- stencil+depth mask
- alpha compositing
2014-05-21 10:55:09 +02:00
Justin R. Miller
550e381e70 name text halo properties like others 2014-05-20 11:26:52 -07:00
Konstantin Käfer
fde4f2cd70 Merge branch 'master' into outdoors-style 2014-05-20 12:21:59 +02:00
Konstantin Käfer
1420848314 accomodate function values for tile size difference 2014-05-20 12:21:32 +02:00
Konstantin Käfer
9bb0146875 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
2014-05-19 15:52:42 +02:00
Konstantin Käfer
44f8c80d21 also clear text and raster styles 2014-05-15 14:51:11 +02:00
Konstantin Käfer
fda64b67af rename point => icon 2014-05-15 14:51:02 +02:00
Konstantin Käfer
51f523ec14 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
	include/llmr/map/transform.hpp
	src/renderer/painter.cpp
	src/text/placement.cpp
2014-05-14 17:42:10 +02:00
Konstantin Käfer
a27f8798ff add translate-anchor: viewport to lines + points
refs #189
2014-05-14 17:17:47 +02:00
Konstantin Käfer
afc54b7956 add translate-anchor for fills 2014-05-14 16:51:27 +02:00
Konstantin Käfer
790b6cbdb3 add strokeBlur property (default 1.0, larger values blur more) to achieve a gradient effect
fixes #194
2014-05-14 15:27:49 +02:00
Konstantin Käfer
d97e8899ae add translate-anchor property 2014-05-14 10:31:57 +02:00
Konstantin Käfer
b3a1e35f44 add translate-anchor property 2014-05-13 18:41:22 +02:00
Konstantin Käfer
b096373b71 abort rendering early if the style is disabled
refs #184
2014-05-13 15:15:54 +02:00
Konstantin Käfer
263c887777 don't try to render layers that do not produce anyting during the current render pass
refs #184
2014-05-12 19:53:06 +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
Justin R. Miller
a59ada6d00 fix comments 2014-04-04 13:45:17 -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
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
ea6b24d02d add text rendering code 2014-03-21 17:36:29 +01:00
Konstantin Käfer
d9589573bc extract label shaping 2014-03-14 11:36:10 +01:00
Konstantin Käfer
45c341b414 use external library 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
72ac0c9c31 use external library 2014-03-12 12:43:18 +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
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
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
Konstantin Käfer
9ab9eeec13 textured fills
fixes #15
2014-02-03 22:51: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