Changeset e165b85 in opengl-game

Timestamp:

May 18, 2018, 11:04:10 PM (7 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

14ff67c

Parents:

cffca4d

Message:

Start incorporating UBOs

Files:

• color.vert (modified) (1 diff)
• new-game.cpp (modified) (4 diffs)

color.vert

@@ -2 +2 @@
 
 uniform mat4 model, view, proj;
+
+layout (std140) uniform shader_data {
+  mat4 model_mat;
+};
 
 layout(location = 0) in vec3 vertex_position;

new-game.cpp

@@ -395 +395 @@
    GLsizeiptr points_buffer_size = 0;
    GLsizeiptr textures_buffer_size = 0;
+   GLsizeiptr ubo_buffer_size = 0;
 
    for (obj_it = objects.begin(); obj_it != objects.end(); obj_it++) {
       points_buffer_size += obj_it->points.size() * sizeof(GLfloat);
       textures_buffer_size += obj_it->texcoords.size() * sizeof(GLfloat);
+      ubo_buffer_size += 16 * sizeof(GLfloat);
    }
 
@@ -455 +457 @@
       offset += obj_it->normals.size() * sizeof(GLfloat);
    }
+
+   /*
+   GLuint ubo = 0;
+   glGenBuffers(1, &ubo);
+
+   //glBindBuffer(GL_UNIFORM_BUFFER, ubo);
+   //glBufferData(GL_UNIFORM_BUFFER, ubo_buffer_size/2, NULL, GL_DYNAMIC_DRAW);
+
+   offset = 0;
+   for (obj_it = objects.begin(); obj_it != objects.end(); obj_it++) {
+      //glBufferSubData(GL_UNIFORM_BUFFER, offset, sizeof(obj_it->model_mat), value_ptr(obj_it->model_mat));
+      //glBufferSubData(GL_UNIFORM_BUFFER, offset, sizeof(obj_it->model_mat), value_ptr(objects[0].model_mat));
+      offset += 16 * sizeof(GLfloat);
+   }
+   //glBindBuffer(GL_UNIFORM_BUFFER, 0);
+   */
 
    GLuint vao = 0;
@@ -523 +541 @@
    GLuint view_test_loc = glGetUniformLocation(color_sp, "view");
    GLuint proj_test_loc = glGetUniformLocation(color_sp, "proj");
+   GLuint ub_index = glGetUniformBlockIndex(color_sp, "shader_data");
+   cout << "UBO index: " << ub_index << endl;
 
    GLuint model_mat_loc = glGetUniformLocation(texture_sp, "model");
@@ -529 +549 @@
 
    glUseProgram(color_sp);
-   glUniformMatrix4fv(model_test_loc, 1, GL_FALSE, value_ptr(objects[0].model_mat));
    glUniformMatrix4fv(view_test_loc, 1, GL_FALSE, value_ptr(view_mat));
    glUniformMatrix4fv(proj_test_loc, 1, GL_FALSE, value_ptr(proj_mat));
 
+   //glUniformBlockBinding(color_sp, ub_index, 0);
+
    glUseProgram(texture_sp);
-   glUniformMatrix4fv(model_mat_loc, 1, GL_FALSE, value_ptr(objects[1].model_mat));
    glUniformMatrix4fv(view_mat_loc, 1, GL_FALSE, value_ptr(view_mat));
    glUniformMatrix4fv(proj_mat_loc, 1, GL_FALSE, value_ptr(proj_mat));