use proper initializers

This commit is contained in:
Konstantin Käfer
2014-03-05 16:45:47 +01:00
parent 3718721689
commit fc53caf99a
7 changed files with 19 additions and 19 deletions

View File

@@ -23,19 +23,19 @@ private:
int32_t a_extrude = -1;
// int32_t a_linesofar = -1;
std::array<float, 16> exmatrix = {};
std::array<float, 16> exmatrix = {{}};
int32_t u_exmatrix = -1;
std::array<float, 4> color = {};
std::array<float, 4> color = {{}};
int32_t u_color = -1;
std::array<float, 2> linewidth = {};
std::array<float, 2> linewidth = {{}};
int32_t u_linewidth = -1;
float ratio = 0;
int32_t u_ratio = -1;
std::array<float, 2> dasharray = {};
std::array<float, 2> dasharray = {{}};
int32_t u_dasharray = -1;
float debug = 0;

View File

@@ -19,13 +19,13 @@ public:
private:
int32_t a_pos = -1;
std::array<float, 4> color = {};
std::array<float, 4> color = {{}};
int32_t u_color = -1;
std::array<float, 2> world = {};
std::array<float, 2> world = {{}};
int32_t u_world = -1;
std::array<float, 2> linewidth = {};
std::array<float, 2> linewidth = {{}};
int32_t u_linewidth = -1;
float size = 0;

View File

@@ -17,10 +17,10 @@ public:
private:
int32_t a_pos = -1;
std::array<float, 4> color = {};
std::array<float, 4> color = {{}};
int32_t u_color = -1;
std::array<float, 2> world = {};
std::array<float, 2> world = {{}};
int32_t u_world = -1;
};

View File

@@ -21,19 +21,19 @@ public:
private:
int32_t a_pos = -1;
std::array<float, 4> color = {};
std::array<float, 4> color = {{}};
int32_t u_color = -1;
std::array<float, 2> offset = {};
std::array<float, 2> offset = {{}};
int32_t u_offset = -1;
std::array<float, 2> pattern_size = {};
std::array<float, 2> pattern_size = {{}};
int32_t u_pattern_size = -1;
std::array<float, 2> pattern_tl = {};
std::array<float, 2> pattern_tl = {{}};
int32_t u_pattern_tl = -1;
std::array<float, 2> pattern_br = {};
std::array<float, 2> pattern_br = {{}};
int32_t u_pattern_br = -1;
float mix = 0;

View File

@@ -17,7 +17,7 @@ public:
private:
int32_t a_pos = -1;
std::array<float, 4> color = {};
std::array<float, 4> color = {{}};
int32_t u_color = -1;
};

View File

@@ -23,13 +23,13 @@ private:
int32_t image = -1;
int32_t u_image = -1;
std::array<float, 4> color = {};
std::array<float, 4> color = {{}};
int32_t u_color = -1;
std::array<float, 2> point_tl = {};
std::array<float, 2> point_tl = {{}};
int32_t u_point_tl = -1;
std::array<float, 2> point_br = {};
std::array<float, 2> point_br = {{}};
int32_t u_point_br = -1;
float size = 0;

View File

@@ -20,7 +20,7 @@ private:
bool compileShader(uint32_t *shader, uint32_t type, const char *source);
protected:
std::array<float, 16> matrix = {};
std::array<float, 16> matrix = {{}};
int32_t u_matrix = -1;
};