Changeset 8b7cfcf in opengl-game

Timestamp:

Aug 5, 2017, 2:24:43 AM (7 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

d0b9596

Parents:

c40990d

Message:

Allow each vertex to have its own color

Files:

• makefile (modified) (1 diff)
• new-game.cpp (modified) (3 diffs)
• test.frag (modified) (1 diff)
• test.vert (modified) (1 diff)

makefile

@@ -13 +13 @@
         $(CC) $? $(DEP) $(CFLAGS) -o $@
 
-game: mygame.cpp common/shader.cpp common/texture.cpp common/controls-new.cpp
+game: game.cpp common/shader.cpp common/texture.cpp common/controls-new.cpp
         $(CC) $? $(DEP) $(CFLAGS) -o $@
 

new-game.cpp

@@ +1 @@
+// NEXT STEP; Modify the vertex shader
+
 #include "logger.h"
 
@@ -81 +83 @@
    };
 
-   GLuint vbo = 0;
-   glGenBuffers(1, &vbo);
-   glBindBuffer(GL_ARRAY_BUFFER, vbo);
+   GLfloat colors[] = {
+     1.0, 0.0, 0.0,
+     0.0, 1.0, 0.0,
+     0.0, 0.0, 1.0,
+   };
+
+   GLuint points_vbo = 0;
+   glGenBuffers(1, &points_vbo);
+   glBindBuffer(GL_ARRAY_BUFFER, points_vbo);
    glBufferData(GL_ARRAY_BUFFER, sizeof(points), points, GL_STATIC_DRAW);
+
+   GLuint colors_vbo = 0;
+   glGenBuffers(1, &colors_vbo);
+   glBindBuffer(GL_ARRAY_BUFFER, colors_vbo);
+   glBufferData(GL_ARRAY_BUFFER, sizeof(colors), colors, GL_STATIC_DRAW);
 
    GLuint vao = 0;
    glGenVertexArrays(1, &vao);
    glBindVertexArray(vao);
+   glBindBuffer(GL_ARRAY_BUFFER, points_vbo);
+   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
+   glBindBuffer(GL_ARRAY_BUFFER, colors_vbo);
+   glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, NULL);
+
    glEnableVertexAttribArray(0);
-   glBindBuffer(GL_ARRAY_BUFFER, vbo);
-   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
-
-   //string vertexShaderString = loadShader();
+   glEnableVertexAttribArray(1);
 
    GLuint vs = loadShader(GL_VERTEX_SHADER, "./test.vert");
@@ -101 +116 @@
    glAttachShader(shader_program, vs);
    glAttachShader(shader_program, fs);
+
+   // this must be used on OSX instead of using layout() in the shader
+   glBindAttribLocation(shader_program, 0, "vertex_position");
+   glBindAttribLocation(shader_program, 1, "vertex_color");
+
    glLinkProgram(shader_program);
 

test.frag

@@ -1 +1 @@
 #version 410
 
-//uniform vec4 inputColor;
-out vec4 fragColor;
+in vec3 color;
+out vec4 frag_color;
 
 void main() {
-  //fragColor = inputColor;
-  fragColor = vec4(0.5, 0.0, 0.5, 1.0);
+  frag_color = vec4(color, 1.0);
 }

test.vert

@@ -1 +1 @@
 #version 410
 
+// using layout() doens't work on OSX, so use glBindAttribLocation() in the C++ code instead
+// layout(position = 0) in vec3 vertex_position;
+// layout(position = 1) in vec3 vertex_color;
+
 in vec3 vertex_position;
+in vec3 vertex_color;
+
+out vec3 color;
 
 void main() {
+  color = vertex_color;
   gl_Position = vec4(vertex_position, 1.0);
 }