Changeset 2b40f48 in opengl-game

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

Files:

• graphics-pipeline_vulkan.hpp (modified) (1 diff)
• shaders/ship.vert (modified) (2 diffs)
• vulkan-game.cpp (modified) (3 diffs)
• vulkan-game.hpp (modified) (3 diffs)

graphics-pipeline_vulkan.hpp

@@ -88 +88 @@
       VkDeviceMemory indexBufferMemory;
 
+      // TODO: THe objects vector isn't used at all in this class, except in the method that returns
+      // the number of objects. Move this vector and the SceneObject declaration into VulkanGame, esp.
+      // since I'll be adding other // object-specific fields sich as transforms to SceneObject later
       vector<SceneObject<VertexType>> objects;
 

shaders/ship.vert

@@ -18 +18 @@
 layout(location = 1) in vec3 vertex_color;
 layout(location = 2) in vec3 vertex_normal;
-//layout(location = 3) in uint ubo_index;
+layout(location = 3) in uint obj_index;
 
 layout(location = 0) out vec3 position_eye;
@@ -33 +33 @@
 // Check Anton's book to see how to fix this
 void main() {
-   position_eye = vec3(ubo.view * sbo.objects[0].model * vec4(vertex_position, 1.0));
-   //position_eye = vec3(view * model_mats[ubo_index] * vec4(vertex_position, 1.0));
+   position_eye = vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_position, 1.0));
 
    // Using 0.0 instead of 1.0 means translations won't effect the normal
-   normal_eye = normalize(vec3(ubo.view * sbo.objects[0].model * vec4(vertex_normal, 0.0)));
-   //normal_eye = normalize(vec3(view * model_mats[ubo_index] * vec4(vertex_normal, 0.0)));
+   normal_eye = normalize(vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
    color = vertex_color;
    light_position_eye = vec3(ubo.view * vec4(light_position_world, 1.0));

vulkan-game.cpp

@@ -255 +255 @@
    shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ShipVertex::color));
    shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ShipVertex::normal));
+   shipPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&ShipVertex::objIndex));
 
    createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
@@ -269 +270 @@
    // the same data. Add an option to make some pipelines not use indexing
    /*
-   shipPipeline.addObject(addVertexNormals<ShipVertex>({
+   shipPipeline.addObject(
+      addObjectIndex<ShipVertex>(shipPipeline.getObjects().size(),
+      addVertexNormals<ShipVertex>({
          //back
          {{ -0.5f,   0.3f,   0.0f}, {0.0f, 0.0f, 0.3f}},
@@ -465 +468 @@
          {{  1.5f,   0.0f,   0.0f}, {0.0f, 0.0f, 0.3f}},
          {{  1.3f,   0.0f,  -0.3f}, {0.0f, 0.0f, 0.3f}},
-      }), {
+      })), {
            0,   1,   2,   3,   4,   5,
            6,   7,   8,   9,  10,  11,

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