summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r--src/mbgl/renderer/painter.cpp4
-rw-r--r--src/mbgl/renderer/painter_background.cpp2
-rw-r--r--src/mbgl/renderer/painter_debug.cpp4
-rw-r--r--src/mbgl/renderer/painter_fill.cpp4
-rw-r--r--src/mbgl/renderer/painter_line.cpp2
-rw-r--r--src/mbgl/renderer/render_item.hpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 5f90140eb7..eee568ec92 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -144,9 +144,9 @@ void Painter::render(const Style& style, const FrameData& frame_, SpriteAtlas& a
config.depthMask = GL_TRUE;
config.colorMask = { GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE };
if (frame.debugOptions & MapDebugOptions::Wireframe) {
- config.clearColor = { 0.0f, 0.0f, 0.0f, 1.0f };
+ config.clearColor = Color::black();
} else {
- config.clearColor = { background.r, background.g, background.b, background.a };
+ config.clearColor = background;
}
config.clearStencil = 0;
config.clearDepth = 1;
diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp
index e6fa79eb51..022d3dd7ab 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 = Color::black();
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 c368ac0345..9ddae289ee 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -44,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 = Color::white();
config.lineWidth = 4.0f * frame.pixelRatio;
tile.debugBucket->drawLines(*plainShader, store);
@@ -55,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 = Color::black();
config.lineWidth = 2.0f * frame.pixelRatio;
tile.debugBucket->drawLines(*plainShader, store);
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
index 087dcf2f58..710fa444e2 100644
--- a/src/mbgl/renderer/painter_fill.cpp
+++ b/src/mbgl/renderer/painter_fill.cpp
@@ -38,8 +38,8 @@ void Painter::renderFill(FillBucket& bucket,
bool wireframe = frame.debugOptions & MapDebugOptions::Wireframe;
if (wireframe) {
- fillColor = { 1.0f, 1.0f, 1.0f, 1.0f };
- strokeColor = { 1.0f, 1.0f, 1.0f, 1.0f };
+ fillColor = Color::white();
+ strokeColor = Color::white();
opacity = 1.0f;
pattern = false;
outline = true;
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 455535d337..bb759abc5f 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 = Color::white();
float opacity = 1.0f;
if (!wireframe) {
color = properties.lineColor;
diff --git a/src/mbgl/renderer/render_item.hpp b/src/mbgl/renderer/render_item.hpp
index a664f4b910..82ea897047 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;
std::set<style::Source*> sources;
std::vector<RenderItem> order;
};