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

Timestamp:

Dec 5, 2019, 5:48:59 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

7c929fc

Parents:

785333b (diff), cf727ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into hotfix/ship-shader-lights

File:

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

vulkan-game.hpp

@@ -33 +33 @@
    vec3 color;
    vec3 normal;
+   unsigned int objIndex;
 };
 
@@ -178 +179 @@
       vector<VertexType> addVertexNormals(vector<VertexType> vertices);
 
+      template<class VertexType>
+      vector<VertexType> addObjectIndex(unsigned int objIndex, vector<VertexType> vertices);
+
       void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
          vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory, vector<VkDescriptorBufferInfo>& bufferInfoList);
@@ -211 +215 @@
 }
 
+template<class VertexType>
+vector<VertexType> VulkanGame::addObjectIndex(unsigned int objIndex, vector<VertexType> vertices) {
+   for (VertexType& vertex : vertices) {
+      vertex.objIndex = objIndex;
+   }
+
+   return vertices;
+}
+
 #endif // _VULKAN_GAME_H