summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2015-01-22 23:31:54 +0100
committerFlorian Jung <flo@windfisch.org>2015-01-22 23:31:54 +0100
commitfcdc75f656fd999b90f5ce210f4c07e4d9f9c42a (patch)
treecb68d66f0a5717b524db49098b6eb2b319f52e80
parent5e85e3a9fcd24cf9b6eccd80bf3d8cc24c38b63a (diff)
colorful
-rw-r--r--client2.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/client2.cpp b/client2.cpp
index b2c61d9..49eb776 100644
--- a/client2.cpp
+++ b/client2.cpp
@@ -81,13 +81,13 @@ float vertices[] = {
float quadVertices[] = {
- -1.f, -1.f, 0.0f,0.0f, // Vertex 1 (X, Y)
- 1.f, -1.f, 1.0f,0.0f, // Vertex 2 (X, Y)
- 1.f, 1.f, 1.0f,1.0f, // Vertex 3 (X, Y)
+ -1.f, -1.f, 0.4f,0.4f, // Vertex 1 (X, Y)
+ 1.f, -1.f, 0.6f,0.4f, // Vertex 2 (X, Y)
+ 1.f, 1.f, 0.6f,0.6f, // Vertex 3 (X, Y)
- 1.f, 1.f, 1.0f,1.0f, // Vertex 3 (X, Y)
- -1.f, 1.f, 0.0f,1.0f, // Vertex 4 (X, Y)
- -1.f, -1.f, 0.0f,0.0f // Vertex 1 (X, Y)
+ 1.f, 1.f, 0.6f,0.6f, // Vertex 3 (X, Y)
+ -1.f, 1.f, 0.4f,0.6f, // Vertex 4 (X, Y)
+ -1.f, -1.f, 0.4f,0.4f // Vertex 1 (X, Y)
};
@@ -248,7 +248,7 @@ int main(int argc, const char** argv)
// compile shaders
GLuint shaderProgram = justDrawASpriteShaderProgram(vaoCanvas, vboCanvas);
- GLuint quadShaderProgram = justDrawASpriteShaderProgram(vaoQuad, vboQuad, true);
+ GLuint quadShaderProgram = justDrawASpriteShaderProgram(vaoQuad, vboQuad);
// texture