Changeset 2d87297 in opengl-game for vulkan-game.hpp

Timestamp:

Feb 16, 2020, 8:22:40 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

d25381b

Parents:

5a1ace0

Message:

In VulkanGame, add an ssbo field to SceneObject to hold per-object ssbo info, and add a new SSBOType template parameter to SceneObject and GraphicsPipeline_Vulkan

File:

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

vulkan-game.hpp

@@ -50 +50 @@
 // TODO: Change the index type to uint32_t and check the Vulkan Tutorial loading model section as a reference
 // TODO: Create a typedef for index type so I can easily change uin16_t to something else later
-template<class VertexType>
+template<class VertexType, class SSBOType>
 struct SceneObject {
    vector<VertexType> vertices;
    vector<uint16_t> indices;
+   SSBOType ssbo;
 
    mat4 model_base;
@@ -64 +65 @@
 };
 
-struct SBO_SceneObject {
+struct SSBO_ModelObject {
    alignas(16) mat4 model;
 };
 
-struct SBO_Asteroid {
+struct SSBO_Asteroid {
    alignas(16) mat4 model;
    alignas(4) float hp;
@@ -146 +147 @@
       // TODO: Create a struct that holds the buffers, memory, and info objects (Probably in VulkanUtils)
 
-      GraphicsPipeline_Vulkan<OverlayVertex> overlayPipeline;
-
-      vector<SceneObject<OverlayVertex>> overlayObjects;
+      GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;
+
+      vector<SceneObject<OverlayVertex, void*>> overlayObjects;
 
       // TODO: Rename all the variables related to modelPipeline to use the same pipelie name
 
-      GraphicsPipeline_Vulkan<ModelVertex> modelPipeline;
-
-      vector<SceneObject<ModelVertex>> modelObjects;
+      GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> modelPipeline;
+
+      vector<SceneObject<ModelVertex, SSBO_ModelObject>> modelObjects;
 
       vector<VkBuffer> uniformBuffers_scenePipeline;
@@ -165 +166 @@
 
       UBO_VP_mats object_VP_mats;
-      SBO_SceneObject so_Object;
-
-      GraphicsPipeline_Vulkan<ShipVertex> shipPipeline;
-
-      vector<SceneObject<ShipVertex>> shipObjects;
+      SSBO_ModelObject so_Object;
+
+      GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject> shipPipeline;
+
+      vector<SceneObject<ShipVertex, SSBO_ModelObject>> shipObjects;
 
       vector<VkBuffer> uniformBuffers_shipPipeline;
@@ -180 +181 @@
 
       UBO_VP_mats ship_VP_mats;
-      SBO_SceneObject so_Ship;
-
-      GraphicsPipeline_Vulkan<AsteroidVertex> asteroidPipeline;
-
-      vector<SceneObject<AsteroidVertex>> asteroidObjects;
+      SSBO_ModelObject so_Ship;
+
+      GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
+
+      vector<SceneObject<AsteroidVertex, SSBO_Asteroid>> asteroidObjects;
 
       vector<VkBuffer> uniformBuffers_asteroidPipeline;
@@ -195 +196 @@
 
       UBO_VP_mats asteroid_VP_mats;
-      SBO_Asteroid so_Asteroid;
+      SSBO_Asteroid so_Asteroid;
 
       Uint64 curTime, prevTime;
@@ -231 +232 @@
       void createSyncObjects();
 
-      template<class VertexType>
-      void addObject(vector<SceneObject<VertexType>>& objects, GraphicsPipeline_Vulkan<VertexType>& pipeline,
-         const vector<VertexType>& vertices, vector<uint16_t> indices);
+      template<class VertexType, class SSBOType>
+      void addObject(vector<SceneObject<VertexType, SSBOType>>& objects,
+         GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
+         const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo);
 
       template<class VertexType>
@@ -244 +246 @@
       vector<VertexType> centerObject(vector<VertexType> vertices);
 
-      template<class VertexType>
-      void transformObject(SceneObject<VertexType>& obj, mat4 mat);
+      template<class VertexType, class SSBOType>
+      void transformObject(SceneObject<VertexType, SSBOType>& obj, mat4 mat);
 
       void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
@@ -261 +263 @@
 };
 
-template<class VertexType>
-void VulkanGame::addObject(vector<SceneObject<VertexType>>& objects, GraphicsPipeline_Vulkan<VertexType>& pipeline,
-      const vector<VertexType>& vertices, vector<uint16_t> indices) {
+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) {
    size_t numVertices = pipeline.getNumVertices();
 
@@ -270 +273 @@
    }
 
-   objects.push_back({ vertices, indices, mat4(1.0f), mat4(1.0f) });
+   objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f) });
 
    pipeline.addVertices(vertices, indices, commandPool, graphicsQueue);
@@ -341 +344 @@
 }
 
-template<class VertexType>
-void VulkanGame::transformObject(SceneObject<VertexType>& obj, mat4 mat) {
+template<class VertexType, class SSBOType>
+void VulkanGame::transformObject(SceneObject<VertexType, SSBOType>& obj, mat4 mat) {
    obj.model_transform = mat * obj.model_transform;
 }