Konstantin Käfer
|
dd4c8a67ba
|
add explicit true type == "no filter"
|
2014-06-02 11:14:09 +02:00 |
|
Konstantin Käfer
|
99b6a700ef
|
move both variant options to recursive_wrapper
|
2014-06-02 11:14:09 +02:00 |
|
Konstantin Käfer
|
606ad56220
|
implement nested expression parsing
|
2014-06-02 11:14:09 +02:00 |
|
Konstantin Käfer
|
3bc5e03253
|
simple expression support
|
2014-06-02 11:14:09 +02:00 |
|
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 |
|
Dane Springmeyer
|
a944018367
|
[hardening] must return from non void function
|
2014-05-30 13:27:48 -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 |
|
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 |
|
Dane Springmeyer
|
f5394a7638
|
release mode: silent debug output + ifdef any potentially expensive calls
|
2014-05-29 18:07:19 -07:00 |
|
Dane Springmeyer
|
88f89d0150
|
initialize variables
|
2014-05-29 13:24:26 -07:00 |
|
Konstantin Käfer
|
192b5a30e4
|
make PropertyTransitions optional
|
2014-05-28 10:49:56 +02:00 |
|
Konstantin Käfer
|
4074db512f
|
fix stylesheet parse typo
refs #192
|
2014-05-28 06:34:29 +02:00 |
|
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 |
|
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
|
017145f052
|
show style parse warning if the flag is set
|
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 |
|
Konstantin Käfer
|
752661ae6e
|
allow functions to be referenced from constants
fixes #224
|
2014-05-21 10:29:36 +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
|
a81f41f41f
|
Merge branch 'master' into outdoors-style
Conflicts:
bin/style.js
|
2014-05-20 12:12:40 +02:00 |
|
Konstantin Käfer
|
e0381a782c
|
use smallest/largest value in undefined regions
refs #217
|
2014-05-20 11:52:17 +02:00 |
|
Konstantin Käfer
|
6bffa49309
|
don't account for tile size in the function; the value is tile source dependent
|
2014-05-20 11:51:49 +02:00 |
|
Konstantin Käfer
|
3be068f8da
|
make sure they never throw. asserts are compiled out in production!
|
2014-05-20 11:23:33 +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
|
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 |
|