diff options
Diffstat (limited to 'src/mbgl/style/layers/fill_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/fill_layer_properties.hpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/style/layers/fill_layer_properties.hpp b/src/mbgl/style/layers/fill_layer_properties.hpp index f76aee448b..376852d254 100644 --- a/src/mbgl/style/layers/fill_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_layer_properties.hpp @@ -18,18 +18,22 @@ struct FillAntialias : PaintProperty<bool> { static bool defaultValue() { return true; } }; -struct FillOpacity : DataDrivenPaintProperty<float, attributes::opacity, uniforms::opacity> { - static float defaultValue() { return 1; } -}; - struct FillColor : DataDrivenPaintProperty<Color, attributes::color, uniforms::color> { static Color defaultValue() { return Color::black(); } }; +struct FillOpacity : DataDrivenPaintProperty<float, attributes::opacity, uniforms::opacity> { + static float defaultValue() { return 1; } +}; + struct FillOutlineColor : DataDrivenPaintProperty<Color, attributes::outline_color, uniforms::outline_color> { static Color defaultValue() { return {}; } }; +struct FillPattern : CrossFadedDataDrivenPaintProperty<std::string, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { + static std::string defaultValue() { return ""; } +}; + struct FillTranslate : PaintProperty<std::array<float, 2>> { static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; } }; @@ -38,18 +42,14 @@ struct FillTranslateAnchor : PaintProperty<TranslateAnchorType> { static TranslateAnchorType defaultValue() { return TranslateAnchorType::Map; } }; -struct FillPattern : CrossFadedDataDrivenPaintProperty<std::string, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { - static std::string defaultValue() { return ""; } -}; - class FillPaintProperties : public Properties< FillAntialias, - FillOpacity, FillColor, + FillOpacity, FillOutlineColor, + FillPattern, FillTranslate, - FillTranslateAnchor, - FillPattern + FillTranslateAnchor > {}; class FillLayerProperties final : public LayerProperties { |