diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bfe38b..b849cf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,3 +11,4 @@ find_package(glfw3 REQUIRED) find_package(glm REQUIRED) target_link_libraries(VulkanSimulation glfw Vulkan::Vulkan) +target_include_directories(VulkanSimulation PRIVATE include) diff --git a/src/glm.h b/include/glm.h similarity index 100% rename from src/glm.h rename to include/glm.h diff --git a/src/vulkan/application.hpp b/include/vulkan/application.hpp similarity index 100% rename from src/vulkan/application.hpp rename to include/vulkan/application.hpp diff --git a/src/vulkan/buffer.hpp b/include/vulkan/buffer.hpp similarity index 100% rename from src/vulkan/buffer.hpp rename to include/vulkan/buffer.hpp diff --git a/src/vulkan/command_pool.hpp b/include/vulkan/command_pool.hpp similarity index 100% rename from src/vulkan/command_pool.hpp rename to include/vulkan/command_pool.hpp diff --git a/src/vulkan/image.hpp b/include/vulkan/image.hpp similarity index 100% rename from src/vulkan/image.hpp rename to include/vulkan/image.hpp diff --git a/src/vulkan/instance.hpp b/include/vulkan/instance.hpp similarity index 100% rename from src/vulkan/instance.hpp rename to include/vulkan/instance.hpp diff --git a/src/vulkan/pipeline.hpp b/include/vulkan/pipeline.hpp similarity index 100% rename from src/vulkan/pipeline.hpp rename to include/vulkan/pipeline.hpp diff --git a/src/vulkan/swapchain.hpp b/include/vulkan/swapchain.hpp similarity index 100% rename from src/vulkan/swapchain.hpp rename to include/vulkan/swapchain.hpp diff --git a/src/vulkan/utils.h b/include/vulkan/utils.h similarity index 100% rename from src/vulkan/utils.h rename to include/vulkan/utils.h diff --git a/src/vulkan/vertex.hpp b/include/vulkan/vertex.hpp similarity index 100% rename from src/vulkan/vertex.hpp rename to include/vulkan/vertex.hpp diff --git a/src/vulkan/application.cpp b/src/vulkan/application.cpp index 1b20602..bc97d98 100644 --- a/src/vulkan/application.cpp +++ b/src/vulkan/application.cpp @@ -1,10 +1,10 @@ -#include "application.hpp" -#include "swapchain.hpp" -#include "pipeline.hpp" -#include "instance.hpp" -#include "buffer.hpp" -#include "command_pool.hpp" -#include "image.hpp" +#include "vulkan/application.hpp" +#include "vulkan/swapchain.hpp" +#include "vulkan/pipeline.hpp" +#include "vulkan/instance.hpp" +#include "vulkan/buffer.hpp" +#include "vulkan/command_pool.hpp" +#include "vulkan/image.hpp" Application::Application() { diff --git a/src/vulkan/buffer.cpp b/src/vulkan/buffer.cpp index e6c744c..5fd18c5 100644 --- a/src/vulkan/buffer.cpp +++ b/src/vulkan/buffer.cpp @@ -1,10 +1,10 @@ #include #include -#include "buffer.hpp" -#include "vertex.hpp" -#include "instance.hpp" -#include "command_pool.hpp" -#include "utils.h" +#include "vulkan/buffer.hpp" +#include "vulkan/vertex.hpp" +#include "vulkan/instance.hpp" +#include "vulkan/command_pool.hpp" +#include "vulkan/utils.h" Buffer::Buffer(VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags properties) : size(size){ VkBufferCreateInfo bufferInfo{}; diff --git a/src/vulkan/command_pool.cpp b/src/vulkan/command_pool.cpp index 05d6927..30a5186 100644 --- a/src/vulkan/command_pool.cpp +++ b/src/vulkan/command_pool.cpp @@ -1,6 +1,6 @@ -#include "command_pool.hpp" -#include "application.hpp" -#include "instance.hpp" +#include "vulkan/command_pool.hpp" +#include "vulkan/application.hpp" +#include "vulkan/instance.hpp" CommandPool::CommandPool() { Instance::QueueFamilyIndices indices = Instance::findQueueFamilies(Instance::instance->physicalDevice, Instance::instance->surface); diff --git a/src/vulkan/image.cpp b/src/vulkan/image.cpp index 5ab6f37..9df1c53 100644 --- a/src/vulkan/image.cpp +++ b/src/vulkan/image.cpp @@ -1,6 +1,6 @@ -#include "image.hpp" -#include "instance.hpp" -#include "utils.h" +#include "vulkan/image.hpp" +#include "vulkan/instance.hpp" +#include "vulkan/utils.h" Image::Image(uint32_t width, uint32_t height, VkFormat format, VkImageTiling tiling, diff --git a/src/vulkan/instance.cpp b/src/vulkan/instance.cpp index aa9c6ca..9794a7d 100644 --- a/src/vulkan/instance.cpp +++ b/src/vulkan/instance.cpp @@ -1,7 +1,7 @@ #include #include -#include "instance.hpp" -#include "swapchain.hpp" +#include "vulkan/instance.hpp" +#include "vulkan/swapchain.hpp" #include const std::vector deviceExtensions = { diff --git a/src/vulkan/pipeline.cpp b/src/vulkan/pipeline.cpp index 5c1bfc0..a4ac869 100644 --- a/src/vulkan/pipeline.cpp +++ b/src/vulkan/pipeline.cpp @@ -1,9 +1,9 @@ #include #include -#include "pipeline.hpp" -#include "vertex.hpp" -#include "instance.hpp" -#include "buffer.hpp" +#include "vulkan/pipeline.hpp" +#include "vulkan/vertex.hpp" +#include "vulkan/instance.hpp" +#include "vulkan/buffer.hpp" std::vector readFile(const std::string& fileName){ std::ifstream file(fileName, std::ios::ate | std::ios::binary); diff --git a/src/vulkan/swapchain.cpp b/src/vulkan/swapchain.cpp index 22a3686..591abf0 100644 --- a/src/vulkan/swapchain.cpp +++ b/src/vulkan/swapchain.cpp @@ -1,8 +1,8 @@ #include #include -#include "swapchain.hpp" -#include "instance.hpp" -#include "image.hpp" +#include "vulkan/swapchain.hpp" +#include "vulkan/instance.hpp" +#include "vulkan/image.hpp" SwapchainSupportDetails querySwapchainSupport(VkPhysicalDevice device, VkSurfaceKHR surface){ SwapchainSupportDetails details; diff --git a/src/vulkan/utils.cpp b/src/vulkan/utils.cpp index 95338c2..f93f594 100644 --- a/src/vulkan/utils.cpp +++ b/src/vulkan/utils.cpp @@ -1,7 +1,7 @@ #include -#include "utils.h" +#include "vulkan/utils.h" -#include "instance.hpp" +#include "vulkan/instance.hpp" uint32_t findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags propertyFlags) { VkPhysicalDeviceMemoryProperties memoryProperties; diff --git a/src/vulkan/vertex.cpp b/src/vulkan/vertex.cpp index 0129df7..cd31d9e 100644 --- a/src/vulkan/vertex.cpp +++ b/src/vulkan/vertex.cpp @@ -1,4 +1,4 @@ -#include "vertex.hpp" +#include "vulkan/vertex.hpp" VkVertexInputBindingDescription Vertex::getBindingDescription() { VkVertexInputBindingDescription bindingDescription {};