aboutsummaryrefslogtreecommitdiffstats
path: root/yage/core/sprite.cpp
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-11-17 23:13:42 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-11-17 23:13:42 +0000
commit186279ee1ee54f2cdf619f4740679bb0d8b74db4 (patch)
treeb8798b8e571e4a05e84469cd1f815a6ec3e8bafe /yage/core/sprite.cpp
parentfbbfad54d6281c2e08aeb2ac51c68cb7ba293f7e (diff)
downloadYAGE-186279ee1ee54f2cdf619f4740679bb0d8b74db4.tar.gz
YAGE-186279ee1ee54f2cdf619f4740679bb0d8b74db4.zip
Renaming color to colour
Diffstat (limited to 'yage/core/sprite.cpp')
-rw-r--r--yage/core/sprite.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/yage/core/sprite.cpp b/yage/core/sprite.cpp
index 246d415d..041281d3 100644
--- a/yage/core/sprite.cpp
+++ b/yage/core/sprite.cpp
@@ -56,11 +56,11 @@ void Sprite::init(float x, float y, float width, float height,
vertex_data[5].setUv(1.f, 0.f);
for (auto &i : vertex_data) {
- i.setColor(255, 0, 255, 255);
+ i.setColour(255, 0, 255, 255);
}
- vertex_data[1].setColor(0, 255, 255, 255);
- vertex_data[4].setColor(255, 0, 0, 255);
+ vertex_data[1].setColour(0, 255, 255, 255);
+ vertex_data[4].setColour(255, 0, 0, 255);
glBindBuffer(GL_ARRAY_BUFFER, vbo_id_);
glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data,
@@ -80,7 +80,7 @@ void Sprite::draw()
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
(void *)offsetof(Vertex, position));
glVertexAttribPointer(1, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Vertex),
- (void *)offsetof(Vertex, color));
+ (void *)offsetof(Vertex, colour));
glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
(void *)offsetof(Vertex, uv));
glDrawArrays(GL_TRIANGLES, 0, 6);