diff options
author | Young Hahn <young@mapbox.com> | 2016-06-15 11:38:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-15 11:38:22 -0400 |
commit | 24b66bc8cdd40a52e08d198c063daa3e1f6be92a (patch) | |
tree | 6d98a5e1216a83f7d6d4c78422c8306d4a4cb157 /src/mbgl/shader/line_shader.hpp | |
parent | fe64238b4cd5a7da403a4f29a62b14234ecba569 (diff) | |
download | qtlocation-mapboxgl-24b66bc8cdd40a52e08d198c063daa3e1f6be92a.tar.gz |
Color class (#5361)
* Color class
* Switch to list initialization
Diffstat (limited to 'src/mbgl/shader/line_shader.hpp')
-rw-r--r-- | src/mbgl/shader/line_shader.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/shader/line_shader.hpp b/src/mbgl/shader/line_shader.hpp index e0d14094a6..1265e768f2 100644 --- a/src/mbgl/shader/line_shader.hpp +++ b/src/mbgl/shader/line_shader.hpp @@ -2,6 +2,7 @@ #include <mbgl/shader/shader.hpp> #include <mbgl/shader/uniform.hpp> +#include <mbgl/util/color.hpp> namespace mbgl { @@ -12,7 +13,7 @@ public: void bind(GLbyte *offset) final; UniformMatrix<4> u_matrix = {"u_matrix", *this}; - Uniform<std::array<GLfloat, 4>> u_color = {"u_color", *this}; + Uniform<Color> u_color = {"u_color", *this}; Uniform<GLfloat> u_opacity = {"u_opacity", *this}; Uniform<GLfloat> u_ratio = {"u_ratio", *this}; Uniform<GLfloat> u_linewidth = {"u_linewidth", *this}; |