tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Prefer color aliases for default property values

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2016-07-12 19:01:29 +03:00
parent 06af750d23
commit 174d367699
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/style/layers/background_layer_properties.hpp
View File

@@ -17,7 +17,7 @@ public:
void cascade(const CascadeParameters&);
bool recalculate(const CalculationParameters&);
PaintProperty<Color> backgroundColor { { 0, 0, 0, 1 } };
PaintProperty<Color> backgroundColor { Color::black() };
PaintProperty<std::string, CrossFadedPropertyEvaluator> backgroundPattern { "" };
PaintProperty<float> backgroundOpacity { 1 };
};

2
src/mbgl/style/layers/circle_layer_properties.hpp
View File

@@ -18,7 +18,7 @@ public:
bool recalculate(const CalculationParameters&);
PaintProperty<float> circleRadius { 5 };
PaintProperty<Color> circleColor { { 0, 0, 0, 1 } };
PaintProperty<Color> circleColor { Color::black() };
PaintProperty<float> circleBlur { 0 };
PaintProperty<float> circleOpacity { 1 };
PaintProperty<std::array<float, 2>> circleTranslate { {{ 0, 0 }} };

2
src/mbgl/style/layers/fill_layer_properties.hpp
View File

@@ -19,7 +19,7 @@ public:
PaintProperty<bool> fillAntialias { true };
PaintProperty<float> fillOpacity { 1 };
PaintProperty<Color> fillColor { { 0, 0, 0, 1 } };
PaintProperty<Color> fillColor { Color::black() };
PaintProperty<Color> fillOutlineColor { {} };
PaintProperty<std::array<float, 2>> fillTranslate { {{ 0, 0 }} };
PaintProperty<TranslateAnchorType> fillTranslateAnchor { TranslateAnchorType::Map };

2
src/mbgl/style/layers/line_layer_properties.hpp
View File

@@ -28,7 +28,7 @@ public:
bool recalculate(const CalculationParameters&);
PaintProperty<float> lineOpacity { 1 };
PaintProperty<Color> lineColor { { 0, 0, 0, 1 } };
PaintProperty<Color> lineColor { Color::black() };
PaintProperty<std::array<float, 2>> lineTranslate { {{ 0, 0 }} };
PaintProperty<TranslateAnchorType> lineTranslateAnchor { TranslateAnchorType::Map };
PaintProperty<float> lineWidth { 1 };

8
src/mbgl/style/layers/symbol_layer_properties.hpp
View File

@@ -58,15 +58,15 @@ public:
bool recalculate(const CalculationParameters&);
PaintProperty<float> iconOpacity { 1 };
PaintProperty<Color> iconColor { { 0, 0, 0, 1 } };
PaintProperty<Color> iconHaloColor { { 0, 0, 0, 0 } };
PaintProperty<Color> iconColor { Color::black() };
PaintProperty<Color> iconHaloColor { {} };
PaintProperty<float> iconHaloWidth { 0 };
PaintProperty<float> iconHaloBlur { 0 };
PaintProperty<std::array<float, 2>> iconTranslate { {{ 0, 0 }} };
PaintProperty<TranslateAnchorType> iconTranslateAnchor { TranslateAnchorType::Map };
PaintProperty<float> textOpacity { 1 };
PaintProperty<Color> textColor { { 0, 0, 0, 1 } };
PaintProperty<Color> textHaloColor { { 0, 0, 0, 0 } };
PaintProperty<Color> textColor { Color::black() };
PaintProperty<Color> textHaloColor { {} };
PaintProperty<float> textHaloWidth { 0 };
PaintProperty<float> textHaloBlur { 0 };
PaintProperty<std::array<float, 2>> textTranslate { {{ 0, 0 }} };