diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-05-02 15:25:48 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-05-02 17:44:18 +0200 |
commit | 2489afdd0db97de0664198f5ae64bd94db6b6fc7 (patch) | |
tree | a7a52194daab971f58f60ef21bd45b1a0d517f4b /src/mbgl/style/layers/hillshade_layer_properties.hpp | |
parent | a48152a9811a856e467eff3e396a76a059558fb1 (diff) | |
download | qtlocation-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/hillshade_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/hillshade_layer_properties.hpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mbgl/style/layers/hillshade_layer_properties.hpp b/src/mbgl/style/layers/hillshade_layer_properties.hpp index 6433151148..85ef8b967c 100644 --- a/src/mbgl/style/layers/hillshade_layer_properties.hpp +++ b/src/mbgl/style/layers/hillshade_layer_properties.hpp @@ -14,37 +14,37 @@ namespace mbgl { namespace style { -struct HillshadeIlluminationDirection : PaintProperty<float> { - static float defaultValue() { return 335; } -}; - -struct HillshadeIlluminationAnchor : PaintProperty<HillshadeIlluminationAnchorType> { - static HillshadeIlluminationAnchorType defaultValue() { return HillshadeIlluminationAnchorType::Viewport; } +struct HillshadeAccentColor : PaintProperty<Color> { + static Color defaultValue() { return Color::black(); } }; struct HillshadeExaggeration : PaintProperty<float> { static float defaultValue() { return 0.5; } }; -struct HillshadeShadowColor : PaintProperty<Color> { - static Color defaultValue() { return Color::black(); } -}; - struct HillshadeHighlightColor : PaintProperty<Color> { static Color defaultValue() { return Color::white(); } }; -struct HillshadeAccentColor : PaintProperty<Color> { +struct HillshadeIlluminationAnchor : PaintProperty<HillshadeIlluminationAnchorType> { + static HillshadeIlluminationAnchorType defaultValue() { return HillshadeIlluminationAnchorType::Viewport; } +}; + +struct HillshadeIlluminationDirection : PaintProperty<float> { + static float defaultValue() { return 335; } +}; + +struct HillshadeShadowColor : PaintProperty<Color> { static Color defaultValue() { return Color::black(); } }; class HillshadePaintProperties : public Properties< - HillshadeIlluminationDirection, - HillshadeIlluminationAnchor, + HillshadeAccentColor, HillshadeExaggeration, - HillshadeShadowColor, HillshadeHighlightColor, - HillshadeAccentColor + HillshadeIlluminationAnchor, + HillshadeIlluminationDirection, + HillshadeShadowColor > {}; class HillshadeLayerProperties final : public LayerProperties { |