Changeset 06d959f in opengl-game

Timestamp:

Nov 27, 2019, 5:19:23 PM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

e1308e8

Parents:

0cf1a23

Message:

Add an addVertexNormals method to VulkanGame that calculates the normals given a list of vertices

Files:

• graphics-pipeline_vulkan.hpp (modified) (5 diffs)
• vulkan-game.hpp (modified) (3 diffs)

graphics-pipeline_vulkan.hpp

@@ -11 +11 @@
 
 #include "vulkan-utils.hpp"
-
-using namespace std;
 
 // TODO: Maybe change the name of this struct so I can call the list something other than descriptorInfoList
@@ -57 +55 @@
 
       const vector<SceneObject<VertexType>>& getObjects();
-      bool addObject(const vector<VertexType>& vertices, vector<uint16_t> indices, VkCommandPool commandPool,
+      void addObject(const vector<VertexType>& vertices, vector<uint16_t> indices, VkCommandPool commandPool,
          VkQueue graphicsQueue);
 
@@ -413 +411 @@
 
 template<class VertexType>
-bool GraphicsPipeline_Vulkan<VertexType>::addObject(const vector<VertexType>& vertices, vector<uint16_t> indices,
+void GraphicsPipeline_Vulkan<VertexType>::addObject(const vector<VertexType>& vertices, vector<uint16_t> indices,
       VkCommandPool commandPool, VkQueue graphicsQueue) {
 
@@ -426 +424 @@
       idx += numVertices;
    }
-   objects.push_back({vertices, indices });
+   objects.push_back({ vertices, indices });
 
    VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, vertices, vertexBuffer, numVertices,
@@ -435 +433 @@
       graphicsQueue);
    numIndices += indices.size();
-
-   return true;
 }
 

vulkan-game.hpp

@@ -32 +32 @@
    vec3 pos;
    vec3 color;
+   vec3 normal;
 };
 
@@ -158 +159 @@
       void createSyncObjects();
 
+      template<class VertexType>
+      vector<VertexType> addVertexNormals(vector<VertexType> vertices);
+
       template<class UniformType>
       void createUniformBuffers(vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
@@ -191 +195 @@
 }
 
+template<class VertexType>
+vector<VertexType> VulkanGame::addVertexNormals(vector<VertexType> vertices) {
+   for (unsigned int i = 0; i < vertices.size(); i += 3) {
+      vec3 p1 = vertices[i].pos;
+      vec3 p2 = vertices[i+1].pos;
+      vec3 p3 = vertices[i+2].pos;
+
+      vec3 normal = normalize(cross(p2 - p1, p3 - p1));
+      normal.z = -normal.z;
+
+      // Add the same normal for all 3 vertices
+      vertices[i].normal = normal;
+      vertices[i+1].normal = normal;
+      vertices[i+2].normal = normal;
+   }
+
+   return vertices;
+}
+
 #endif // _VULKAN_GAME_H