Changeset de53394 in opengl-game

Timestamp:

Mar 22, 2019, 5:15:59 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

b05e2b5

Parents:

b220f78

Message:

Move the generation of the explosion shader vbos to where all the other "global" vbos are generated

File:

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

new-game.cpp

@@ -200 +200 @@
                   GLuint* texcoords_vbo,
                   GLuint* normals_vbo,
+                  GLuint* time_vbo,
+                  GLuint* velocity_vbo,
                   GLuint* ubo,
                   GLuint* model_mat_idx_vbo);
@@ -210 +212 @@
                   GLuint texcoords_vbo,
                   GLuint normals_vbo,
+                  GLuint time_vbo,
+                  GLuint velocity_vbo,
                   GLuint ubo,
                   GLuint model_mat_idx_vbo);
@@ -482 +486 @@
    GLfloat curTime, prevTime, elapsedTime;
 
-   GLuint points_vbo, colors_vbo, texcoords_vbo, normals_vbo, ubo, model_mat_idx_vbo;
+   GLuint
+    points_vbo,
+    colors_vbo,
+    texcoords_vbo,
+    normals_vbo,
+    time_vbo,
+    velocity_vbo,
+    ubo,
+    model_mat_idx_vbo;
 
    initializeBuffers(
@@ -489 +501 @@
       &texcoords_vbo,
       &normals_vbo,
+      &time_vbo,
+      &velocity_vbo,
       &ubo,
       &model_mat_idx_vbo);
@@ -625 +639 @@
   initModelGroupAttribs(modelGroups[TYPE_EXPLOSION]);
 
+   glBindBuffer(GL_ARRAY_BUFFER, velocity_vbo);
+   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
+
+   glBindBuffer(GL_ARRAY_BUFFER, time_vbo);
+   glVertexAttribPointer(1, 1, GL_FLOAT, GL_FALSE, 0, NULL);
+
    cam_pos = vec3(0.0f, 0.0f, 2.0f);
    float cam_yaw = 0.0f * 2.0f * 3.14159f / 360.0f;
@@ -683 +703 @@
       texcoords_vbo,
       normals_vbo,
+      time_vbo,
+      velocity_vbo,
       ubo,
       model_mat_idx_vbo);
@@ -2115 +2137 @@
                   GLuint* texcoords_vbo,
                   GLuint* normals_vbo,
+                  GLuint* time_vbo,
+                  GLuint* velocity_vbo,
                   GLuint* ubo,
                   GLuint* model_mat_idx_vbo) {
@@ -2128 +2152 @@
    *normals_vbo = 0;
    glGenBuffers(1, normals_vbo);
+
+   *velocity_vbo = 0;
+   glGenBuffers(1, velocity_vbo);
+
+   *time_vbo = 0;
+   glGenBuffers(1, time_vbo);
 
    *ubo = 0;
@@ -2143 +2173 @@
                   GLuint texcoords_vbo,
                   GLuint normals_vbo,
+                  GLuint time_vbo,
+                  GLuint velocity_vbo,
                   GLuint ubo,
                   GLuint model_mat_idx_vbo) {
@@ -2168 +2200 @@
    bindUniformData(modelGroups[TYPE_EXPLOSION].attribs["model_mat"], value_ptr(model_mat));
 
-   GLuint velocity_vbo;
-   glGenBuffers(1, &velocity_vbo);
-
-   GLuint time_vbo;
-   glGenBuffers(1, &time_vbo);
-
-   glBindVertexArray(modelGroups[TYPE_EXPLOSION].vao);
-
-   // the glBufferData and glVertexAttribPointer need to stay here while the corresponding arrays
+   // the glBufferData calls need to stay here while the corresponding arrays
    // are local to this function. Once they're made part of the explosion object, I might be able
    // to move this code out of here
@@ -2182 +2206 @@
    glBindBuffer(GL_ARRAY_BUFFER, velocity_vbo);
    glBufferData(GL_ARRAY_BUFFER, sizeof(vv), vv, GL_STATIC_DRAW);
-   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
 
    glBindBuffer(GL_ARRAY_BUFFER, time_vbo);
    glBufferData(GL_ARRAY_BUFFER, sizeof(vt), vt, GL_STATIC_DRAW);
-   glVertexAttribPointer(1, 1, GL_FLOAT, GL_FALSE, 0, NULL);
 
    objExplosion = createExplosion();