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

Timestamp:

Feb 19, 2020, 4:47:41 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

3b84bb6

Parents:

860a0da

Message:

In VulkanGame, move the logic of updating per-object data in the SSBO into GraphicsPipeline_Vulkan and remove the SSBO properties from VulkanGame

File:

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

vulkan-game.hpp

@@ -75 +75 @@
 };
 
+// Have to figure out how to include an optional ssbo parameter for each object
+// Could probably use the same approach to make indices optional
+
 class VulkanGame {
    public:
@@ -158 +161 @@
 
       UBO_VP_mats object_VP_mats;
-      SSBO_ModelObject so_Object;
 
       GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject> shipPipeline;
@@ -168 +170 @@
 
       UBO_VP_mats ship_VP_mats;
-      SSBO_ModelObject so_Ship;
 
       GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
@@ -178 +179 @@
 
       UBO_VP_mats asteroid_VP_mats;
-      SSBO_Asteroid so_Asteroid;
 
       Uint64 curTime, prevTime;
@@ -219 +219 @@
          const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo);
 
+      template<class VertexType, class SSBOType>
+      void updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
+         GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline, size_t index);
+
       template<class VertexType>
       vector<VertexType> addVertexNormals(vector<VertexType> vertices);
@@ -227 +231 @@
       template<class VertexType>
       vector<VertexType> centerObject(vector<VertexType> vertices);
-
-      template<class VertexType, class SSBOType>
-      void transformObject(SceneObject<VertexType, SSBOType>& obj, mat4 mat);
 
       void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
@@ -258 +259 @@
 
    pipeline.addVertices(vertices, indices, commandPool, graphicsQueue);
+}
+
+template<class VertexType, class SSBOType>
+void VulkanGame::updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
+      GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline, size_t index) {
+   SceneObject<VertexType, SSBOType>& obj = objects[index];
+
+   obj.ssbo.model = obj.model_transform * obj.model_base;
+
+   // could probably re-calculate the object center here based on model
+   // I think the center should be calculated by using model * vec3(0, 0, 0)
+   // model_base is currently only used to set the original location of the ship and asteroids
+
+   pipeline.updateObject(index, obj.ssbo);
 }
 
@@ -326 +341 @@
 }
 
-template<class VertexType, class SSBOType>
-void VulkanGame::transformObject(SceneObject<VertexType, SSBOType>& obj, mat4 mat) {
-   obj.model_transform = mat * obj.model_transform;
-}
-
 #endif // _VULKAN_GAME_H