From b6e5edc26844df6a5f1f6e34881826828d36ce6a Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 9 Feb 2017 12:36:40 -0800 Subject: [core] Restore support for *-transition properties --- .../style/conversion/make_property_setters.hpp | 58 ++++++++++++++++++++++ .../style/conversion/make_property_setters.hpp.ejs | 1 + include/mbgl/style/conversion/property_setter.hpp | 19 +++++++ .../mbgl/style/conversion/transition_options.hpp | 45 +++++++++++++++++ include/mbgl/style/layers/background_layer.hpp | 5 ++ include/mbgl/style/layers/circle_layer.hpp | 12 +++++ include/mbgl/style/layers/fill_extrusion_layer.hpp | 9 ++++ include/mbgl/style/layers/fill_layer.hpp | 9 ++++ include/mbgl/style/layers/layer.hpp.ejs | 3 ++ include/mbgl/style/layers/line_layer.hpp | 12 +++++ include/mbgl/style/layers/raster_layer.hpp | 9 ++++ include/mbgl/style/layers/symbol_layer.hpp | 16 ++++++ 12 files changed, 198 insertions(+) create mode 100644 include/mbgl/style/conversion/transition_options.hpp (limited to 'include') diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp index e30359937e..32fa810f0b 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp +++ b/include/mbgl/style/conversion/make_property_setters.hpp @@ -77,69 +77,127 @@ auto makePaintPropertySetters() { std::unordered_map> result; result["fill-antialias"] = makePropertySetter(&FillLayer::setFillAntialias); + result["fill-antialias-transition"] = makeTransitionSetter(&FillLayer::setFillAntialiasTransition); result["fill-opacity"] = makePropertySetter(&FillLayer::setFillOpacity); + result["fill-opacity-transition"] = makeTransitionSetter(&FillLayer::setFillOpacityTransition); result["fill-color"] = makePropertySetter(&FillLayer::setFillColor); + result["fill-color-transition"] = makeTransitionSetter(&FillLayer::setFillColorTransition); result["fill-outline-color"] = makePropertySetter(&FillLayer::setFillOutlineColor); + result["fill-outline-color-transition"] = makeTransitionSetter(&FillLayer::setFillOutlineColorTransition); result["fill-translate"] = makePropertySetter(&FillLayer::setFillTranslate); + result["fill-translate-transition"] = makeTransitionSetter(&FillLayer::setFillTranslateTransition); result["fill-translate-anchor"] = makePropertySetter(&FillLayer::setFillTranslateAnchor); + result["fill-translate-anchor-transition"] = makeTransitionSetter(&FillLayer::setFillTranslateAnchorTransition); result["fill-pattern"] = makePropertySetter(&FillLayer::setFillPattern); + result["fill-pattern-transition"] = makeTransitionSetter(&FillLayer::setFillPatternTransition); result["line-opacity"] = makePropertySetter(&LineLayer::setLineOpacity); + result["line-opacity-transition"] = makeTransitionSetter(&LineLayer::setLineOpacityTransition); result["line-color"] = makePropertySetter(&LineLayer::setLineColor); + result["line-color-transition"] = makeTransitionSetter(&LineLayer::setLineColorTransition); result["line-translate"] = makePropertySetter(&LineLayer::setLineTranslate); + result["line-translate-transition"] = makeTransitionSetter(&LineLayer::setLineTranslateTransition); result["line-translate-anchor"] = makePropertySetter(&LineLayer::setLineTranslateAnchor); + result["line-translate-anchor-transition"] = makeTransitionSetter(&LineLayer::setLineTranslateAnchorTransition); result["line-width"] = makePropertySetter(&LineLayer::setLineWidth); + result["line-width-transition"] = makeTransitionSetter(&LineLayer::setLineWidthTransition); result["line-gap-width"] = makePropertySetter(&LineLayer::setLineGapWidth); + result["line-gap-width-transition"] = makeTransitionSetter(&LineLayer::setLineGapWidthTransition); result["line-offset"] = makePropertySetter(&LineLayer::setLineOffset); + result["line-offset-transition"] = makeTransitionSetter(&LineLayer::setLineOffsetTransition); result["line-blur"] = makePropertySetter(&LineLayer::setLineBlur); + result["line-blur-transition"] = makeTransitionSetter(&LineLayer::setLineBlurTransition); result["line-dasharray"] = makePropertySetter(&LineLayer::setLineDasharray); + result["line-dasharray-transition"] = makeTransitionSetter(&LineLayer::setLineDasharrayTransition); result["line-pattern"] = makePropertySetter(&LineLayer::setLinePattern); + result["line-pattern-transition"] = makeTransitionSetter(&LineLayer::setLinePatternTransition); result["icon-opacity"] = makePropertySetter(&SymbolLayer::setIconOpacity); + result["icon-opacity-transition"] = makeTransitionSetter(&SymbolLayer::setIconOpacityTransition); result["icon-color"] = makePropertySetter(&SymbolLayer::setIconColor); + result["icon-color-transition"] = makeTransitionSetter(&SymbolLayer::setIconColorTransition); result["icon-halo-color"] = makePropertySetter(&SymbolLayer::setIconHaloColor); + result["icon-halo-color-transition"] = makeTransitionSetter(&SymbolLayer::setIconHaloColorTransition); result["icon-halo-width"] = makePropertySetter(&SymbolLayer::setIconHaloWidth); + result["icon-halo-width-transition"] = makeTransitionSetter(&SymbolLayer::setIconHaloWidthTransition); result["icon-halo-blur"] = makePropertySetter(&SymbolLayer::setIconHaloBlur); + result["icon-halo-blur-transition"] = makeTransitionSetter(&SymbolLayer::setIconHaloBlurTransition); result["icon-translate"] = makePropertySetter(&SymbolLayer::setIconTranslate); + result["icon-translate-transition"] = makeTransitionSetter(&SymbolLayer::setIconTranslateTransition); result["icon-translate-anchor"] = makePropertySetter(&SymbolLayer::setIconTranslateAnchor); + result["icon-translate-anchor-transition"] = makeTransitionSetter(&SymbolLayer::setIconTranslateAnchorTransition); result["text-opacity"] = makePropertySetter(&SymbolLayer::setTextOpacity); + result["text-opacity-transition"] = makeTransitionSetter(&SymbolLayer::setTextOpacityTransition); result["text-color"] = makePropertySetter(&SymbolLayer::setTextColor); + result["text-color-transition"] = makeTransitionSetter(&SymbolLayer::setTextColorTransition); result["text-halo-color"] = makePropertySetter(&SymbolLayer::setTextHaloColor); + result["text-halo-color-transition"] = makeTransitionSetter(&SymbolLayer::setTextHaloColorTransition); result["text-halo-width"] = makePropertySetter(&SymbolLayer::setTextHaloWidth); + result["text-halo-width-transition"] = makeTransitionSetter(&SymbolLayer::setTextHaloWidthTransition); result["text-halo-blur"] = makePropertySetter(&SymbolLayer::setTextHaloBlur); + result["text-halo-blur-transition"] = makeTransitionSetter(&SymbolLayer::setTextHaloBlurTransition); result["text-translate"] = makePropertySetter(&SymbolLayer::setTextTranslate); + result["text-translate-transition"] = makeTransitionSetter(&SymbolLayer::setTextTranslateTransition); result["text-translate-anchor"] = makePropertySetter(&SymbolLayer::setTextTranslateAnchor); + result["text-translate-anchor-transition"] = makeTransitionSetter(&SymbolLayer::setTextTranslateAnchorTransition); result["circle-radius"] = makePropertySetter(&CircleLayer::setCircleRadius); + result["circle-radius-transition"] = makeTransitionSetter(&CircleLayer::setCircleRadiusTransition); result["circle-color"] = makePropertySetter(&CircleLayer::setCircleColor); + result["circle-color-transition"] = makeTransitionSetter(&CircleLayer::setCircleColorTransition); result["circle-blur"] = makePropertySetter(&CircleLayer::setCircleBlur); + result["circle-blur-transition"] = makeTransitionSetter(&CircleLayer::setCircleBlurTransition); result["circle-opacity"] = makePropertySetter(&CircleLayer::setCircleOpacity); + result["circle-opacity-transition"] = makeTransitionSetter(&CircleLayer::setCircleOpacityTransition); result["circle-translate"] = makePropertySetter(&CircleLayer::setCircleTranslate); + result["circle-translate-transition"] = makeTransitionSetter(&CircleLayer::setCircleTranslateTransition); result["circle-translate-anchor"] = makePropertySetter(&CircleLayer::setCircleTranslateAnchor); + result["circle-translate-anchor-transition"] = makeTransitionSetter(&CircleLayer::setCircleTranslateAnchorTransition); result["circle-pitch-scale"] = makePropertySetter(&CircleLayer::setCirclePitchScale); + result["circle-pitch-scale-transition"] = makeTransitionSetter(&CircleLayer::setCirclePitchScaleTransition); result["circle-stroke-width"] = makePropertySetter(&CircleLayer::setCircleStrokeWidth); + result["circle-stroke-width-transition"] = makeTransitionSetter(&CircleLayer::setCircleStrokeWidthTransition); result["circle-stroke-color"] = makePropertySetter(&CircleLayer::setCircleStrokeColor); + result["circle-stroke-color-transition"] = makeTransitionSetter(&CircleLayer::setCircleStrokeColorTransition); result["circle-stroke-opacity"] = makePropertySetter(&CircleLayer::setCircleStrokeOpacity); + result["circle-stroke-opacity-transition"] = makeTransitionSetter(&CircleLayer::setCircleStrokeOpacityTransition); result["fill-extrusion-opacity"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionOpacity); + result["fill-extrusion-opacity-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionOpacityTransition); result["fill-extrusion-color"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionColor); + result["fill-extrusion-color-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionColorTransition); result["fill-extrusion-translate"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionTranslate); + result["fill-extrusion-translate-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionTranslateTransition); result["fill-extrusion-translate-anchor"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionTranslateAnchor); + result["fill-extrusion-translate-anchor-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionTranslateAnchorTransition); result["fill-extrusion-pattern"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionPattern); + result["fill-extrusion-pattern-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionPatternTransition); result["fill-extrusion-height"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionHeight); + result["fill-extrusion-height-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionHeightTransition); result["fill-extrusion-base"] = makePropertySetter(&FillExtrusionLayer::setFillExtrusionBase); + result["fill-extrusion-base-transition"] = makeTransitionSetter(&FillExtrusionLayer::setFillExtrusionBaseTransition); result["raster-opacity"] = makePropertySetter(&RasterLayer::setRasterOpacity); + result["raster-opacity-transition"] = makeTransitionSetter(&RasterLayer::setRasterOpacityTransition); result["raster-hue-rotate"] = makePropertySetter(&RasterLayer::setRasterHueRotate); + result["raster-hue-rotate-transition"] = makeTransitionSetter(&RasterLayer::setRasterHueRotateTransition); result["raster-brightness-min"] = makePropertySetter(&RasterLayer::setRasterBrightnessMin); + result["raster-brightness-min-transition"] = makeTransitionSetter(&RasterLayer::setRasterBrightnessMinTransition); result["raster-brightness-max"] = makePropertySetter(&RasterLayer::setRasterBrightnessMax); + result["raster-brightness-max-transition"] = makeTransitionSetter(&RasterLayer::setRasterBrightnessMaxTransition); result["raster-saturation"] = makePropertySetter(&RasterLayer::setRasterSaturation); + result["raster-saturation-transition"] = makeTransitionSetter(&RasterLayer::setRasterSaturationTransition); result["raster-contrast"] = makePropertySetter(&RasterLayer::setRasterContrast); + result["raster-contrast-transition"] = makeTransitionSetter(&RasterLayer::setRasterContrastTransition); result["raster-fade-duration"] = makePropertySetter(&RasterLayer::setRasterFadeDuration); + result["raster-fade-duration-transition"] = makeTransitionSetter(&RasterLayer::setRasterFadeDurationTransition); result["background-color"] = makePropertySetter(&BackgroundLayer::setBackgroundColor); + result["background-color-transition"] = makeTransitionSetter(&BackgroundLayer::setBackgroundColorTransition); result["background-pattern"] = makePropertySetter(&BackgroundLayer::setBackgroundPattern); + result["background-pattern-transition"] = makeTransitionSetter(&BackgroundLayer::setBackgroundPatternTransition); result["background-opacity"] = makePropertySetter(&BackgroundLayer::setBackgroundOpacity); + result["background-opacity-transition"] = makeTransitionSetter(&BackgroundLayer::setBackgroundOpacityTransition); return result; } diff --git a/include/mbgl/style/conversion/make_property_setters.hpp.ejs b/include/mbgl/style/conversion/make_property_setters.hpp.ejs index ed8f6e891c..65fbdea63e 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp.ejs +++ b/include/mbgl/style/conversion/make_property_setters.hpp.ejs @@ -36,6 +36,7 @@ auto makePaintPropertySetters() { <% for (const layer of locals.layers) { -%> <% for (const property of layer.paintProperties) { -%> result["<%- property.name %>"] = makePropertySetter(&<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>); + result["<%- property.name %>-transition"] = makeTransitionSetter(&<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>Transition); <% } -%> <% } -%> diff --git a/include/mbgl/style/conversion/property_setter.hpp b/include/mbgl/style/conversion/property_setter.hpp index 52fb160fde..6a15c64026 100644 --- a/include/mbgl/style/conversion/property_setter.hpp +++ b/include/mbgl/style/conversion/property_setter.hpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -37,6 +38,24 @@ auto makePropertySetter(void (L::*setter)(PropertyValue, const Args&...args)) { }; } +template +auto makeTransitionSetter(void (L::*setter)(const TransitionOptions&, const Args&...args)) { + return [setter] (Layer& layer, const V& value, const Args&...args) -> optional { + L* typedLayer = layer.as(); + if (!typedLayer) { + return Error { "layer doesn't support this property" }; + } + + Result transition = convert(value); + if (!transition) { + return transition.error(); + } + + (typedLayer->*setter)(*transition, args...); + return {}; + }; +} + template optional setVisibility(Layer& layer, const V& value) { if (isUndefined(value)) { diff --git a/include/mbgl/style/conversion/transition_options.hpp b/include/mbgl/style/conversion/transition_options.hpp new file mode 100644 index 0000000000..cdd65cfe9f --- /dev/null +++ b/include/mbgl/style/conversion/transition_options.hpp @@ -0,0 +1,45 @@ +#pragma once + +#include +#include + +namespace mbgl { +namespace style { +namespace conversion { + +template <> +struct Converter { +public: + template + Result operator()(const V& value) const { + if (!isObject(value)) { + return Error { "transition must be an object" }; + } + + TransitionOptions result; + + auto duration = objectMember(value, "duration"); + if (duration) { + auto number = toNumber(*duration); + if (!number) { + return Error { "duration must be a number" }; + } + result.duration = { std::chrono::milliseconds(int64_t(*number)) }; + } + + auto delay = objectMember(value, "delay"); + if (delay) { + auto number = toNumber(*delay); + if (!number) { + return Error { "delay must be a number" }; + } + result.delay = { std::chrono::milliseconds(int64_t(*number)) }; + } + + return result; + } +}; + +} // namespace conversion +} // namespace style +} // namespace mbgl diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index 050cb67df6..94076931e7 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class BackgroundLayer : public Layer { public: BackgroundLayer(const std::string& layerID); @@ -22,14 +24,17 @@ public: static PropertyValue getDefaultBackgroundColor(); PropertyValue getBackgroundColor(const optional& klass = {}) const; void setBackgroundColor(PropertyValue, const optional& klass = {}); + void setBackgroundColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultBackgroundPattern(); PropertyValue getBackgroundPattern(const optional& klass = {}) const; void setBackgroundPattern(PropertyValue, const optional& klass = {}); + void setBackgroundPatternTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultBackgroundOpacity(); PropertyValue getBackgroundOpacity(const optional& klass = {}) const; void setBackgroundOpacity(PropertyValue, const optional& klass = {}); + void setBackgroundOpacityTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index 8ffea9946f..35db4b3962 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class CircleLayer : public Layer { public: CircleLayer(const std::string& layerID, const std::string& sourceID); @@ -30,42 +32,52 @@ public: static DataDrivenPropertyValue getDefaultCircleRadius(); DataDrivenPropertyValue getCircleRadius(const optional& klass = {}) const; void setCircleRadius(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleRadiusTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleColor(); DataDrivenPropertyValue getCircleColor(const optional& klass = {}) const; void setCircleColor(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleColorTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleBlur(); DataDrivenPropertyValue getCircleBlur(const optional& klass = {}) const; void setCircleBlur(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleBlurTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleOpacity(); DataDrivenPropertyValue getCircleOpacity(const optional& klass = {}) const; void setCircleOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultCircleTranslate(); PropertyValue> getCircleTranslate(const optional& klass = {}) const; void setCircleTranslate(PropertyValue>, const optional& klass = {}); + void setCircleTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultCircleTranslateAnchor(); PropertyValue getCircleTranslateAnchor(const optional& klass = {}) const; void setCircleTranslateAnchor(PropertyValue, const optional& klass = {}); + void setCircleTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultCirclePitchScale(); PropertyValue getCirclePitchScale(const optional& klass = {}) const; void setCirclePitchScale(PropertyValue, const optional& klass = {}); + void setCirclePitchScaleTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleStrokeWidth(); DataDrivenPropertyValue getCircleStrokeWidth(const optional& klass = {}) const; void setCircleStrokeWidth(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleStrokeWidthTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleStrokeColor(); DataDrivenPropertyValue getCircleStrokeColor(const optional& klass = {}) const; void setCircleStrokeColor(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleStrokeColorTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleStrokeOpacity(); DataDrivenPropertyValue getCircleStrokeOpacity(const optional& klass = {}) const; void setCircleStrokeOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleStrokeOpacityTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index 09a0040ff3..c19a4ee168 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class FillExtrusionLayer : public Layer { public: FillExtrusionLayer(const std::string& layerID, const std::string& sourceID); @@ -30,30 +32,37 @@ public: static PropertyValue getDefaultFillExtrusionOpacity(); PropertyValue getFillExtrusionOpacity(const optional& klass = {}) const; void setFillExtrusionOpacity(PropertyValue, const optional& klass = {}); + void setFillExtrusionOpacityTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillExtrusionColor(); DataDrivenPropertyValue getFillExtrusionColor(const optional& klass = {}) const; void setFillExtrusionColor(DataDrivenPropertyValue, const optional& klass = {}); + void setFillExtrusionColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultFillExtrusionTranslate(); PropertyValue> getFillExtrusionTranslate(const optional& klass = {}) const; void setFillExtrusionTranslate(PropertyValue>, const optional& klass = {}); + void setFillExtrusionTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillExtrusionTranslateAnchor(); PropertyValue getFillExtrusionTranslateAnchor(const optional& klass = {}) const; void setFillExtrusionTranslateAnchor(PropertyValue, const optional& klass = {}); + void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillExtrusionPattern(); PropertyValue getFillExtrusionPattern(const optional& klass = {}) const; void setFillExtrusionPattern(PropertyValue, const optional& klass = {}); + void setFillExtrusionPatternTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillExtrusionHeight(); DataDrivenPropertyValue getFillExtrusionHeight(const optional& klass = {}) const; void setFillExtrusionHeight(DataDrivenPropertyValue, const optional& klass = {}); + void setFillExtrusionHeightTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillExtrusionBase(); DataDrivenPropertyValue getFillExtrusionBase(const optional& klass = {}) const; void setFillExtrusionBase(DataDrivenPropertyValue, const optional& klass = {}); + void setFillExtrusionBaseTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 079541ec39..c064eab350 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class FillLayer : public Layer { public: FillLayer(const std::string& layerID, const std::string& sourceID); @@ -30,30 +32,37 @@ public: static PropertyValue getDefaultFillAntialias(); PropertyValue getFillAntialias(const optional& klass = {}) const; void setFillAntialias(PropertyValue, const optional& klass = {}); + void setFillAntialiasTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillOpacity(); DataDrivenPropertyValue getFillOpacity(const optional& klass = {}) const; void setFillOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setFillOpacityTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillColor(); DataDrivenPropertyValue getFillColor(const optional& klass = {}) const; void setFillColor(DataDrivenPropertyValue, const optional& klass = {}); + void setFillColorTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillOutlineColor(); DataDrivenPropertyValue getFillOutlineColor(const optional& klass = {}) const; void setFillOutlineColor(DataDrivenPropertyValue, const optional& klass = {}); + void setFillOutlineColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultFillTranslate(); PropertyValue> getFillTranslate(const optional& klass = {}) const; void setFillTranslate(PropertyValue>, const optional& klass = {}); + void setFillTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillTranslateAnchor(); PropertyValue getFillTranslateAnchor(const optional& klass = {}) const; void setFillTranslateAnchor(PropertyValue, const optional& klass = {}); + void setFillTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillPattern(); PropertyValue getFillPattern(const optional& klass = {}) const; void setFillPattern(PropertyValue, const optional& klass = {}); + void setFillPatternTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 0c902de5af..d66eae8198 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -21,6 +21,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class <%- camelize(type) %>Layer : public Layer { public: <% if (type === 'background') { -%> @@ -58,6 +60,7 @@ public: static <%- propertyValueType(property) %> getDefault<%- camelize(property.name) %>(); <%- propertyValueType(property) %> get<%- camelize(property.name) %>(const optional& klass = {}) const; void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>, const optional& klass = {}); + void set<%- camelize(property.name) %>Transition(const TransitionOptions&, const optional& klass = {}); <% } -%> // Private implementation diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index c9413f1096..2ed269ae74 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -14,6 +14,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class LineLayer : public Layer { public: LineLayer(const std::string& layerID, const std::string& sourceID); @@ -50,42 +52,52 @@ public: static DataDrivenPropertyValue getDefaultLineOpacity(); DataDrivenPropertyValue getLineOpacity(const optional& klass = {}) const; void setLineOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setLineOpacityTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineColor(); DataDrivenPropertyValue getLineColor(const optional& klass = {}) const; void setLineColor(DataDrivenPropertyValue, const optional& klass = {}); + void setLineColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultLineTranslate(); PropertyValue> getLineTranslate(const optional& klass = {}) const; void setLineTranslate(PropertyValue>, const optional& klass = {}); + void setLineTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultLineTranslateAnchor(); PropertyValue getLineTranslateAnchor(const optional& klass = {}) const; void setLineTranslateAnchor(PropertyValue, const optional& klass = {}); + void setLineTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultLineWidth(); PropertyValue getLineWidth(const optional& klass = {}) const; void setLineWidth(PropertyValue, const optional& klass = {}); + void setLineWidthTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineGapWidth(); DataDrivenPropertyValue getLineGapWidth(const optional& klass = {}) const; void setLineGapWidth(DataDrivenPropertyValue, const optional& klass = {}); + void setLineGapWidthTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineOffset(); DataDrivenPropertyValue getLineOffset(const optional& klass = {}) const; void setLineOffset(DataDrivenPropertyValue, const optional& klass = {}); + void setLineOffsetTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineBlur(); DataDrivenPropertyValue getLineBlur(const optional& klass = {}) const; void setLineBlur(DataDrivenPropertyValue, const optional& klass = {}); + void setLineBlurTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultLineDasharray(); PropertyValue> getLineDasharray(const optional& klass = {}) const; void setLineDasharray(PropertyValue>, const optional& klass = {}); + void setLineDasharrayTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultLinePattern(); PropertyValue getLinePattern(const optional& klass = {}) const; void setLinePattern(PropertyValue, const optional& klass = {}); + void setLinePatternTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index e998abf12a..72665baa72 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class RasterLayer : public Layer { public: RasterLayer(const std::string& layerID, const std::string& sourceID); @@ -25,30 +27,37 @@ public: static PropertyValue getDefaultRasterOpacity(); PropertyValue getRasterOpacity(const optional& klass = {}) const; void setRasterOpacity(PropertyValue, const optional& klass = {}); + void setRasterOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterHueRotate(); PropertyValue getRasterHueRotate(const optional& klass = {}) const; void setRasterHueRotate(PropertyValue, const optional& klass = {}); + void setRasterHueRotateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterBrightnessMin(); PropertyValue getRasterBrightnessMin(const optional& klass = {}) const; void setRasterBrightnessMin(PropertyValue, const optional& klass = {}); + void setRasterBrightnessMinTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterBrightnessMax(); PropertyValue getRasterBrightnessMax(const optional& klass = {}) const; void setRasterBrightnessMax(PropertyValue, const optional& klass = {}); + void setRasterBrightnessMaxTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterSaturation(); PropertyValue getRasterSaturation(const optional& klass = {}) const; void setRasterSaturation(PropertyValue, const optional& klass = {}); + void setRasterSaturationTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterContrast(); PropertyValue getRasterContrast(const optional& klass = {}) const; void setRasterContrast(PropertyValue, const optional& klass = {}); + void setRasterContrastTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterFadeDuration(); PropertyValue getRasterFadeDuration(const optional& klass = {}) const; void setRasterFadeDuration(PropertyValue, const optional& klass = {}); + void setRasterFadeDurationTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 8826408e81..ad21a70698 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -14,6 +14,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class SymbolLayer : public Layer { public: SymbolLayer(const std::string& layerID, const std::string& sourceID); @@ -170,58 +172,72 @@ public: static PropertyValue getDefaultIconOpacity(); PropertyValue getIconOpacity(const optional& klass = {}) const; void setIconOpacity(PropertyValue, const optional& klass = {}); + void setIconOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconColor(); PropertyValue getIconColor(const optional& klass = {}) const; void setIconColor(PropertyValue, const optional& klass = {}); + void setIconColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconHaloColor(); PropertyValue getIconHaloColor(const optional& klass = {}) const; void setIconHaloColor(PropertyValue, const optional& klass = {}); + void setIconHaloColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconHaloWidth(); PropertyValue getIconHaloWidth(const optional& klass = {}) const; void setIconHaloWidth(PropertyValue, const optional& klass = {}); + void setIconHaloWidthTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconHaloBlur(); PropertyValue getIconHaloBlur(const optional& klass = {}) const; void setIconHaloBlur(PropertyValue, const optional& klass = {}); + void setIconHaloBlurTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultIconTranslate(); PropertyValue> getIconTranslate(const optional& klass = {}) const; void setIconTranslate(PropertyValue>, const optional& klass = {}); + void setIconTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconTranslateAnchor(); PropertyValue getIconTranslateAnchor(const optional& klass = {}) const; void setIconTranslateAnchor(PropertyValue, const optional& klass = {}); + void setIconTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextOpacity(); PropertyValue getTextOpacity(const optional& klass = {}) const; void setTextOpacity(PropertyValue, const optional& klass = {}); + void setTextOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextColor(); PropertyValue getTextColor(const optional& klass = {}) const; void setTextColor(PropertyValue, const optional& klass = {}); + void setTextColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextHaloColor(); PropertyValue getTextHaloColor(const optional& klass = {}) const; void setTextHaloColor(PropertyValue, const optional& klass = {}); + void setTextHaloColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextHaloWidth(); PropertyValue getTextHaloWidth(const optional& klass = {}) const; void setTextHaloWidth(PropertyValue, const optional& klass = {}); + void setTextHaloWidthTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextHaloBlur(); PropertyValue getTextHaloBlur(const optional& klass = {}) const; void setTextHaloBlur(PropertyValue, const optional& klass = {}); + void setTextHaloBlurTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultTextTranslate(); PropertyValue> getTextTranslate(const optional& klass = {}) const; void setTextTranslate(PropertyValue>, const optional& klass = {}); + void setTextTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextTranslateAnchor(); PropertyValue getTextTranslateAnchor(const optional& klass = {}) const; void setTextTranslateAnchor(PropertyValue, const optional& klass = {}); + void setTextTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation -- cgit v1.2.1