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

Timestamp:

Jan 16, 2020, 4:20:37 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

4ece3bf

Parents:

0fe8433

Message:

In VulkanGame, add the asteroid shader pipeline and start implementing asteroids flying at the player from the top of the screen

File:

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

vulkan-game.hpp

@@ -40 +40 @@
 };
 
+struct AsteroidVertex {
+   vec3 pos;
+   vec3 color;
+   vec3 normal;
+   unsigned int objIndex;
+};
+
 // 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
@@ -58 +65 @@
 struct SBO_SceneObject {
    alignas(16) mat4 model;
+};
+
+struct SBO_Asteroid {
+   alignas(16) mat4 model;
+   alignas(4) float hp;
 };
 
@@ -130 +142 @@
       // variables to better reflect the data they hold
 
+      // TODO: Create a struct that holds the buffers, memory, and info objects (Probably in VulkanUtils)
+
       GraphicsPipeline_Vulkan<OverlayVertex> overlayPipeline;
 
@@ -142 +156 @@
       vector<VkBuffer> uniformBuffers_scenePipeline;
       vector<VkDeviceMemory> uniformBuffersMemory_scenePipeline;
-
       vector<VkDescriptorBufferInfo> uniformBufferInfoList_scenePipeline;
 
       vector<VkBuffer> storageBuffers_scenePipeline;
       vector<VkDeviceMemory> storageBuffersMemory_scenePipeline;
-
       vector<VkDescriptorBufferInfo> storageBufferInfoList_scenePipeline;
 
@@ -159 +171 @@
       vector<VkBuffer> uniformBuffers_shipPipeline;
       vector<VkDeviceMemory> uniformBuffersMemory_shipPipeline;
-
       vector<VkDescriptorBufferInfo> uniformBufferInfoList_shipPipeline;
 
       vector<VkBuffer> storageBuffers_shipPipeline;
       vector<VkDeviceMemory> storageBuffersMemory_shipPipeline;
-
       vector<VkDescriptorBufferInfo> storageBufferInfoList_shipPipeline;
 
       UBO_VP_mats ship_VP_mats;
       SBO_SceneObject so_Ship;
+
+      GraphicsPipeline_Vulkan<AsteroidVertex> asteroidPipeline;
+
+      vector<SceneObject<AsteroidVertex>> asteroidObjects;
+
+      vector<VkBuffer> uniformBuffers_asteroidPipeline;
+      vector<VkDeviceMemory> uniformBuffersMemory_asteroidPipeline;
+      vector<VkDescriptorBufferInfo> uniformBufferInfoList_asteroidPipeline;
+
+      vector<VkBuffer> storageBuffers_asteroidPipeline;
+      vector<VkDeviceMemory> storageBuffersMemory_asteroidPipeline;
+      vector<VkDescriptorBufferInfo> storageBufferInfoList_asteroidPipeline;
+
+      UBO_VP_mats asteroid_VP_mats;
+      SBO_Asteroid so_Asteroid;
 
       bool initWindow(int width, int height, unsigned char guiFlags);