diff options
author | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
---|---|---|
committer | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
commit | 9e8dc9a9e3e86adb9987ae69766cc42c7d9efece (patch) | |
tree | f5f0abd4d342c89ad0405d01969f9d6caecc1c90 /include/mbgl/style/layers/fill_layer.hpp | |
parent | 16fb0672e64a72b7400c321d55858b73cd5d8c3f (diff) | |
parent | f28d75dccd9bf4a7615df87faccc5cf5eff8df89 (diff) | |
download | qtlocation-mapboxgl-9e8dc9a9e3e86adb9987ae69766cc42c7d9efece.tar.gz |
Merge remote-tracking branch 'origin/master' into feature/custom-vector-source
Diffstat (limited to 'include/mbgl/style/layers/fill_layer.hpp')
-rw-r--r-- | include/mbgl/style/layers/fill_layer.hpp | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 4b9201641d..c064eab350 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -5,12 +5,15 @@ #include <mbgl/style/layer.hpp> #include <mbgl/style/filter.hpp> #include <mbgl/style/property_value.hpp> +#include <mbgl/style/data_driven_property_value.hpp> #include <mbgl/util/color.hpp> namespace mbgl { namespace style { +class TransitionOptions; + class FillLayer : public Layer { public: FillLayer(const std::string& layerID, const std::string& sourceID); @@ -29,30 +32,37 @@ public: static PropertyValue<bool> getDefaultFillAntialias(); PropertyValue<bool> getFillAntialias(const optional<std::string>& klass = {}) const; void setFillAntialias(PropertyValue<bool>, const optional<std::string>& klass = {}); + void setFillAntialiasTransition(const TransitionOptions&, const optional<std::string>& klass = {}); - static PropertyValue<float> getDefaultFillOpacity(); - PropertyValue<float> getFillOpacity(const optional<std::string>& klass = {}) const; - void setFillOpacity(PropertyValue<float>, const optional<std::string>& klass = {}); + static DataDrivenPropertyValue<float> getDefaultFillOpacity(); + DataDrivenPropertyValue<float> getFillOpacity(const optional<std::string>& klass = {}) const; + void setFillOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {}); + void setFillOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {}); - static PropertyValue<Color> getDefaultFillColor(); - PropertyValue<Color> getFillColor(const optional<std::string>& klass = {}) const; - void setFillColor(PropertyValue<Color>, const optional<std::string>& klass = {}); + static DataDrivenPropertyValue<Color> getDefaultFillColor(); + DataDrivenPropertyValue<Color> getFillColor(const optional<std::string>& klass = {}) const; + void setFillColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {}); + void setFillColorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); - static PropertyValue<Color> getDefaultFillOutlineColor(); - PropertyValue<Color> getFillOutlineColor(const optional<std::string>& klass = {}) const; - void setFillOutlineColor(PropertyValue<Color>, const optional<std::string>& klass = {}); + static DataDrivenPropertyValue<Color> getDefaultFillOutlineColor(); + DataDrivenPropertyValue<Color> getFillOutlineColor(const optional<std::string>& klass = {}) const; + void setFillOutlineColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {}); + void setFillOutlineColorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); static PropertyValue<std::array<float, 2>> getDefaultFillTranslate(); PropertyValue<std::array<float, 2>> getFillTranslate(const optional<std::string>& klass = {}) const; void setFillTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {}); + void setFillTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {}); static PropertyValue<TranslateAnchorType> getDefaultFillTranslateAnchor(); PropertyValue<TranslateAnchorType> getFillTranslateAnchor(const optional<std::string>& klass = {}) const; void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {}); + void setFillTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); static PropertyValue<std::string> getDefaultFillPattern(); PropertyValue<std::string> getFillPattern(const optional<std::string>& klass = {}) const; void setFillPattern(PropertyValue<std::string>, const optional<std::string>& klass = {}); + void setFillPatternTransition(const TransitionOptions&, const optional<std::string>& klass = {}); // Private implementation |