Changeset 5c403fe in opengl-game for new-game.cpp

Timestamp:

Jun 10, 2018, 10:17:10 PM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

809ce16

Parents:

f7d35da

git-author:

Dmitry Portnoy <dmp1488@…> (06/10/18 22:17:05)

git-committer:

Dmitry Portnoy <dmp1488@…> (06/10/18 22:17:10)

Message:

Change the SceneObject definition to include a base model matrix and a transform model matrix, which are multiplied to create the final model matrix. Add a transformObject function that sets the transform matrix and updates the model ubo with the object's new model matrix

File:

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

new-game.cpp

@@ -39 +39 @@
 struct SceneObject {
    unsigned int id;
-   mat4 model_mat;
+   mat4 model_mat, model_base, model_transform;
    GLuint shader_program;
    unsigned int num_points;
    GLint vertex_vbo_offset;
+   GLint ubo_offset;
    vector<GLfloat> points;
    vector<GLfloat> colors;
@@ -123 +124 @@
                      map<GLuint, unsigned int>& shaderCounts,
                      map<GLuint, unsigned int>& curShaderBase);
+
+void transformObject(SceneObject& obj, const mat4& transform, GLuint ubo);
 
 void renderMainMenu();
@@ -324 +327 @@
    T_model = translate(mat4(), vec3(0.45f, 0.0f, 0.0f));
    R_model = rotate(mat4(), 0.0f, vec3(0.0f, 1.0f, 0.0f));
-   obj.model_mat = T_model*R_model;
+   obj.model_base = T_model*R_model;
 
    addObjectToScene(obj);
@@ -366 +369 @@
    T_model = translate(mat4(), vec3(-0.5f, 0.0f, -1.00f));
    R_model = rotate(mat4(), 0.5f, vec3(0.0f, 1.0f, 0.0f));
-   obj.model_mat = T_model*R_model;
+   obj.model_base = T_model*R_model;
 
    addObjectToScene(obj);
@@ -408 +411 @@
    T_model = translate(mat4(), vec3(0.0f, -0.9f, 0.0f));
    R_model = rotate(mat4(), -1.0f, vec3(1.0f, 0.0f, 0.0f));
-   obj.model_mat = T_model; //T_model * R_model;
+   obj.model_base = T_model; //T_model * R_model;
 
    addObjectToScene(obj);
@@ -480 +483 @@
 
    mat4 T = translate(mat4(), vec3(-cam_pos.x, -cam_pos.y, -cam_pos.z));
-   mat4 R = rotate(mat4(), -cam_yaw, vec3(0.0f, 1.0f, 0.0f));
+   mat4 R = mat4();
    view_mat = R*T;
 
@@ -593 +596 @@
          /*
          if (key_state[GLFW_KEY_SPACE] == GLFW_PRESS) {
-            //transformObject(objects[1], translate(mat4(), vec3(0.3f, 0.0f, 0.0f)), ubo);
+            transformObject(objects[1], translate(mat4(), vec3(0.3f, 0.0f, 0.0f)), ubo);
          }
          if (key_pressed[GLFW_KEY_RIGHT]) {
@@ -885 +888 @@
    obj.id = objects.size(); // currently unused
    obj.num_points = obj.points.size() / 3;
+   obj.model_transform = mat4();
 
    obj.normals.reserve(obj.points.size());
@@ -1009 +1013 @@
    glBufferData(GL_ARRAY_BUFFER, model_mat_idx_buffer_size, NULL, GL_DYNAMIC_DRAW);
 
-   GLint vertex_ubo_offset;
    for (it = objects.begin(); it != objects.end(); it++) {
       it->vertex_vbo_offset = curShaderBase[it->shader_program] + curShaderOffset[it->shader_program];
-      vertex_ubo_offset = curShaderUboBase[it->shader_program] + curShaderUboOffset[it->shader_program];
+      it->ubo_offset = curShaderUboBase[it->shader_program] + curShaderUboOffset[it->shader_program];
 
       glBindBuffer(GL_ARRAY_BUFFER, *points_vbo);
@@ -1031 +1034 @@
       glBindBuffer(GL_ARRAY_BUFFER, *model_mat_idx_vbo);
       for (int i = 0; i < it->num_points; i++) {
-         glBufferSubData(GL_ARRAY_BUFFER, (it->vertex_vbo_offset + i) * sizeof(GLuint), sizeof(GLuint), &vertex_ubo_offset);
+         glBufferSubData(GL_ARRAY_BUFFER, (it->vertex_vbo_offset + i) * sizeof(GLuint), sizeof(GLuint), &it->ubo_offset);
       }
 
       curShaderOffset[it->shader_program] += it->num_points;
 
+      it->model_mat = it->model_base * it->model_transform;
       glBindBuffer(GL_UNIFORM_BUFFER, *ubo);
-      glBufferSubData(GL_UNIFORM_BUFFER, vertex_ubo_offset * sizeof(mat4), sizeof(mat4), value_ptr(it->model_mat));
+      glBufferSubData(GL_UNIFORM_BUFFER, it->ubo_offset * sizeof(mat4), sizeof(mat4), value_ptr(it->model_mat));
 
       curShaderUboOffset[it->shader_program]++;
    }
+}
+
+void transformObject(SceneObject& obj, const mat4& transform, GLuint ubo) {
+   obj.model_transform = obj.model_transform * transform;
+   obj.model_mat = obj.model_transform * obj.model_base;
+
+   glBindBuffer(GL_UNIFORM_BUFFER, ubo);
+   glBufferSubData(GL_UNIFORM_BUFFER, obj.ubo_offset * sizeof(mat4), sizeof(mat4), value_ptr(obj.model_mat));
 }