diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-11-17 23:13:42 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-11-17 23:13:42 +0000 |
commit | 186279ee1ee54f2cdf619f4740679bb0d8b74db4 (patch) | |
tree | b8798b8e571e4a05e84469cd1f815a6ec3e8bafe /yage/core/vertex.h | |
parent | fbbfad54d6281c2e08aeb2ac51c68cb7ba293f7e (diff) | |
download | YAGE-186279ee1ee54f2cdf619f4740679bb0d8b74db4.tar.gz YAGE-186279ee1ee54f2cdf619f4740679bb0d8b74db4.zip |
Renaming color to colour
Diffstat (limited to 'yage/core/vertex.h')
-rw-r--r-- | yage/core/vertex.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/yage/core/vertex.h b/yage/core/vertex.h index 270a6825..da3c2bfa 100644 --- a/yage/core/vertex.h +++ b/yage/core/vertex.h @@ -23,15 +23,15 @@ struct Position { Position(float x_, float y_) : x(x_), y(y_) {} }; -struct Color { +struct Colour { GLubyte r; GLubyte g; GLubyte b; GLubyte a; - Color() = default; + Colour() = default; - Color(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_) + Colour(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_) : r(r_), g(g_), b(b_), a(a_) { } @@ -48,13 +48,13 @@ struct UV { struct Vertex { Position position; - Color color; + Colour colour; UV uv; Vertex() = default; - Vertex(const Position &position_, const Color &color_, const UV &uv_) - : position(position_), color(color_), uv(uv_) + Vertex(const Position &position_, const Colour &colour_, const UV &uv_) + : position(position_), colour(colour_), uv(uv_) { } @@ -64,12 +64,12 @@ struct Vertex { position.y = y; } - void setColor(GLubyte r, GLubyte g, GLubyte b, GLubyte a) + void setColour(GLubyte r, GLubyte g, GLubyte b, GLubyte a) { - color.r = r; - color.g = g; - color.b = b; - color.a = a; + colour.r = r; + colour.g = g; + colour.b = b; + colour.a = a; } void setUv(float u, float v) |