Changeset 2b0214c in opengl-game

Timestamp:

Oct 5, 2018, 1:07:44 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

0e0f851

Parents:

1f3d32b

Message:

-Comment out the code for showing selected objects in a different color
-Increase the damage lasers deal to asteroids
-Remove asteroids from the scene when they're destroyed

File:

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

new-game.cpp

@@ -458 +458 @@
    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, 0);
 
+   // Comment these two lines out when I want to use selected colors
+   glBindBuffer(GL_ARRAY_BUFFER, colors_vbo);
+   glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, 0);
+
    glBindBuffer(GL_ARRAY_BUFFER, normals_vbo);
    glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, 0, 0);
@@ -734 +738 @@
 
                if ((obj_center.z - objects[i]->bounding_radius) > -NEAR_CLIP) {
+                  removeObjectFromScene(*objects[i], ubo);
+               }
+               if (((Asteroid*)objects[i])->hp <= 0) {
                   removeObjectFromScene(*objects[i], ubo);
                }
@@ -1951 +1958 @@
 
       if (closestAsteroid != NULL) {
-         eot = new EffectOverTime(closestAsteroid->hp, -5, closestAsteroid);
+         eot = new EffectOverTime(closestAsteroid->hp, -10, closestAsteroid);
          effects.push_back(eot);
       }
@@ -2036 +2043 @@
    glBindVertexArray(color_vao);
 
+   /*
    if (selectedObject != NULL) {
       glBindBuffer(GL_ARRAY_BUFFER, selected_colors_vbo);
@@ -2042 +2050 @@
       glDrawArrays(GL_TRIANGLES, selectedObject->vertex_vbo_offset, selectedObject->num_points);
    }
-
-   glBindBuffer(GL_ARRAY_BUFFER, colors_vbo);
-   glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, 0);
+   */
+
+   // Uncomment this code when I want to use selected colors again
+   // glBindBuffer(GL_ARRAY_BUFFER, colors_vbo);
+   // glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, 0);
 
    glDrawArrays(GL_TRIANGLES, shaderBufferInfo[color_sp].vbo_base, shaderBufferInfo[color_sp].vbo_offset);