Konstantin Käfer
67bbcd5334
allow setting prerender state with a function too
2014-06-01 18:12:44 +02:00
Konstantin Käfer
1be972eb15
Allow property functions for prerender properties, but tie them to the tile's zoom level instead of the map zoom level
...
fixes #253
2014-06-01 17:43:12 +02:00
Justin R. Miller
a81a336638
programmatic styling API
2014-05-31 11:32:42 -07:00
Dane Springmeyer
5f03cc1595
[hardening] fix double const& declaration
2014-05-30 13:41:07 -07:00
Young Hahn
2d0b3482ec
Merge branch 'master' into linebreak
...
Conflicts:
src/map/tile_parser.cpp
src/text/glyph_store.cpp
2014-05-30 09:00:29 -04:00
Konstantin Käfer
461a19dfa2
fallback to default properties instead of not rendering when we don't have a style
...
refs #272
2014-05-30 13:36:53 +02:00
Ansis Brammanis
9ac55e0d74
add text letterSpacing
2014-05-30 04:02:23 -04:00
Ansis Brammanis
7c653895c6
translate as a text bucket property
...
When used, text is translated before being checked for collisions.
2014-05-30 03:50:25 -04:00
Ansis Brammanis
41c310c762
add verticalAlign for text
...
Default is center. Other options are "top" and "bottom"
2014-05-30 03:11:57 -04:00
Mike Morris
3442403e67
parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping
2014-05-30 00:07:22 -04:00
Konstantin Käfer
192b5a30e4
make PropertyTransitions optional
2014-05-28 10:49:56 +02:00
Konstantin Käfer
23da773667
a few preliminary speed improvements
2014-05-27 12:08:36 +02:00
Konstantin Käfer
708fb01276
used unordered_maps
2014-05-27 11:55:40 +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
9b5c75cef0
add isVisible function to Properties
2014-05-26 15:34:50 +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
a7c3b8b6f5
derive properties from a generic class
2014-05-26 11:58:37 +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
aa92e92595
support for style transitions
2014-05-22 12:46:53 -07:00
Konstantin Käfer
834ef2eee8
don't require a style for composited layers
2014-05-21 13:40:59 +02: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
Konstantin Käfer
238fe86571
partially revert 6136ab6d21
...
background: we are doing separate opaque/translucent passes per composite layer
and then we're compositing them in the translucent phase
2014-05-21 10:53:40 +02:00
Konstantin Käfer
575491e65c
make sure we also parse classes for nested layers
2014-05-21 10:53:40 +02:00
Justin R. Miller
550e381e70
name text halo properties like others
2014-05-20 11:26:52 -07:00
Konstantin Käfer
7d73d158ba
incorporate the color and draw circle dots if we don't have an icon
2014-05-19 16:19:51 +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
f848868c16
fix texture binding
2014-05-19 14:18:29 +02:00
Konstantin Käfer
13575330f7
use sprite atlas
2014-05-19 10:48:36 +02:00
Konstantin Käfer
27f8ed29e4
encode icon texture coordinate in buffer so we can render all pois with 1 draw call
2014-05-19 10:48:36 +02:00
Konstantin Käfer
4c99014a13
don't use fractional texture coordiantes in the shader
2014-05-15 15:16:34 +02:00
Konstantin Käfer
27b695b068
use explicit constructors
2014-05-15 14:56:06 +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
a812f37c60
make sure to premultiply the colors during stylesheet parsing
...
fixes #193
2014-05-14 15:05:59 +02:00
Konstantin Käfer
2d938f2ec2
make sure to premultiply the colors during stylesheet parsing
...
fixes #193
2014-05-14 15:04:33 +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
Justin R. Miller
654520ea34
Revert "refs #166 : fix for std::stoll et al. not handling strings"
...
This reverts commit bc29ed5a9c .
2014-05-12 17:14:28 -07:00
Justin R. Miller
bc29ed5a9c
refs #166 : fix for std::stoll et al. not handling strings
2014-05-12 14:00:10 -07: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
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