diff options
Diffstat (limited to 'src/mbgl/style/layers/line_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/line_layer_properties.hpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index 24a6c13675..7463d94393 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -34,52 +34,52 @@ struct LineRoundLimit : LayoutProperty<float> { static float defaultValue() { return 1; } }; -struct LineOpacity : DataDrivenPaintProperty<float, attributes::opacity, uniforms::opacity> { - static float defaultValue() { return 1; } +struct LineBlur : DataDrivenPaintProperty<float, attributes::blur, uniforms::blur> { + static float defaultValue() { return 0; } }; struct LineColor : DataDrivenPaintProperty<Color, attributes::color, uniforms::color> { static Color defaultValue() { return Color::black(); } }; -struct LineTranslate : PaintProperty<std::array<float, 2>> { - static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; } -}; - -struct LineTranslateAnchor : PaintProperty<TranslateAnchorType> { - static TranslateAnchorType defaultValue() { return TranslateAnchorType::Map; } +struct LineDasharray : CrossFadedPaintProperty<std::vector<float>> { + static std::vector<float> defaultValue() { return { }; } }; -struct LineWidth : DataDrivenPaintProperty<float, attributes::width, uniforms::width> { +struct LineFloorWidth : DataDrivenPaintProperty<float, attributes::floorwidth, uniforms::floorwidth> { static float defaultValue() { return 1; } + using EvaluatorType = DataDrivenPropertyEvaluator<float, true>; }; struct LineGapWidth : DataDrivenPaintProperty<float, attributes::gapwidth, uniforms::gapwidth> { static float defaultValue() { return 0; } }; -struct LineOffset : DataDrivenPaintProperty<float, attributes::offset, uniforms::offset> { - static float defaultValue() { return 0; } +struct LineGradient : ColorRampProperty { }; -struct LineBlur : DataDrivenPaintProperty<float, attributes::blur, uniforms::blur> { +struct LineOffset : DataDrivenPaintProperty<float, attributes::offset, uniforms::offset> { static float defaultValue() { return 0; } }; -struct LineDasharray : CrossFadedPaintProperty<std::vector<float>> { - static std::vector<float> defaultValue() { return { }; } +struct LineOpacity : DataDrivenPaintProperty<float, attributes::opacity, uniforms::opacity> { + static float defaultValue() { return 1; } }; struct LinePattern : CrossFadedDataDrivenPaintProperty<std::string, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { static std::string defaultValue() { return ""; } }; -struct LineGradient : ColorRampProperty { +struct LineTranslate : PaintProperty<std::array<float, 2>> { + static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; } }; -struct LineFloorWidth : DataDrivenPaintProperty<float, attributes::floorwidth, uniforms::floorwidth> { +struct LineTranslateAnchor : PaintProperty<TranslateAnchorType> { + static TranslateAnchorType defaultValue() { return TranslateAnchorType::Map; } +}; + +struct LineWidth : DataDrivenPaintProperty<float, attributes::width, uniforms::width> { static float defaultValue() { return 1; } - using EvaluatorType = DataDrivenPropertyEvaluator<float, true>; }; class LineLayoutProperties : public Properties< @@ -90,18 +90,18 @@ class LineLayoutProperties : public Properties< > {}; class LinePaintProperties : public Properties< - LineOpacity, + LineBlur, LineColor, - LineTranslate, - LineTranslateAnchor, - LineWidth, + LineDasharray, + LineFloorWidth, LineGapWidth, + LineGradient, LineOffset, - LineBlur, - LineDasharray, + LineOpacity, LinePattern, - LineGradient, - LineFloorWidth + LineTranslate, + LineTranslateAnchor, + LineWidth > {}; class LineLayerProperties final : public LayerProperties { |