Project 6: Mauricio Mutai

src/Blades.cpp

@@ -9,7 +9,7 @@ float generateRandomFloat() {
 Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Model(device, commandPool, {}, {}) {
     std::vector<Blade> blades;
     blades.reserve(NUM_BLADES);
-
+    //srand(123);
     for (int i = 0; i < NUM_BLADES; i++) {
         Blade currentBlade = Blade();
 
@@ -35,6 +35,9 @@ Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Mode
         float stiffness = MIN_BEND + (generateRandomFloat() * (MAX_BEND - MIN_BEND));
         currentBlade.up = glm::vec4(bladeUp, stiffness);
 
+        // custom color
+        currentBlade.color = glm::vec4(1.0f);
+
         blades.push_back(currentBlade);
     }
 

src/Blades.h

@@ -4,7 +4,7 @@
 #include <array>
 #include "Model.h"
 
-constexpr static unsigned int NUM_BLADES = 1 << 13;
+constexpr static unsigned int NUM_BLADES = 1 << 15;
 constexpr static float MIN_HEIGHT = 1.3f;
 constexpr static float MAX_HEIGHT = 2.5f;
 constexpr static float MIN_WIDTH = 0.1f;
@@ -21,6 +21,8 @@ struct Blade {
     glm::vec4 v2;
     // Up vector and stiffness coefficient
     glm::vec4 up;
+    // special vec4 for custom colors: .xyz is RGB, .w is whether to use this color
+    glm::vec4 color;
 
     static VkVertexInputBindingDescription getBindingDescription() {
         VkVertexInputBindingDescription bindingDescription = {};
@@ -31,8 +33,8 @@ struct Blade {
         return bindingDescription;
     }
 
-    static std::array<VkVertexInputAttributeDescription, 4> getAttributeDescriptions() {
-        std::array<VkVertexInputAttributeDescription, 4> attributeDescriptions = {};
+    static std::array<VkVertexInputAttributeDescription, 5> getAttributeDescriptions() {
+        std::array<VkVertexInputAttributeDescription, 5> attributeDescriptions = {};
 
         // v0
         attributeDescriptions[0].binding = 0;
@@ -58,6 +60,12 @@ struct Blade {
         attributeDescriptions[3].format = VK_FORMAT_R32G32B32A32_SFLOAT;
         attributeDescriptions[3].offset = offsetof(Blade, up);
 
+        // color
+        attributeDescriptions[4].binding = 0;
+        attributeDescriptions[4].location = 4;
+        attributeDescriptions[4].format = VK_FORMAT_R32G32B32A32_SFLOAT;
+        attributeDescriptions[4].offset = offsetof(Blade, color);
+
         return attributeDescriptions;
     }
 };

src/BufferUtils.cpp

@@ -79,7 +79,8 @@ void BufferUtils::CreateBufferFromData(Device* device, VkCommandPool commandPool
     vkUnmapMemory(device->GetVkDevice(), stagingBufferMemory);
 
     // Create the buffer
-    VkBufferUsageFlags usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | bufferUsage;
+    // for reading stuff, has to be SRC as well
+    VkBufferUsageFlags usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | bufferUsage;
     VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
     BufferUtils::CreateBuffer(device, bufferSize, usage, flags, buffer, bufferMemory);
 

src/Camera.cpp

@@ -5,9 +5,39 @@
 #define GLM_FORCE_DEPTH_ZERO_TO_ONE
 #include <glm/gtc/matrix_transform.hpp>
 
+#define FRUSTUM_CULL_TEST 0
+#define WIND_GIF_CAMERA 0
+
 #include "Camera.h"
 #include "BufferUtils.h"
 
+#if FRUSTUM_CULL_TEST
+Camera::Camera(Device* device, float aspectRatio) : device(device) {
+    r = 2.0f;
+    theta = 0.0f;
+    phi = 0.0f;
+    cameraBufferObject.viewMatrix = glm::lookAt(glm::vec3(0.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
+    cameraBufferObject.projectionMatrix = glm::perspective(glm::radians(45.0f), aspectRatio, 0.1f, 100.0f);
+    cameraBufferObject.projectionMatrix[1][1] *= -1; // y-coordinate is flipped
+
+    BufferUtils::CreateBuffer(device, sizeof(CameraBufferObject), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, buffer, bufferMemory);
+    vkMapMemory(device->GetVkDevice(), bufferMemory, 0, sizeof(CameraBufferObject), 0, &mappedData);
+    memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
+}
+#elif WIND_GIF_CAMERA
+Camera::Camera(Device* device, float aspectRatio) : device(device) {
+    r = 10.0f;
+    theta = 0.0f;
+    phi = 0.0f;
+    cameraBufferObject.viewMatrix = glm::lookAt(glm::vec3(0.0f, 13.0f, 19.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
+    cameraBufferObject.projectionMatrix = glm::perspective(glm::radians(45.0f), aspectRatio, 0.1f, 100.0f);
+    cameraBufferObject.projectionMatrix[1][1] *= -1; // y-coordinate is flipped
+
+    BufferUtils::CreateBuffer(device, sizeof(CameraBufferObject), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, buffer, bufferMemory);
+    vkMapMemory(device->GetVkDevice(), bufferMemory, 0, sizeof(CameraBufferObject), 0, &mappedData);
+    memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
+}
+#else
 Camera::Camera(Device* device, float aspectRatio) : device(device) {
     r = 10.0f;
     theta = 0.0f;
@@ -20,6 +50,8 @@ Camera::Camera(Device* device, float aspectRatio) : device(device) {
     vkMapMemory(device->GetVkDevice(), bufferMemory, 0, sizeof(CameraBufferObject), 0, &mappedData);
     memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
 }
+#endif // FRUSTUM_CULL_TEST
+
 
 VkBuffer Camera::GetBuffer() const {
     return buffer;