Changeset 9dd2eb7 in opengl-game for new-game.cpp

Timestamp:

Apr 28, 2018, 2:29:20 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

9f4986b

Parents:

d9f99b2

Message:

Implement Phong shading in the color and texture shaders

File:

• new-game.cpp (modified) (9 diffs)

new-game.cpp

@@ -40 +40 @@
    vector<GLfloat> colors;
    vector<GLfloat> texcoords;
+   vector<GLfloat> normals;
    vector<GLfloat> selected_colors;
 };
@@ -240 +241 @@
       1.0f, 0.0f
    };
+   objects[0].normals = {
+       0.0f,  0.0f,  1.0f,
+       0.0f,  0.0f,  1.0f,
+       0.0f,  0.0f,  1.0f,
+       0.0f,  0.0f, -1.0f,
+       0.0f,  0.0f, -1.0f,
+       0.0f,  0.0f, -1.0f,
+   };
    objects[0].selected_colors = {
       0.0f, 1.0f, 0.0f,
@@ -284 +293 @@
       1.0f, 0.0f
    };
+   objects[1].normals = {
+      0.0f,  0.0f,  1.0f,
+      0.0f,  0.0f,  1.0f,
+      0.0f,  0.0f,  1.0f,
+      0.0f,  0.0f,  1.0f,
+      0.0f,  0.0f,  1.0f,
+      0.0f,  0.0f,  1.0f,
+   };
    objects[1].selected_colors = {
       0.0f, 0.9f, 0.9f,
@@ -353 +370 @@
    }
 
+   GLuint normals_vbo = 0;
+   glGenBuffers(1, &normals_vbo);
+   glBindBuffer(GL_ARRAY_BUFFER, normals_vbo);
+   glBufferData(GL_ARRAY_BUFFER, points_buffer_size, NULL, GL_DYNAMIC_DRAW);
+
+   offset = 0;
+   for (obj_it = objects.begin(); obj_it != objects.end(); obj_it++) {
+      glBufferSubData(GL_ARRAY_BUFFER, offset, obj_it->normals.size() * sizeof(GLfloat), &obj_it->normals[0]);
+      offset += obj_it->normals.size() * sizeof(GLfloat);
+   }
+
    GLuint vao = 0;
    glGenVertexArrays(1, &vao);
@@ -359 +387 @@
    glEnableVertexAttribArray(0);
    glEnableVertexAttribArray(1);
+   glEnableVertexAttribArray(2);
 
    GLuint vao2 = 0;
@@ -366 +395 @@
    glEnableVertexAttribArray(0);
    glEnableVertexAttribArray(1);
+   glEnableVertexAttribArray(2);
 
    // I can create a vbo to store all points for all models,
@@ -459 +489 @@
    double previous_seconds = glfwGetTime();
 
+   // This draws wireframes. Useful for seeing separate faces and occluded objects.
+   //glPolygonMode(GL_FRONT, GL_LINE);
+
    while (!glfwWindowShouldClose(window)) {
       double current_seconds = glfwGetTime();
@@ -535 +568 @@
          glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, objects[*it].vertex_vbo_offset);
 
+         glBindBuffer(GL_ARRAY_BUFFER, normals_vbo);
+         glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, 0, objects[*it].vertex_vbo_offset);
+
          glDrawArrays(GL_TRIANGLES, 0, objects[*it].num_points);
       }
@@ -549 +585 @@
          glBindBuffer(GL_ARRAY_BUFFER, texcoords_vbo);
          glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, objects[*it].texture_vbo_offset);
+
+         glBindBuffer(GL_ARRAY_BUFFER, normals_vbo);
+         glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, 0, objects[*it].vertex_vbo_offset);
 
          glDrawArrays(GL_TRIANGLES, 0, objects[*it].num_points);