Project 4: Yan Dong

src/Blades.cpp

@@ -3,7 +3,7 @@
 #include "BufferUtils.h"
 
 float generateRandomFloat() {
-    return rand() / (float)RAND_MAX;
+    return rand() / (float)RAND_MAX;//32767
 }
 
 Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Model(device, commandPool, {}, {}) {
@@ -16,7 +16,7 @@ Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Mode
         glm::vec3 bladeUp(0.0f, 1.0f, 0.0f);
 
         // Generate positions and direction (v0)
-        float x = (generateRandomFloat() - 0.5f) * planeDim;
+        float x = (generateRandomFloat() - 0.5f) * planeDim;//15
         float y = 0.0f;
         float z = (generateRandomFloat() - 0.5f) * planeDim;
         float direction = generateRandomFloat() * 2.f * 3.14159265f;
@@ -44,9 +44,16 @@ Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Mode
     indirectDraw.firstVertex = 0;
     indirectDraw.firstInstance = 0;
 
-    BufferUtils::CreateBufferFromData(device, commandPool, blades.data(), NUM_BLADES * sizeof(Blade), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, bladesBuffer, bladesBufferMemory);
-    BufferUtils::CreateBuffer(device, NUM_BLADES * sizeof(Blade), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, culledBladesBuffer, culledBladesBufferMemory);
-    BufferUtils::CreateBufferFromData(device, commandPool, &indirectDraw, sizeof(BladeDrawIndirect), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT, numBladesBuffer, numBladesBufferMemory);
+    BufferUtils::CreateBufferFromData(device, commandPool, blades.data(), 
+		NUM_BLADES * sizeof(Blade), 
+		VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
+		bladesBuffer, bladesBufferMemory);
+    BufferUtils::CreateBuffer(device, NUM_BLADES * sizeof(Blade), 
+		VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, 
+		VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, culledBladesBuffer, culledBladesBufferMemory);
+    BufferUtils::CreateBufferFromData(device, commandPool, &indirectDraw, sizeof(BladeDrawIndirect), 
+		VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT, 
+		numBladesBuffer, numBladesBufferMemory);
 }
 
 VkBuffer Blades::GetBladesBuffer() const {
@@ -61,6 +68,8 @@ VkBuffer Blades::GetNumBladesBuffer() const {
     return numBladesBuffer;
 }
 
+//GPU Memory
+//CPU Buffer
 Blades::~Blades() {
     vkDestroyBuffer(device->GetVkDevice(), bladesBuffer, nullptr);
     vkFreeMemory(device->GetVkDevice(), bladesBufferMemory, nullptr);

src/Camera.cpp

@@ -9,40 +9,43 @@
 #include "BufferUtils.h"
 
 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, 1.0f, 10.0f), glm::vec3(0.0f, 1.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));
+	r = 10.0f;
+	theta = 0.0f;
+	phi = 0.0f;
+	cameraBufferObject.viewMatrix = glm::lookAt(glm::vec3(0.0f, 1.0f, 10.0f), glm::vec3(0.0f, 1.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
+	//update pos
+	cameraBufferObject.pos = glm::vec3(-cameraBufferObject.viewMatrix[3][0], -cameraBufferObject.viewMatrix[3][1], -cameraBufferObject.viewMatrix[3][2]);
+
+	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));
 }
 
 VkBuffer Camera::GetBuffer() const {
-    return buffer;
+	return buffer;
 }
 
 void Camera::UpdateOrbit(float deltaX, float deltaY, float deltaZ) {
-    theta += deltaX;
-    phi += deltaY;
-    r = glm::clamp(r - deltaZ, 1.0f, 50.0f);
+	theta += deltaX;
+	phi += deltaY;
+	r = glm::clamp(r - deltaZ, 1.0f, 50.0f);
 
-    float radTheta = glm::radians(theta);
-    float radPhi = glm::radians(phi);
+	float radTheta = glm::radians(theta);
+	float radPhi = glm::radians(phi);
 
-    glm::mat4 rotation = glm::rotate(glm::mat4(1.0f), radTheta, glm::vec3(0.0f, 1.0f, 0.0f)) * glm::rotate(glm::mat4(1.0f), radPhi, glm::vec3(1.0f, 0.0f, 0.0f));
-    glm::mat4 finalTransform = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f)) * rotation * glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 1.0f, r));
+	glm::mat4 rotation = glm::rotate(glm::mat4(1.0f), radTheta, glm::vec3(0.0f, 1.0f, 0.0f)) * glm::rotate(glm::mat4(1.0f), radPhi, glm::vec3(1.0f, 0.0f, 0.0f));
+	glm::mat4 finalTransform = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f)) * rotation * glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 1.0f, r));
+	cameraBufferObject.viewMatrix = glm::inverse(finalTransform);
+	//update pos
+	cameraBufferObject.pos = glm::vec3(-cameraBufferObject.viewMatrix[3][0], -cameraBufferObject.viewMatrix[3][1], -cameraBufferObject.viewMatrix[3][2]);
 
-    cameraBufferObject.viewMatrix = glm::inverse(finalTransform);
-
-    memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
+	memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
 }
 
 Camera::~Camera() {
-  vkUnmapMemory(device->GetVkDevice(), bufferMemory);
-  vkDestroyBuffer(device->GetVkDevice(), buffer, nullptr);
-  vkFreeMemory(device->GetVkDevice(), bufferMemory, nullptr);
+	vkUnmapMemory(device->GetVkDevice(), bufferMemory);
+	vkDestroyBuffer(device->GetVkDevice(), buffer, nullptr);
+	vkFreeMemory(device->GetVkDevice(), bufferMemory, nullptr);
 }

src/Camera.h

@@ -5,28 +5,29 @@
 #include "Device.h"
 
 struct CameraBufferObject {
-  glm::mat4 viewMatrix;
-  glm::mat4 projectionMatrix;
+	glm::mat4 viewMatrix;
+	glm::mat4 projectionMatrix;
+	glm::vec3 pos;
 };
 
 class Camera {
 private:
-    Device* device;
-
-    CameraBufferObject cameraBufferObject;
-
-    VkBuffer buffer;
-    VkDeviceMemory bufferMemory;
+	Device* device;
 
-    void* mappedData;
+	CameraBufferObject cameraBufferObject;
 
-    float r, theta, phi;
+	VkBuffer buffer;
+	VkDeviceMemory bufferMemory;
+
+	void* mappedData;
+
+	float r, theta, phi;
 
 public:
-    Camera(Device* device, float aspectRatio);
-    ~Camera();
+	Camera(Device* device, float aspectRatio);
+	~Camera();
+
+	VkBuffer GetBuffer() const;
 
-    VkBuffer GetBuffer() const;
-
-    void UpdateOrbit(float deltaX, float deltaY, float deltaZ);
+	void UpdateOrbit(float deltaX, float deltaY, float deltaZ);
 };