Changeset e3ca955 in opengl-game

Timestamp:

May 26, 2018, 8:19:03 PM (7 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

0d5c100

Parents:

f9a242b

Message:

Change the rendering algorithm to draw the selected objects, then draw all objects, including redrawing selected objects. This lets me draw all objects that use a certain shader at once, without worrying about which ones are selected.

File:

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

new-game.cpp

@@ -955 +955 @@
                   SceneObject* selectedObject) {
 
-   vector<int> colored_objs, selected_objs, textured_objs, static_colored_objs, static_textured_objs;
+   vector<int> colored_objs, selected_objs, textured_objs;
 
    // group scene objects by shader and vbo
@@ -961 +961 @@
       if (selectedObject == &objects[i]) {
          selected_objs.push_back(i);
-      } else if (objects[i].shader_program == color_sp) {
+      }
+      if (objects[i].shader_program == color_sp) {
          colored_objs.push_back(i);
       } else if (objects[i].shader_program == texture_sp) {
@@ -973 +974 @@
    glBindVertexArray(vao1);
 
+   glBindBuffer(GL_ARRAY_BUFFER, selected_colors_vbo);
+   glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, 0);
+
+   for (it = selected_objs.begin(); it != selected_objs.end(); it++) {
+      glDrawArrays(GL_TRIANGLES, objects[*it].vertex_vbo_offset, objects[*it].num_points);
+   }
+
    glBindBuffer(GL_ARRAY_BUFFER, colors_vbo);
    glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, 0);
 
    for (it = colored_objs.begin(); it != colored_objs.end(); it++) {
-      glDrawArrays(GL_TRIANGLES, objects[*it].vertex_vbo_offset, objects[*it].num_points);
-   }
-
-   glBindBuffer(GL_ARRAY_BUFFER, selected_colors_vbo);
-   glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, 0);
-
-   for (it = selected_objs.begin(); it != selected_objs.end(); it++) {
       glDrawArrays(GL_TRIANGLES, objects[*it].vertex_vbo_offset, objects[*it].num_points);
    }