Color class (#5361)

* Color class

* Switch to list initialization

7 files changed, 14 insertions, 13 deletions

diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index e4d30ec107..5f90140eb7 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -146,7 +146,7 @@ void Painter::render(const Style& style, const FrameData& frame_, SpriteAtlas& a
         if (frame.debugOptions & MapDebugOptions::Wireframe) {
             config.clearColor = { 0.0f, 0.0f, 0.0f, 1.0f };
         } else {
-            config.clearColor = { background[0], background[1], background[2], background[3] };
+            config.clearColor = { background.r, background.g, background.b, background.a };
         }
         config.clearStencil = 0;
         config.clearDepth = 1;
diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp
index 634eed67a7..402d0d23ba 100644
--- a/src/mbgl/renderer/painter_background.cpp
+++ b/src/mbgl/renderer/painter_background.cpp
@@ -45,7 +45,7 @@ void Painter::renderBackground(const BackgroundLayer& layer) {
 
     } else {
         if (wireframe) {
-            plainShader->u_color = {{ 0.0f, 0.0f, 0.0f, 1.0f }};
+            plainShader->u_color = { 0.0f, 0.0f, 0.0f, 1.0f };
             plainShader->u_opacity = 1.0f;
         } else {
             plainShader->u_color = properties.backgroundColor;
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index 92fb3e5867..c368ac0345 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -8,6 +8,7 @@
 #include <mbgl/gl/gl.hpp>
 #include <mbgl/gl/gl_values.hpp>
 #include <mbgl/gl/gl_helper.hpp>
+#include <mbgl/util/color.hpp>
 
 using namespace mbgl;
 
@@ -43,7 +44,7 @@ void Painter::renderDebugText(Tile& tile, const mat4 &matrix) {
     plainShader->u_matrix = matrix;
 
     // Draw white outline
-    plainShader->u_color = {{ 1.0f, 1.0f, 1.0f, 1.0f }};
+    plainShader->u_color = { 1.0f, 1.0f, 1.0f, 1.0f };
     config.lineWidth = 4.0f * frame.pixelRatio;
     tile.debugBucket->drawLines(*plainShader, store);
 
@@ -54,7 +55,7 @@ void Painter::renderDebugText(Tile& tile, const mat4 &matrix) {
 #endif
 
     // Draw black text.
-    plainShader->u_color = {{ 0.0f, 0.0f, 0.0f, 1.0f }};
+    plainShader->u_color = { 0.0f, 0.0f, 0.0f, 1.0f };
     config.lineWidth = 2.0f * frame.pixelRatio;
     tile.debugBucket->drawLines(*plainShader, store);
 
@@ -77,7 +78,7 @@ void Painter::renderDebugFrame(const mat4 &matrix) {
 
     // draw tile outline
     tileBorderArray.bind(*plainShader, tileBorderBuffer, BUFFER_OFFSET_0, store);
-    plainShader->u_color = {{ 1.0f, 0.0f, 0.0f, 1.0f }};
+    plainShader->u_color = { 1.0f, 0.0f, 0.0f, 1.0f };
     config.lineWidth = 4.0f * frame.pixelRatio;
     MBGL_CHECK_ERROR(glDrawArrays(GL_LINE_STRIP, 0, (GLsizei)tileBorderBuffer.index()));
 }
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
index 5317555727..d99069c6b3 100644
--- a/src/mbgl/renderer/painter_fill.cpp
+++ b/src/mbgl/renderer/painter_fill.cpp
@@ -24,7 +24,7 @@ void Painter::renderFill(FillBucket& bucket,
     float opacity = properties.fillOpacity;
 
     Color stroke_color = properties.fillOutlineColor;
-    if (stroke_color[3] < 0) {
+    if (stroke_color.a < 0) {
         stroke_color = fill_color;
     }
 
@@ -34,8 +34,8 @@ void Painter::renderFill(FillBucket& bucket,
 
     bool wireframe = frame.debugOptions & MapDebugOptions::Wireframe;
     if (wireframe) {
-        fill_color = {{ 1.0f, 1.0f, 1.0f, 1.0f }};
-        stroke_color = {{ 1.0f, 1.0f, 1.0f, 1.0f }};
+        fill_color = { 1.0f, 1.0f, 1.0f, 1.0f };
+        stroke_color = { 1.0f, 1.0f, 1.0f, 1.0f };
         opacity = 1.0f;
         pattern = false;
         outline = true;
@@ -161,7 +161,7 @@ void Painter::renderFill(FillBucket& bucket,
         }
     } else if (!wireframe) {
         // No image fill.
-        if ((fill_color[3] >= 1.0f && opacity >= 1.0f) == (pass == RenderPass::Opaque)) {
+        if ((fill_color.a >= 1.0f && opacity >= 1.0f) == (pass == RenderPass::Opaque)) {
             // Only draw the fill when it's either opaque and we're drawing opaque
             // fragments or when it's translucent and we're drawing translucent
             // fragments
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index d21497d459..455535d337 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -37,7 +37,7 @@ void Painter::renderLine(LineBucket& bucket,
 
     float blur = properties.lineBlur + antialiasing;
 
-    Color color = {{ 1.0f, 1.0f, 1.0f, 1.0f }};
+    Color color { 1.0f, 1.0f, 1.0f, 1.0f };
     float opacity = 1.0f;
     if (!wireframe) {
         color = properties.lineColor;
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index 1a248d494b..b65ae34a12 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -88,7 +88,7 @@ void Painter::renderSDF(SymbolBucket &bucket,
 
     // We're drawing in the translucent pass which is bottom-to-top, so we need
     // to draw the halo first.
-    if (haloColor[3] > 0.0f && haloWidth > 0.0f) {
+    if (haloColor.a > 0.0f && haloWidth > 0.0f) {
         sdfShader.u_gamma = (haloBlur * blurOffset / fontScale / sdfPx + gamma) * gammaScale;
         sdfShader.u_color = haloColor;
         sdfShader.u_opacity = opacity;
@@ -99,7 +99,7 @@ void Painter::renderSDF(SymbolBucket &bucket,
     }
 
     // Then, we draw the text/icon over the halo
-    if (color[3] > 0.0f) {
+    if (color.a > 0.0f) {
         sdfShader.u_gamma = gamma * gammaScale;
         sdfShader.u_color = color;
         sdfShader.u_opacity = opacity;
diff --git a/src/mbgl/renderer/render_item.hpp b/src/mbgl/renderer/render_item.hpp
index d452fb7759..a664f4b910 100644
--- a/src/mbgl/renderer/render_item.hpp
+++ b/src/mbgl/renderer/render_item.hpp
@@ -30,7 +30,7 @@ public:
 
 class RenderData {
 public:
-    Color backgroundColor = {{ 0, 0, 0, 0 }};
+    Color backgroundColor = { 0, 0, 0, 0 };
     std::set<style::Source*> sources;
     std::vector<RenderItem> order;
 };