diff options
Diffstat (limited to 'src/mbgl/style/layers/fill_extrusion_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/fill_extrusion_layer_properties.hpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp index c90594036b..f5aeaf5c73 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp @@ -14,32 +14,32 @@ namespace mbgl { namespace style { -struct FillExtrusionOpacity : PaintProperty<float> { - static float defaultValue() { return 1; } +struct FillExtrusionBase : DataDrivenPaintProperty<float, attributes::base, uniforms::base> { + static float defaultValue() { return 0; } }; struct FillExtrusionColor : DataDrivenPaintProperty<Color, attributes::color, uniforms::color> { static Color defaultValue() { return Color::black(); } }; -struct FillExtrusionTranslate : PaintProperty<std::array<float, 2>> { - static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; } +struct FillExtrusionHeight : DataDrivenPaintProperty<float, attributes::height, uniforms::height> { + static float defaultValue() { return 0; } }; -struct FillExtrusionTranslateAnchor : PaintProperty<TranslateAnchorType> { - static TranslateAnchorType defaultValue() { return TranslateAnchorType::Map; } +struct FillExtrusionOpacity : PaintProperty<float> { + static float defaultValue() { return 1; } }; struct FillExtrusionPattern : CrossFadedDataDrivenPaintProperty<std::string, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { static std::string defaultValue() { return ""; } }; -struct FillExtrusionHeight : DataDrivenPaintProperty<float, attributes::height, uniforms::height> { - static float defaultValue() { return 0; } +struct FillExtrusionTranslate : PaintProperty<std::array<float, 2>> { + static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; } }; -struct FillExtrusionBase : DataDrivenPaintProperty<float, attributes::base, uniforms::base> { - static float defaultValue() { return 0; } +struct FillExtrusionTranslateAnchor : PaintProperty<TranslateAnchorType> { + static TranslateAnchorType defaultValue() { return TranslateAnchorType::Map; } }; struct FillExtrusionVerticalGradient : PaintProperty<bool> { @@ -47,13 +47,13 @@ struct FillExtrusionVerticalGradient : PaintProperty<bool> { }; class FillExtrusionPaintProperties : public Properties< - FillExtrusionOpacity, + FillExtrusionBase, FillExtrusionColor, + FillExtrusionHeight, + FillExtrusionOpacity, + FillExtrusionPattern, FillExtrusionTranslate, FillExtrusionTranslateAnchor, - FillExtrusionPattern, - FillExtrusionHeight, - FillExtrusionBase, FillExtrusionVerticalGradient > {}; |