Changeset c1ec4f6 in opengl-game

Timestamp:

Jun 11, 2021, 2:35:32 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

6486ba8

Parents:

b7fc3c2

git-author:

Dmitry Portnoy <dportnoy@…> (06/10/21 21:37:02)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/11/21 14:35:32)

Message:

Remove the modified field from the SceneObject object

Files:

• sdl-game.cpp (modified) (5 diffs)
• sdl-game.hpp (modified) (3 diffs)
• vulkan-game.cpp (modified) (18 diffs)
• vulkan-game.hpp (modified) (4 diffs)

sdl-game.cpp

@@ -123 +123 @@
    SceneObject<ModelVertex, SSBO_ModelObject>* texturedSquare = nullptr;
 
-   // TODO: Ideally, avoid having to make the squares as modified upon creation
-
    texturedSquare = &addObject(modelObjects, modelPipeline,
       addObjectIndex<ModelVertex>(modelObjects.size(),
@@ -143 +141 @@
    texturedSquare->model_base =
       translate(mat4(1.0f), vec3(0.0f, 0.0f, -2.0f));
-   texturedSquare->modified = true;
 
    texturedSquare = &addObject(modelObjects, modelPipeline,
@@ -162 +159 @@
    texturedSquare->model_base =
       translate(mat4(1.0f), vec3(0.0f, 0.0f, -1.5f));
-   texturedSquare->modified = true;
 
    modelPipeline.createDescriptorSetLayout();
@@ -385 +381 @@
                   texturedSquare.model_base =
                      translate(mat4(1.0f), vec3(0.0f, 0.0f, zOffset));
-                  texturedSquare.modified = true;
                // START UNREVIEWED SECTION
                // END UNREVIEWED SECTION
@@ -467 +462 @@
          translate(mat4(1.0f), vec3(0.0f, -2.0f, -0.0f)) *
          rotate(mat4(1.0f), curTime * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
-      obj.modified = true;
-
-      if (obj.modified) {
-         objData.model = obj.model_transform * obj.model_base;
-         obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-         obj.modified = false;
-
-         updateBufferSet(storageBuffers_modelPipeline, i, objData);
-      }
+
+      objData.model = obj.model_transform * obj.model_base;
+      obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+      updateBufferSet(storageBuffers_modelPipeline, i, objData);
    }
 

sdl-game.hpp

@@ -102 +102 @@
    mat4 model_transform;
 
-   bool modified;
-
    // TODO: Figure out if I should make child classes that have these fields instead of putting them in the
    // parent class
@@ -117 +115 @@
 // Could probably use the same approach to make indices optional
 // Figure out if there are sufficient use cases to make either of these optional or is it fine to make
-// them mamdatory
+// them mandatory
 
 
@@ -366 +364 @@
    }
 
-   objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f), false });
+   objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f) });
    objectBuffer.add(ssbo);
 

vulkan-game.cpp

@@ -151 +151 @@
    SceneObject<ModelVertex, SSBO_ModelObject>* texturedSquare = nullptr;
 
