diff options
| author | Anand Thakker <anandthakker@users.noreply.github.com> | 2017-04-06 15:29:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 15:29:59 -0400 |
| commit | 693c9f3641b3189b4cd439049904c95a516ae609 (patch) | |
| tree | 8341a16f57ff184a2fe9e085c490e8762eb206ce /include/mbgl/style/layers | |
| parent | f9cc044357d60dd5cf15ba951384529f88802089 (diff) | |
| download | qtlocation-mapboxgl-693c9f3641b3189b4cd439049904c95a516ae609.tar.gz | |
[core] Add DDS support for {text,icon}-size (#8593)
* Update gl-js and generate style code
* Factor out packUint8Pair() helper function
* Draft implementation of DDS for {text,icon}-size
Ports https://github.com/mapbox/mapbox-gl-js/pull/4455
* Fix text-size/composite-function-line-placement test
* Refactor to PaintPropertyBinders-like strategy
* Dedupe gl::Program construction
* Use exponential function base for interpolation
* Dedupe coveringZoomStops method
* Fixup tests
* Fix CI errors (hidden within #if block)
Diffstat (limited to 'include/mbgl/style/layers')
| -rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 853a71bef2..6e29faa949 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -59,9 +59,9 @@ public: PropertyValue<AlignmentType> getIconRotationAlignment() const; void setIconRotationAlignment(PropertyValue<AlignmentType>); - static PropertyValue<float> getDefaultIconSize(); - PropertyValue<float> getIconSize() const; - void setIconSize(PropertyValue<float>); + static DataDrivenPropertyValue<float> getDefaultIconSize(); + DataDrivenPropertyValue<float> getIconSize() const; + void setIconSize(DataDrivenPropertyValue<float>); static PropertyValue<IconTextFitType> getDefaultIconTextFit(); PropertyValue<IconTextFitType> getIconTextFit() const; @@ -107,9 +107,9 @@ public: PropertyValue<std::vector<std::string>> getTextFont() const; void setTextFont(PropertyValue<std::vector<std::string>>); - static PropertyValue<float> getDefaultTextSize(); - PropertyValue<float> getTextSize() const; - void setTextSize(PropertyValue<float>); + static DataDrivenPropertyValue<float> getDefaultTextSize(); + DataDrivenPropertyValue<float> getTextSize() const; + void setTextSize(DataDrivenPropertyValue<float>); static PropertyValue<float> getDefaultTextMaxWidth(); PropertyValue<float> getTextMaxWidth() const; |