diff options
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index 3bdae377ea..f2b7bfa00f 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -180,23 +180,23 @@ struct TextOptional : LayoutProperty<bool> { static bool defaultValue() { return false; } }; -struct IconOpacity : PaintProperty<float> { +struct IconOpacity : DataDrivenPaintProperty<float, attributes::a_opacity> { static float defaultValue() { return 1; } }; -struct IconColor : PaintProperty<Color> { +struct IconColor : DataDrivenPaintProperty<Color, attributes::a_fill_color> { static Color defaultValue() { return Color::black(); } }; -struct IconHaloColor : PaintProperty<Color> { +struct IconHaloColor : DataDrivenPaintProperty<Color, attributes::a_halo_color> { static Color defaultValue() { return {}; } }; -struct IconHaloWidth : PaintProperty<float> { +struct IconHaloWidth : DataDrivenPaintProperty<float, attributes::a_halo_width> { static float defaultValue() { return 0; } }; -struct IconHaloBlur : PaintProperty<float> { +struct IconHaloBlur : DataDrivenPaintProperty<float, attributes::a_halo_blur> { static float defaultValue() { return 0; } }; @@ -208,23 +208,23 @@ struct IconTranslateAnchor : PaintProperty<TranslateAnchorType> { static TranslateAnchorType defaultValue() { return TranslateAnchorType::Map; } }; -struct TextOpacity : PaintProperty<float> { +struct TextOpacity : DataDrivenPaintProperty<float, attributes::a_opacity> { static float defaultValue() { return 1; } }; -struct TextColor : PaintProperty<Color> { +struct TextColor : DataDrivenPaintProperty<Color, attributes::a_fill_color> { static Color defaultValue() { return Color::black(); } }; -struct TextHaloColor : PaintProperty<Color> { +struct TextHaloColor : DataDrivenPaintProperty<Color, attributes::a_halo_color> { static Color defaultValue() { return {}; } }; -struct TextHaloWidth : PaintProperty<float> { +struct TextHaloWidth : DataDrivenPaintProperty<float, attributes::a_halo_width> { static float defaultValue() { return 0; } }; -struct TextHaloBlur : PaintProperty<float> { +struct TextHaloBlur : DataDrivenPaintProperty<float, attributes::a_halo_blur> { static float defaultValue() { return 0; } }; |