-   // TODO: Ideally, avoid having to make the squares as modified upon creation
-
    texturedSquare = &addObject(modelObjects, modelPipeline,
       addObjectIndex<ModelVertex>(modelObjects.size(),
@@ -171 +169 @@
    texturedSquare->model_base =
       translate(mat4(1.0f), vec3(0.0f, 0.0f, -2.0f));
-   texturedSquare->modified = true;
 
    texturedSquare = &addObject(modelObjects, modelPipeline,
@@ -191 +188 @@
    texturedSquare->model_base =
       translate(mat4(1.0f), vec3(0.0f, 0.0f, -1.5f));
-   texturedSquare->modified = true;
 
    modelPipeline.createDescriptorSetLayout();
@@ -453 +449 @@
       translate(mat4(1.0f), vec3(0.0f, -1.2f, 1.65f)) *
       scale(mat4(1.0f), vec3(0.1f, 0.1f, 0.1f));
-   ship.modified = true;
 
    shipPipeline.createDescriptorSetLayout();
@@ -791 +786 @@
                   texturedSquare.model_base =
                      translate(mat4(1.0f), vec3(0.0f, 0.0f, zOffset));
-                  texturedSquare.modified = true;
                // START UNREVIEWED SECTION
                } else if (e.key.keycode == SDL_SCANCODE_Z && leftLaserIdx == -1) {
@@ -824 +818 @@
                if (e.key.keycode == SDL_SCANCODE_Z && leftLaserIdx != -1) {
                   laserObjects[leftLaserIdx].ssbo.deleted = true;
-                  laserObjects[leftLaserIdx].modified = true;
                   leftLaserIdx = -1;
 
@@ -833 +826 @@
                } else if (e.key.keycode == SDL_SCANCODE_X && rightLaserIdx != -1) {
                   laserObjects[rightLaserIdx].ssbo.deleted = true;
-                  laserObjects[rightLaserIdx].modified = true;
                   rightLaserIdx = -1;
 
@@ -872 +864 @@
          ship.model_transform = translate(mat4(1.0f), vec3(distance, 0.0f, 0.0f))
             * shipObjects[0].model_transform;
-         ship.modified = true;
 
          if (leftLaserIdx != -1) {
@@ -885 +876 @@
          ship.model_transform = translate(mat4(1.0f), vec3(distance, 0.0f, 0.0f))
             * shipObjects[0].model_transform;
-         ship.modified = true;
 
          if (leftLaserIdx != -1) {
@@ -1026 +1016 @@
          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));
-      asteroid.modified = true;
    }
 
@@ -1051 +1040 @@
          translate(mat4(1.0f), vec3(0.0f, -2.0f, -0.0f)) *
          rotate(mat4(1.0f), curTime * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
-      obj.modified = true;
-
-      if (obj.modified) {
-         objData.model = obj.model_transform * obj.model_base;
-         obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-         obj.modified = false;
-
-         updateBufferSet(storageBuffers_modelPipeline, i, objData);
-      }
+
+      objData.model = obj.model_transform * obj.model_base;
+      obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+      updateBufferSet(storageBuffers_modelPipeline, i, objData);
    }
 
@@ -1077 +1061 @@
       SSBO_ModelObject& objData = obj.ssbo;
 
-      if (obj.modified) {
-         objData.model = obj.model_transform * obj.model_base;
-         obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-         obj.modified = false;
-
-         updateBufferSet(storageBuffers_shipPipeline, i, objData);
-      }
+      objData.model = obj.model_transform * obj.model_base;
+      obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+      updateBufferSet(storageBuffers_shipPipeline, i, objData);
    }
 
@@ -1123 +1103 @@
          }
 
-         obj.modified = true;
-      }
-
-      if (obj.modified) {
          objData.model = obj.model_transform * obj.model_base;
          obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-         obj.modified = false;
 
          updateBufferSet(storageBuffers_asteroidPipeline, i, objData);
@@ -1156 +1130 @@
       SSBO_Laser& objData = obj.ssbo;
 
-      if (obj.modified) {
-         objData.model = obj.model_transform * obj.model_base;
-         obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-         obj.modified = false;
-
-         updateBufferSet(storageBuffers_laserPipeline, i, objData);
-      }
+      objData.model = obj.model_transform * obj.model_base;
+      obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+      updateBufferSet(storageBuffers_laserPipeline, i, objData);
    }
 
@@ -1182 +1152 @@
          if (curTime > (objData.explosionStartTime + objData.explosionDuration)) {
             objData.deleted = true;
-            obj.modified = true;
          }
       }
 
-      if (obj.modified) {
-         objData.model = obj.model_transform * obj.model_base;
-         obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
-
-         obj.modified = false;
-
-         updateBufferSet(storageBuffers_explosionPipeline, i, objData);
-      }
+      objData.model = obj.model_transform * obj.model_base;
+      obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+      updateBufferSet(storageBuffers_explosionPipeline, i, objData);
    }
 
@@ -2083 +2048 @@
       rotate(mat4(1.0f), yAxisRotation, vec3(0.0f, 1.0f, 0.0f)) *
       rotate(mat4(1.0f), xAxisRotation, vec3(1.0f, 0.0f, 0.0f));
-
-   laser.modified = true;
 }
 
@@ -2115 +2078 @@
    laser.model_base = rotate(mat4(1.0f), zAxisRotation, vec3(0.0f, 0.0f, 1.0f));
    laser.model_transform = translate(mat4(1.0f), translation) * laser.model_transform;
-
-   laser.modified = true;
 }
 
@@ -2270 +2231 @@
    explosion.model_base = model_mat;
    explosion.model_transform = mat4(1.0f);
-
-   explosion.modified = true;
 }
 

vulkan-game.hpp

@@ -118 +118 @@
    mat4 model_transform;
 
-   bool modified;
-
    // TODO: Figure out if I should make child classes that have these fields instead of putting them in the
    // parent class
@@ -133 +131 @@
 // Could probably use the same approach to make indices optional
 // Figure out if there are sufficient use cases to make either of these optional or is it fine to make
-// them mamdatory
+// them mandatory
 
 
@@ -189 +187 @@
 
       *reinterpret_cast<float*>(effectedFieldPtr) = startValue + (curTime - startTime) * changePerSecond;
-
-      objects[objectIndex].modified = true;
    }
 };
@@ -521 +517 @@
    }
 
-   objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f), false });
+   objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f) });
    objectBuffer.add(ssbo);