Changeset 90880fb in opengl-game for vulkan-game.hpp

Timestamp:

Jun 17, 2021, 11:59:14 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

2f4ff8c

Parents:

5ea0a37

git-author:

Dmitry Portnoy <dportnoy@…> (06/13/21 23:57:17)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/17/21 23:59:14)

Message:

Start using the VulkanBuffer class for the non-per-object uniforms (this means the view and projection matrices for all pipelines, as well as the current time for the explosion pipeline)

File:

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

vulkan-game.hpp

@@ -311 +311 @@
       GraphicsPipeline_Vulkan<ExplosionVertex> explosionPipeline;
 
+      BufferSet uniformBuffers_modelPipeline;
       BufferSet storageBuffers_modelPipeline;
+
+      VulkanBuffer<UBO_VP_mats> vp_mats_modelPipeline;
       VulkanBuffer<SSBO_ModelObject> objects_modelPipeline;
-      BufferSet uniformBuffers_modelPipeline;
-
+
+      BufferSet uniformBuffers_shipPipeline;
       BufferSet storageBuffers_shipPipeline;
+
+      VulkanBuffer<UBO_VP_mats> vp_mats_shipPipeline;
       VulkanBuffer<SSBO_ModelObject> objects_shipPipeline;
-      BufferSet uniformBuffers_shipPipeline;
-
+
+      BufferSet uniformBuffers_asteroidPipeline;
       BufferSet storageBuffers_asteroidPipeline;
+
+      VulkanBuffer<UBO_VP_mats> vp_mats_asteroidPipeline;
       VulkanBuffer<SSBO_Asteroid> objects_asteroidPipeline;
-      BufferSet uniformBuffers_asteroidPipeline;
-
+
+      BufferSet uniformBuffers_laserPipeline;
       BufferSet storageBuffers_laserPipeline;
+
+      VulkanBuffer<UBO_VP_mats> vp_mats_laserPipeline;
       VulkanBuffer<SSBO_Laser> objects_laserPipeline;
-      BufferSet uniformBuffers_laserPipeline;
-
+
+      BufferSet uniformBuffers_explosionPipeline;
       BufferSet storageBuffers_explosionPipeline;
+
+      VulkanBuffer<UBO_Explosion> uniforms_explosionPipeline;
       VulkanBuffer<SSBO_Explosion> objects_explosionPipeline;
-      BufferSet uniformBuffers_explosionPipeline;
 
       // TODO: Maybe make the ubo objects part of the pipeline class since there's only one ubo
@@ -340 +350 @@
 
       vector<SceneObject<ModelVertex>> modelObjects;
-
-      UBO_VP_mats object_VP_mats;
-
       vector<SceneObject<ModelVertex>> shipObjects;
-
-      UBO_VP_mats ship_VP_mats;
-
       vector<SceneObject<ModelVertex>> asteroidObjects;
-
-      UBO_VP_mats asteroid_VP_mats;
-
       vector<SceneObject<LaserVertex>> laserObjects;
-
-      UBO_VP_mats laser_VP_mats;
-
       vector<SceneObject<ExplosionVertex>> explosionObjects;
 
-      UBO_Explosion explosion_UBO;
+      //UBO_Explosion explosion_UBO;
 
       vector<BaseEffectOverTime*> effects;