Project 6: Xiao Zhang

src/Blades.cpp

@@ -19,7 +19,7 @@ Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Mode
         float x = (generateRandomFloat() - 0.5f) * planeDim;
         float y = 0.0f;
         float z = (generateRandomFloat() - 0.5f) * planeDim;
-        float direction = generateRandomFloat() * 2.f * 3.14159265f;
+		float direction = generateRandomFloat() * 2.f * 3.14159265f;
         glm::vec3 bladePosition(x, y, z);
         currentBlade.v0 = glm::vec4(bladePosition, direction);
 
@@ -45,8 +45,9 @@ Blades::Blades(Device* device, VkCommandPool commandPool, float planeDim) : Mode
     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::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);
+	BufferUtils::CreateBuffer(device, BUCKET_COUNT * sizeof(uint32_t), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bucketBladeCounts, bucketBladeCountsMemory);
 }
 
 VkBuffer Blades::GetBladesBuffer() const {
@@ -61,6 +62,10 @@ VkBuffer Blades::GetNumBladesBuffer() const {
     return numBladesBuffer;
 }
 
+VkBuffer Blades::GetBucketBladeCounts() const {
+	return bucketBladeCounts;
+}
+
 Blades::~Blades() {
     vkDestroyBuffer(device->GetVkDevice(), bladesBuffer, nullptr);
     vkFreeMemory(device->GetVkDevice(), bladesBufferMemory, nullptr);

src/Blades.h

@@ -5,6 +5,7 @@
 #include "Model.h"
 
 constexpr static unsigned int NUM_BLADES = 1 << 13;
+static constexpr unsigned int BUCKET_COUNT = 50;//not used
 constexpr static float MIN_HEIGHT = 1.3f;
 constexpr static float MAX_HEIGHT = 2.5f;
 constexpr static float MIN_WIDTH = 0.1f;
@@ -74,15 +75,18 @@ class Blades : public Model {
     VkBuffer bladesBuffer;
     VkBuffer culledBladesBuffer;
     VkBuffer numBladesBuffer;
+	VkBuffer bucketBladeCounts;
 
     VkDeviceMemory bladesBufferMemory;
     VkDeviceMemory culledBladesBufferMemory;
     VkDeviceMemory numBladesBufferMemory;
+	VkDeviceMemory bucketBladeCountsMemory;
 
 public:
     Blades(Device* device, VkCommandPool commandPool, float planeDim);
     VkBuffer GetBladesBuffer() const;
     VkBuffer GetCulledBladesBuffer() const;
     VkBuffer GetNumBladesBuffer() const;
+	VkBuffer GetBucketBladeCounts() const;
     ~Blades();
 };

src/Camera.cpp

@@ -41,6 +41,39 @@ void Camera::UpdateOrbit(float deltaX, float deltaY, float deltaZ) {
     memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
 }
 
+void Camera::SetOrientationCullingEnabled(float mode)
+{
+	cameraBufferObject.orientationCullingEnabled = mode;
+	memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
+}
+
+void Camera::SetFrustumCullingEnabled(float mode)
+{
+	cameraBufferObject.frustumCullingEnabled = mode;
+	memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
+}
+
+void Camera::SetDistanceCullingEnabled(float mode)
+{
+	cameraBufferObject.distanceCullingEnabled = mode;
+	memcpy(mappedData, &cameraBufferObject, sizeof(CameraBufferObject));
+}
+
+float Camera::IsOrientationCullingEnabled()
+{
+	return cameraBufferObject.orientationCullingEnabled;
+}
+
+float Camera::IsFrustumCullingEnabled()
+{
+	return cameraBufferObject.frustumCullingEnabled;
+}
+
+float Camera::IsDistanceCullingEnabled()
+{
+	return cameraBufferObject.distanceCullingEnabled;
+}
+
 Camera::~Camera() {
   vkUnmapMemory(device->GetVkDevice(), bufferMemory);
   vkDestroyBuffer(device->GetVkDevice(), buffer, nullptr);

src/Camera.h

@@ -5,8 +5,18 @@
 #include "Device.h"
 
 struct CameraBufferObject {
+	CameraBufferObject()
+	{
+		orientationCullingEnabled = -1;
+		frustumCullingEnabled = -1;
+		distanceCullingEnabled = -1;
+	}
+
   glm::mat4 viewMatrix;
   glm::mat4 projectionMatrix;
+  float orientationCullingEnabled;
+  float frustumCullingEnabled;
+  float distanceCullingEnabled;
 };
 
 class Camera {
@@ -20,13 +30,21 @@ class Camera {
 
     void* mappedData;
 
-    float r, theta, phi;
 
 public:
+    float r, theta, phi;
     Camera(Device* device, float aspectRatio);
     ~Camera();
 
     VkBuffer GetBuffer() const;
+
+	void SetOrientationCullingEnabled(float mode);
+	void SetFrustumCullingEnabled(float mode);
+	void SetDistanceCullingEnabled(float mode);
+
+	float IsOrientationCullingEnabled();
+	float IsFrustumCullingEnabled();
+	float IsDistanceCullingEnabled();
 
     void UpdateOrbit(float deltaX, float deltaY, float deltaZ);
 };