Changeset 8d92284 in opengl-game for vulkan-game.hpp

Timestamp:

Apr 10, 2021, 1:31:20 AM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

b8efa56

Parents:

a00eb06

Message:

In VulkanGame, change the ship pipeline to use ModelVertex

File:

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

vulkan-game.hpp

@@ -47 +47 @@
    vec3 color;
    vec2 texCoord;
-   vec3 normal;
-   unsigned int objIndex;
-};
-
-struct ShipVertex {
-   vec3 pos;
-   vec3 color;
    vec3 normal;
    unsigned int objIndex;
@@ -309 +302 @@
       // wouldn't work since the whole pipeline couldn't have a common set of descriptors for the textures
       GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> modelPipeline;
-      GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject> shipPipeline;
+      GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> shipPipeline;
       GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
       GraphicsPipeline_Vulkan<LaserVertex, SSBO_Laser> laserPipeline;
@@ -330 +323 @@
       UBO_VP_mats object_VP_mats;
 
-      vector<SceneObject<ShipVertex, SSBO_ModelObject>> shipObjects;
+      vector<SceneObject<ModelVertex, SSBO_ModelObject>> shipObjects;
 
       vector<VkBuffer> uniformBuffers_shipPipeline;