code cleanup

include/application.hpp

@@ -26,19 +26,33 @@ using std::vector;
 using std::optional;
 
 class SoftBody;
+
 class Instance;
+
 class Swapchain;
+
 class GraphicsPipeline;
+
 class Buffer;
+
 class Buffer;
+
 class CommandPool;
+
 class Image;
+
 class ComputePipeline;
+
 class Fence;
+
 class Semaphore;
+
 class Camera;
+
 class DescriptorPool;
+
 class Grabber;
+
 struct SizesUniformData;
 
 class Application {

include/constraints.hpp

@@ -62,20 +62,24 @@ private:
 
 struct Constraint {
 	virtual ~Constraint() {}
+
 	virtual void writeData(ConstraintData &dataLists) const {};
 };
 
 struct DistanceConstraint : Edge, Constraint {
 	explicit DistanceConstraint(const Edge &edge) : Edge(edge) {}
+
 	void writeData(ConstraintData &dataLists) const override;
 };
 
 struct AreaConstraint : Triangle, Constraint {
 	explicit AreaConstraint(const Triangle &triangle) : Triangle(triangle) {}
+
 	void writeData(ConstraintData &dataLists) const override;
 };
 
 struct VolumeConstraint : Tetrahedron, Constraint {
 	explicit VolumeConstraint(const Tetrahedron &tetrahedron) : Tetrahedron(tetrahedron) {}
+
 	void writeData(ConstraintData &dataLists) const override;
 };

include/input.hpp

@@ -6,6 +6,7 @@
 #include "glm/vec2.hpp"
 
 class Listener;
+
 class MouseListener;
 
 class Input {
@@ -42,6 +43,8 @@ class KeyListener : Listener {
 class MouseListener : public Listener {
 public:
 	virtual void mouseMoved(const glm::vec2 &delta) {};
+
 	virtual void mouseButtonPressed(int button) {};
+
 	virtual void mouseButtonReleased(int button) {};
 };

include/vulkan/buffer.hpp

@@ -28,10 +28,12 @@ public:
 	VmaAllocationInfo allocationInfo {};
 	VkDeviceSize size;
 	void setName(const std::string &newName);
+
 	template<typename T>
 	T &access() {
 		return *reinterpret_cast<T *>(allocationInfo.pMappedData);
 	}
+
 	void copyTo(Buffer *buffer) const;
 	void copyTo(Image *image) const;
 	void setData(void *data, VkDeviceSize offset, VkDeviceSize dataSize, VkCommandBuffer commandBuffer = VK_NULL_HANDLE);

include/vulkan/descriptor_pool.hpp

@@ -5,6 +5,7 @@
 #include <map>
 
 class Buffer;
+
 class Image;
 
 enum class DescriptorSet {

include/vulkan/instance.hpp

@@ -14,6 +14,7 @@
 using std::optional, std::vector;
 
 class CommandPool;
+
 class Swapchain;
 
 void printVmaStats();
@@ -36,24 +37,11 @@ public:
 	struct QueueFamilyIndices {
 		vector<uint32_t> graphicsAndPresent;
 		vector<uint32_t> computeAndTransfer;
-		std::set<uint32_t> uniqueQueueFamilies(){
+		std::set<uint32_t> uniqueQueueFamilies();
-			std::set<uint32_t> unique;
+		uint32_t tryComputeAndTransferDedicated();
-			unique.insert(graphicsAndPresent.begin(), graphicsAndPresent.end());
+		bool isEnough();
-			unique.insert(computeAndTransfer.begin(), computeAndTransfer.end());
-			return unique;
-		}
-		uint32_t tryComputeAndTransferDedicated(){
-			for (uint32_t family : computeAndTransfer){
-				if (std::find(graphicsAndPresent.begin(), graphicsAndPresent.end(), family) == graphicsAndPresent.end()){
-					return family;
-				}
-			}
-			return computeAndTransfer[0];
-		}
-		bool isEnough(){
-			return !graphicsAndPresent.empty() && !computeAndTransfer.empty();
-		}
 	};
+
 	QueueFamilyIndices indices {};
 
 	static Instance *instance;

include/vulkan/swapchain.hpp

@@ -4,6 +4,7 @@
 #include <vector>
 
 class Image;
+
 class Instance;
 
 struct SwapchainSupportDetails {

src/application.cpp

@@ -273,17 +273,23 @@ void Application::addSoftBody(const std::string &modelFile, size_t count) {
 		newVertexBuffers[0] = make_unique<Buffer>(
 				newVertices.size() * sizeof(Vertex),
 				bufferUsageFlags | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
-				memoryUsage, 0, "Vertices 0"
+				memoryUsage,
+				0,
+				"Vertices 0"
 		);
 		newVertexBuffers[1] = make_unique<Buffer>(
 				newVertices.size() * sizeof(Vertex),
 				bufferUsageFlags | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
-				memoryUsage, 0, "Vertices 1"
+				memoryUsage,
+				0,
+				"Vertices 1"
 		);
 		newFaceBuffer = make_unique<Buffer>(
 				newFaces.size() * sizeof(Face),
 				bufferUsageFlags | VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
-				memoryUsage, 0, "Faces"
+				memoryUsage,
+				0,
+				"Faces"
 		);
 		newEdgeBuffer = make_unique<Buffer>(
 				constraintData.edges.size() * sizeof(Edge),
@@ -293,7 +299,10 @@ void Application::addSoftBody(const std::string &modelFile, size_t count) {
 				"Edges"
 		);
 		newTetrahedronBuffer = make_unique<Buffer>(
-				constraintData.tetrahedra.size() * sizeof(Tetrahedron), bufferUsageFlags, memoryUsage, 0,
+				constraintData.tetrahedra.size() * sizeof(Tetrahedron),
+				bufferUsageFlags,
+				memoryUsage,
+				0,
 				"Tetrahedra"
 		);
 
@@ -304,17 +313,29 @@ void Application::addSoftBody(const std::string &modelFile, size_t count) {
 		newTetrahedronBuffer->setData(constraintData.tetrahedra.data(), 0, newTetrahedronBuffer->size, commandBuffer);
 	} else {
 		newVertexBuffers[0] = vertexBuffers[0]->appended(
-				newVertices.data(), newVertices.size() * sizeof(Vertex), commandBuffer
+				newVertices.data(),
+				newVertices.size() * sizeof(Vertex),
+				commandBuffer
 		);
 		newVertexBuffers[1] = vertexBuffers[1]->appended(
-				newVertices.data(), newVertices.size() * sizeof(Vertex), commandBuffer
+				newVertices.data(),
+				newVertices.size() * sizeof(Vertex),
+				commandBuffer
+		);
+		newFaceBuffer = faceBuffer->appended(
+				newFaces.data(),
+				newFaces.size() * sizeof(Face),
+				commandBuffer
 		);
-		newFaceBuffer = faceBuffer->appended(newFaces.data(), newFaces.size() * sizeof(Face), commandBuffer);
 		newEdgeBuffer = edgeBuffer->replaced(
-				constraintData.edges.data(), constraintData.edges.size() * sizeof(Edge), commandBuffer
+				constraintData.edges.data(),
+				constraintData.edges.size() * sizeof(Edge),
+				commandBuffer
 		);
 		newTetrahedronBuffer = tetrahedronBuffer->replaced(
-				constraintData.tetrahedra.data(), constraintData.tetrahedra.size() * sizeof(Tetrahedron), commandBuffer
+				constraintData.tetrahedra.data(),
+				constraintData.tetrahedra.size() * sizeof(Tetrahedron),
+				commandBuffer
 		);
 	}
 
@@ -327,9 +348,7 @@ void Application::addSoftBody(const std::string &modelFile, size_t count) {
 	edgeBuffer = std::move(newEdgeBuffer);
 	tetrahedronBuffer = std::move(newTetrahedronBuffer);
 
-	descriptorPool->bindBuffer(
+	descriptorPool->bindBuffer(*vertexBuffers[1 - currentDrawVertexBuffer], VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, DescriptorSet::MESH, 0);
-			*vertexBuffers[1 - currentDrawVertexBuffer], VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, DescriptorSet::MESH, 0
-	);
 	descriptorPool->bindBuffer(*faceBuffer, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, DescriptorSet::MESH, 1);
 	descriptorPool->bindBuffer(*edgeBuffer, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, DescriptorSet::MESH, 2);
 	descriptorPool->bindBuffer(*tetrahedronBuffer, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, DescriptorSet::MESH, 4);

src/vulkan/instance.cpp

@@ -355,3 +355,22 @@ void Instance::initImGui(const Swapchain &swapchain) {
 
 	ImGui_ImplVulkan_Init(&initInfo);
 }
+
+
+std::set<uint32_t> Instance::QueueFamilyIndices::uniqueQueueFamilies() {
+	std::set<uint32_t> unique;
+	unique.insert(graphicsAndPresent.begin(), graphicsAndPresent.end());
+	unique.insert(computeAndTransfer.begin(), computeAndTransfer.end());
+	return unique;
+}
+
+uint32_t Instance::QueueFamilyIndices::tryComputeAndTransferDedicated() {
+	for (uint32_t family: computeAndTransfer)
+		if (std::find(graphicsAndPresent.begin(), graphicsAndPresent.end(), family) == graphicsAndPresent.end())
+			return family;
+	return computeAndTransfer[0];
+}
+
+bool Instance::QueueFamilyIndices::isEnough() {
+	return !graphicsAndPresent.empty() && !computeAndTransfer.empty();
+}