Changeset 2ba5617 in opengl-game for vulkan-game.cpp

Timestamp:

Mar 26, 2020, 3:41:42 AM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

bf4744d

Parents:

2ff4d3e

Message:

Center each object before, rather than after, it is copied to the GPU so that the centered vertices are copied, update an object's center when its model matrix is modified in updateObject(), mark an asteroid object as deleted when it moves offscreen, and randomize the initial z-coordinate for a new asteroid

File:

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

vulkan-game.cpp

@@ -683 +683 @@
       }
 
-      // TODO: Remove this block of code and correctly update the center of all objects when they are transformed
-      if (gui->keyPressed(SDL_SCANCODE_X)) {
-         if (asteroidObjects.size() > 0 && !asteroidObjects[0].ssbo.deleted) {
-            asteroidObjects[0].model_transform = translate(mat4(1.0f), vec3(0.0f, 0.0f, this->asteroidSpeed * this->elapsedTime))
-               * asteroidObjects[0].model_transform;
-
-            vec3 obj_center = vec3(asteroid_VP_mats.view * vec4(asteroidObjects[0].center, 1.0f));
-
-            float closest = obj_center.z - asteroidObjects[0].radius;
-            cout << closest << " ? " << -NEAR_CLIP << endl;
-
-            updateObject(asteroidObjects, asteroidPipeline, 0);
-         }
-      }
-
       renderUI();
       renderScene();
@@ -717 +702 @@
    }
 
-   for (int i = 0; i < asteroidObjects.size(); i++) {
-      if (!asteroidObjects[i].ssbo.deleted) {
-         asteroidObjects[i].model_transform =
-            translate(mat4(1.0f), vec3(0.0f, 0.0f, this->asteroidSpeed * this->elapsedTime)) *
-            asteroidObjects[i].model_transform;
+   for (int i = 0; i < this->asteroidObjects.size(); i++) {
+      if (!this->asteroidObjects[i].ssbo.deleted) {
+         vec3 objCenter = vec3(viewMat * vec4(this->asteroidObjects[i].center, 1.0f));
+
+         if ((objCenter.z - this->asteroidObjects[i].radius) > -NEAR_CLIP) {
+            this->asteroidObjects[i].ssbo.deleted = true;
+         } else {
+            this->asteroidObjects[i].model_transform =
+               translate(mat4(1.0f), vec3(0.0f, 0.0f, this->asteroidSpeed * this->elapsedTime)) *
+               this->asteroidObjects[i].model_transform;
+         }
 
          updateObject(asteroidObjects, asteroidPipeline, i);
@@ -794 +785 @@
          }, true);
 
-      // translate(mat4(1.0f), vec3(getRandomNum(-1.3f, 1.3f), -1.2f, getRandomNum(-5.5f, -4.5f))) *
-      // translate(mat4(1.0f), vec3(0.0504826f, -1.2f, 1.0f)) *
+      // This accounts for the scaling in model_base.
+      // Dividing by 8 instead of 10 since the bounding radius algorithm
+      // under-calculates the true value.
+      // TODO: Figure out the best way to take scaling into account when calculating the radius
+      // Keep in mind that the main complicating factor is the currently poor radius calculation
+      asteroidObjects.back().radius /= 8.0f;
+
       asteroidObjects.back().model_base =
-         translate(mat4(1.0f), vec3(getRandomNum(-1.3f, 1.3f), -1.2f, -2.0f)) *
+         translate(mat4(1.0f), vec3(getRandomNum(-1.3f, 1.3f), -1.2f, getRandomNum(-5.5f, -4.5f))) *
          rotate(mat4(1.0f), radians(60.0f), vec3(1.0f, 1.0f, -1.0f)) *
          scale(mat4(1.0f), vec3(0.1f, 0.1f, 0.1f));