Add vertex normals

Author: JoseEmilio-ARM

attachments/38_ray_tracing.cpp

@@ -54,27 +54,32 @@ struct Vertex {
     glm::vec3 pos;
     glm::vec3 color;
     glm::vec2 texCoord;
+    glm::vec3 normal;
 
     static vk::VertexInputBindingDescription getBindingDescription() {
         return { 0, sizeof(Vertex), vk::VertexInputRate::eVertex };
     }
 
-    static std::array<vk::VertexInputAttributeDescription, 3> getAttributeDescriptions() {
+    static std::array<vk::VertexInputAttributeDescription, 4> getAttributeDescriptions() {
         return {
             vk::VertexInputAttributeDescription( 0, 0, vk::Format::eR32G32B32Sfloat, offsetof(Vertex, pos) ),
             vk::VertexInputAttributeDescription( 1, 0, vk::Format::eR32G32B32Sfloat, offsetof(Vertex, color) ),
-            vk::VertexInputAttributeDescription( 2, 0, vk::Format::eR32G32Sfloat, offsetof(Vertex, texCoord) )
+            vk::VertexInputAttributeDescription( 2, 0, vk::Format::eR32G32Sfloat, offsetof(Vertex, texCoord) ),
+            vk::VertexInputAttributeDescription( 3, 0, vk::Format::eR32G32B32Sfloat, offsetof(Vertex, normal) )
         };
     }
 
     bool operator==(const Vertex& other) const {
-        return pos == other.pos && color == other.color && texCoord == other.texCoord;
+        return pos == other.pos && color == other.color && texCoord == other.texCoord && normal == other.normal;
     }
 };
 
 template<> struct std::hash<Vertex> {
     size_t operator()(Vertex const& vertex) const noexcept {
-        return ((hash<glm::vec3>()(vertex.pos) ^ (hash<glm::vec3>()(vertex.color) << 1)) >> 1) ^ (hash<glm::vec2>()(vertex.texCoord) << 1);
+        auto h = std::hash<glm::vec3>()(vertex.pos) ^ (std::hash<glm::vec3>()(vertex.color) << 1);
+        h = (h >> 1) ^ (std::hash<glm::vec2>()(vertex.texCoord) << 1);
+        h = (h >> 1) ^ (std::hash<glm::vec3>()(vertex.normal) << 1);
+        return h;
     }
 };
 
@@ -824,6 +829,16 @@ class HelloTriangleApplication {
 
                 vertex.color = {1.0f, 1.0f, 1.0f};
 
+                if (index.normal_index >= 0) {
+                    vertex.normal = {
+                        attrib.normals[3 * index.normal_index + 0],
+                        attrib.normals[3 * index.normal_index + 1],
+                        attrib.normals[3 * index.normal_index + 2]
+                    };
+                } else {
+                    vertex.normal = {0.0f, 0.0f, 0.0f};
+                }
+
                 if (!uniqueVertices.contains(vertex)) {
                     uniqueVertices[vertex] = static_cast<uint32_t>(vertices.size());
                     vertices.push_back(vertex);

attachments/38_ray_tracing.slang

@@ -2,6 +2,7 @@ struct VSInput {
     float3 inPosition;
     float3 inColor;
     float2 inTexCoord;
+    float3 inNormal;
 };
 
 struct UniformBuffer {
@@ -17,6 +18,7 @@ struct VSOutput
     float4 pos : SV_Position;
     float3 fragColor;
     float2 fragTexCoord;
+    float3 fragNormal;
 };
 
 [shader("vertex")]
@@ -25,6 +27,7 @@ VSOutput vertMain(VSInput input) {
     output.pos = mul(ubo.proj, mul(ubo.view, mul(ubo.model, float4(input.inPosition, 1.0))));
     output.fragColor = input.inColor;
     output.fragTexCoord = input.inTexCoord;
+    output.fragNormal = input.inNormal;
     return output;
 }