Changeset 3b84bb6 in opengl-game for vulkan-game.hpp

Timestamp:

Feb 25, 2020, 6:51:02 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

44f23af

Parents:

2da64ef

Message:

In VulkanGame, call centerObject() on all objects when they are created and move that call inside VulkanGame::addObject(), rename GraphicsPipeline_Vulkan::addVertices() to addObject, add start adding generic support for objects to be added after pipeline creation is complete

File:

• vulkan-game.hpp (modified) (8 diffs)

vulkan-game.hpp

@@ -58 +58 @@
    mat4 model_base;
    mat4 model_transform;
+   vec3 center;
+   float radius;
 };
 
@@ -217 +219 @@
       void addObject(vector<SceneObject<VertexType, SSBOType>>& objects,
          GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
-         const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo);
+         const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo,
+         bool pipelinesCreated);
 
       template<class VertexType, class SSBOType>
@@ -229 +232 @@
       vector<VertexType> addObjectIndex(unsigned int objIndex, vector<VertexType> vertices);
 
-      template<class VertexType>
-      vector<VertexType> centerObject(vector<VertexType> vertices);
+      template<class VertexType, class SSBOType>
+      void centerObject(SceneObject<VertexType, SSBOType>& object);
 
       void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
@@ -246 +249 @@
 };
 
+// TODO: Right now, it's basically necessary to pass the identity matrix in for ssbo.model
+// and to change the model matrix later by setting model_transform and then calling updateObject()
+// Figure out a better way to allow the model matrix to be set during objecting creation
 template<class VertexType, class SSBOType>
 void VulkanGame::addObject(vector<SceneObject<VertexType, SSBOType>>& objects,
       GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
-      const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo) {
+      const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo,
+      bool pipelinesCreated) {
    size_t numVertices = pipeline.getNumVertices();
 
@@ -257 +264 @@
 
    objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f) });
-
-   pipeline.addVertices(vertices, indices, commandPool, graphicsQueue);
+   centerObject(objects.back());
+
+   bool storageBufferResized = pipeline.addObject(vertices, indices, ssbo, commandPool, graphicsQueue);
+
+   if (pipelinesCreated) {
+      if (storageBufferResized) {
+      }
+
+      createCommandBuffers();
+   }
 }
 
@@ -302 +317 @@
 }
 
-template<class VertexType>
-vector<VertexType> VulkanGame::centerObject(vector<VertexType> vertices) {
+template<class VertexType, class SSBOType>
+void VulkanGame::centerObject(SceneObject<VertexType, SSBOType>& object) {
+   vector<VertexType>& vertices = object.vertices;
+
    float min_x = vertices[0].pos.x;
    float max_x = vertices[0].pos.x;
@@ -313 +330 @@
    // start from the second point
    for (unsigned int i = 1; i < vertices.size(); i++) {
-      if (min_x > vertices[i].pos.x) {
-         min_x = vertices[i].pos.x;
-      } else if (max_x < vertices[i].pos.x) {
-         max_x = vertices[i].pos.x;
+      vec3& pos = vertices[i].pos;
+
+      if (min_x > pos.x) {
+         min_x = pos.x;
+      } else if (max_x < pos.x) {
+         max_x = pos.x;
       }
 
-      if (min_y > vertices[i].pos.y) {
-         min_y = vertices[i].pos.y;
-      } else if (max_y < vertices[i].pos.y) {
-         max_y = vertices[i].pos.y;
+      if (min_y > pos.y) {
+         min_y = pos.y;
+      } else if (max_y < pos.y) {
+         max_y = pos.y;
       }
 
-      if (min_z > vertices[i].pos.z) {
-         min_z = vertices[i].pos.z;
-      } else if (max_z < vertices[i].pos.z) {
-         max_z = vertices[i].pos.z;
+      if (min_z > pos.z) {
+         min_z = pos.z;
+      } else if (max_z < pos.z) {
+         max_z = pos.z;
       }
    }
@@ -338 +357 @@
    }
 
-   return vertices;
+   object.radius = std::max(center.x, center.y);
+   object.radius = std::max(object.radius, center.z);
+   object.center = vec3(0.0f, 0.0f, 0.0f);
 }