summaryrefslogtreecommitdiff
path: root/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-05-02 15:25:48 +0200
committerKonstantin Käfer <mail@kkaefer.com>2019-05-02 17:44:18 +0200
commit2489afdd0db97de0664198f5ae64bd94db6b6fc7 (patch)
treea7a52194daab971f58f60ef21bd45b1a0d517f4b /src/mbgl/style/layers/fill_extrusion_layer_properties.hpp
parenta48152a9811a856e467eff3e396a76a059558fb1 (diff)
downloadqtlocation-mapboxgl-2489afdd0db97de0664198f5ae64bd94db6b6fc7.tar.gz
[build] change style code generator to sort properties alphabetically
JSON keys in our style specification don't have a defined order. This change sorts them alphabetically so that we can rely on the order remaining them same across code generation runs.
Diffstat (limited to 'src/mbgl/style/layers/fill_extrusion_layer_properties.hpp')
-rw-r--r--src/mbgl/style/layers/fill_extrusion_layer_properties.hpp28
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
> {};