Fixed Compile Issues

tomheeleynz · Jul 23, 2021 · c3d91c8 · c3d91c8
1 parent c48eec9
commit c3d91c8
Show file tree

Hide file tree

Showing 41 changed files with 87 additions and 77 deletions.
diff --git a/Arcane/premake5.lua b/Arcane/premake5.lua
@@ -17,7 +17,7 @@ project "Arcane"
         "%{IncludeDirs.vulkan}",
         "%{IncludeDirs.glm}",
         "%{IncludeDirs.imgui}",
-        "src/Arcane"
+        "src"
     }
 
     links {

diff --git a/Arcane/src/Arcane.h b/Arcane/src/Arcane.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "Arcane/Core/Application.h"
+#include "Arcane/Core/Layer.h"
+
+#include "Arcane/Renderer/Renderer.h"
+#include "Arcane/Renderer/Pipeline.h"
+#include "Arcane/Renderer/Shader.h"
+#include "Arcane/Renderer/RenderPass.h"
+#include "Arcane/Renderer/VertexDescriptor.h"
+#include "Arcane/Renderer/Buffer.h"
+#include "Arcane/Renderer/UniformBuffer.h"
+
+#include "Arcane/ImGui/ImGuiLayer.h"
diff --git a/Arcane/src/Arcane/Arcane.h b/Arcane/src/Arcane/Arcane.h
diff --git a/Arcane/src/Arcane/Core/Application.cpp b/Arcane/src/Arcane/Core/Application.cpp
@@ -1,9 +1,9 @@
 #include "Application.h"
 
-#include "Renderer/Renderer.h"
-#include "Renderer/Shader.h"
-#include "Renderer/Pipeline.h"
-#include "Renderer/RenderPass.h"
+#include "Arcane/Renderer/Renderer.h"
+#include "Arcane/Renderer/Shader.h"
+#include "Arcane/Renderer/Pipeline.h"
+#include "Arcane/Renderer/RenderPass.h"
 
 namespace Arcane {
 	Application* Application::s_Instance = nullptr;

diff --git a/Arcane/src/Arcane/Core/Application.h b/Arcane/src/Arcane/Core/Application.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "Window.h"
-#include "ImGui/ImGuiLayer.h"
+#include "Arcane/ImGui/ImGuiLayer.h"
 
 
 namespace Arcane {

diff --git a/Arcane/src/Arcane/Core/Window.cpp b/Arcane/src/Arcane/Core/Window.cpp
@@ -1,5 +1,5 @@
 #include "Window.h"
-#include "Renderer/GraphicsContext.h"
+#include "Arcane/Renderer/GraphicsContext.h"
 
 namespace Arcane {
 	Window::Window(WindowSpecifications& specifications)

diff --git a/Arcane/src/Arcane/ImGui/ImGuiLayer.cpp b/Arcane/src/Arcane/ImGui/ImGuiLayer.cpp
@@ -1,9 +1,9 @@
 #include "ImGuiLayer.h"
-#include "Renderer/Renderer.h"
+#include "Arcane/Renderer/Renderer.h"
 
 // Platform
 // -- Vulkan
-#include "Platform/Vulkan/VulkanImGuiLayer.h"
+#include "Arcane/Platform/Vulkan/VulkanImGuiLayer.h"
 
 namespace Arcane {
 	ImGuiLayer* ImGuiLayer::Create()

diff --git a/Arcane/src/Arcane/ImGui/ImGuiLayer.h b/Arcane/src/Arcane/ImGui/ImGuiLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Core/Layer.h"
+#include "Arcane/Core/Layer.h"
 
 namespace Arcane {
 	class ImGuiLayer : public Layer

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanBuffer.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanBuffer.cpp
@@ -1,5 +1,5 @@
 #include "VulkanBuffer.h"
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 #include "VulkanContext.h"
 
 namespace Arcane {

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanBuffer.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vulkan/vulkan.h>
-#include "Renderer/Buffer.h"
+#include "Arcane/Renderer/Buffer.h"
 
 namespace Arcane {
 	////////////////////////////////////////////////////////

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanContext.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanContext.cpp
@@ -1,6 +1,6 @@
 #include "VulkanContext.h"
 
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 #include "VulkanDevice.h"
 #include "VulkanSwapChain.h"
 

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanContext.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanContext.h
@@ -2,7 +2,7 @@
 
 #include <vulkan/vulkan.h> 
 
-#include "Renderer/GraphicsContext.h"
+#include "Arcane/Renderer/GraphicsContext.h"
 
 #include "VulkanDevice.h"
 #include "VulkanSwapChain.h"

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanDevice.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanDevice.h
@@ -4,6 +4,7 @@
 #include <vector>
 #include <optional>
 #include <set>
+#include <string>
 
 namespace Arcane {
 

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanFramebuffer.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanFramebuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vulkan/vulkan.h>
-#include "Renderer/Framebuffer.h"
+#include "Arcane/Renderer/Framebuffer.h"
 
 namespace Arcane {
 	class VulkanFramebuffer : public Framebuffer

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanImGuiLayer.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanImGuiLayer.cpp
@@ -1,4 +1,4 @@
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 #include "VulkanContext.h"
 #include "VulkanImGuiLayer.h"
 

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanImGuiLayer.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanImGuiLayer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <imgui.h>
-#include "ImGui/ImGuiLayer.h"
+#include "Arcane/ImGui/ImGuiLayer.h"
 #include "backends/imgui_impl_vulkan.h"
 #include "backends/imgui_impl_glfw.h"
 

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanPipeline.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanPipeline.cpp
@@ -1,4 +1,4 @@
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 
 #include "VulkanPipeline.h"
 #include "VulkanShader.h"

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanPipeline.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanPipeline.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vulkan/vulkan.h>
-#include "Renderer/Pipeline.h"
+#include "Arcane/Renderer/Pipeline.h"
 
 namespace Arcane {
 	class VulkanPipeline : public Pipeline

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderPass.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderPass.cpp
@@ -1,5 +1,5 @@
 #include "VulkanRenderPass.h"
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 #include "VulkanContext.h"
 
 namespace Arcane {

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderPass.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderPass.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vulkan/vulkan.h>
-#include "Renderer/RenderPass.h"
+#include "Arcane/Renderer/RenderPass.h"
 
 namespace Arcane {
 	class VulkanRenderPass : public RenderPass

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.cpp
@@ -4,7 +4,7 @@
 #include "VulkanBuffer.h"
 #include "VulkanRenderPass.h"
 
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 
 namespace Arcane {
 

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanRenderer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vulkan/vulkan.h>
-#include "Renderer/RendererAPI.h"
+#include "Arcane/Renderer/RendererAPI.h"
 
 namespace Arcane {
 	class VulkanRenderer : public RendererAPI

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanShader.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanShader.cpp
@@ -1,4 +1,4 @@
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 #include "VulkanShader.h"
 #include "VulkanContext.h"
 

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanShader.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanShader.h
@@ -3,7 +3,7 @@
 #include <vulkan/vulkan.h>
 #include <vector>
 #include <fstream>
-#include "Renderer/Shader.h"
+#include "Arcane/Renderer/Shader.h"
 
 namespace Arcane {
 	class VulkanShader : public Shader

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanSwapChain.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanSwapChain.cpp
@@ -1,6 +1,6 @@
 #include <GLFW/glfw3.h>
 
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 #include "VulkanContext.h"
 #include "VulkanSwapChain.h"
 

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanUniformBuffer.cpp b/Arcane/src/Arcane/Platform/Vulkan/VulkanUniformBuffer.cpp
@@ -1,5 +1,5 @@
 #include "VulkanUniformBuffer.h"
-#include "Core/Application.h"
+#include "Arcane/Core/Application.h"
 #include "VulkanContext.h"
 
 namespace Arcane {

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanUniformBuffer.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanUniformBuffer.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <glm/glm.hpp>
 
-#include "Renderer/UniformBuffer.h"
+#include "Arcane/Renderer/UniformBuffer.h"
 
 namespace Arcane {
 	struct UniformBufferObject

diff --git a/Arcane/src/Arcane/Platform/Vulkan/VulkanVertexDescriptor.h b/Arcane/src/Arcane/Platform/Vulkan/VulkanVertexDescriptor.h
@@ -2,7 +2,7 @@
 
 #include <vulkan/vulkan.h>
 #include <vector>
-#include "Renderer/VertexDescriptor.h"
+#include "Arcane/Renderer/VertexDescriptor.h"
 
 namespace Arcane {
 

diff --git a/Arcane/src/Arcane/Renderer/Buffer.cpp b/Arcane/src/Arcane/Renderer/Buffer.cpp
@@ -1,9 +1,9 @@
 #include "Buffer.h"
-#include "Renderer/Renderer.h"
+#include "Arcane/Renderer/Renderer.h"
 
 // Platform Specific
 // -- Vulkan
-#include "Platform/Vulkan/VulkanBuffer.h"
+#include "Arcane/Platform/Vulkan/VulkanBuffer.h"
 
 namespace Arcane {
 

diff --git a/Arcane/src/Arcane/Renderer/Framebuffer.cpp b/Arcane/src/Arcane/Renderer/Framebuffer.cpp
@@ -3,7 +3,7 @@
 
 // Platform
 // -- Vulkan
-#include "Platform/Vulkan/VulkanFramebuffer.h"
+#include "Arcane/Platform/Vulkan/VulkanFramebuffer.h"
 
 namespace Arcane {
 

diff --git a/Arcane/src/Arcane/Renderer/GraphicsContext.cpp b/Arcane/src/Arcane/Renderer/GraphicsContext.cpp
@@ -1,8 +1,8 @@
 #include "GraphicsContext.h"
-#include "Renderer/RendererAPI.h"
+#include "Arcane/Renderer/RendererAPI.h"
 
 // -- Vulkan Context
-#include "Platform/Vulkan/VulkanContext.h"
+#include "Arcane/Platform/Vulkan/VulkanContext.h"
 
 namespace Arcane {
 

diff --git a/Arcane/src/Arcane/Renderer/GraphicsContext.h b/Arcane/src/Arcane/Renderer/GraphicsContext.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Core/Window.h"
+#include "Arcane/Core/Window.h"
 
 namespace Arcane {
 	class GraphicsContext

diff --git a/Arcane/src/Arcane/Renderer/Pipeline.cpp b/Arcane/src/Arcane/Renderer/Pipeline.cpp
@@ -1,6 +1,6 @@
 #include "Pipeline.h"
-#include "Renderer/Renderer.h"
-#include "Platform/Vulkan/VulkanPipeline.h"
+#include "Arcane/Renderer/Renderer.h"
+#include "Arcane/Platform/Vulkan/VulkanPipeline.h"
 
 namespace Arcane {
 	Pipeline* Pipeline::Create(PipelineSpecification& spec)

diff --git a/Arcane/src/Arcane/Renderer/RenderPass.cpp b/Arcane/src/Arcane/Renderer/RenderPass.cpp
@@ -1,6 +1,6 @@
-#include "Renderer/RenderPass.h"
-#include "Renderer/Renderer.h"
-#include "Platform/Vulkan/VulkanRenderPass.h"
+#include "Arcane/Renderer/RenderPass.h"
+#include "Arcane/Renderer/Renderer.h"
+#include "Arcane/Platform/Vulkan/VulkanRenderPass.h"
 
 namespace Arcane {
 

diff --git a/Arcane/src/Arcane/Renderer/Renderer.cpp b/Arcane/src/Arcane/Renderer/Renderer.cpp
@@ -1,7 +1,7 @@
 #include "Renderer.h"
 
 // -- Vulkan Renderer
-#include "Platform/Vulkan/VulkanRenderer.h"
+#include "Arcane/Platform/Vulkan/VulkanRenderer.h"
 
 namespace Arcane {
 	static RendererAPI* s_RendererAPI = nullptr;

diff --git a/Arcane/src/Arcane/Renderer/Shader.cpp b/Arcane/src/Arcane/Renderer/Shader.cpp
@@ -1,6 +1,6 @@
 #include "Shader.h"
-#include "Renderer/Renderer.h"
-#include "Platform/Vulkan/VulkanShader.h"
+#include "Arcane/Renderer/Renderer.h"
+#include "Arcane/Platform/Vulkan/VulkanShader.h"
 
 namespace Arcane {
 	Shader* Shader::Create(std::string vertexShader, std::string fragmentShader)

diff --git a/Arcane/src/Arcane/Renderer/UniformBuffer.cpp b/Arcane/src/Arcane/Renderer/UniformBuffer.cpp
@@ -1,9 +1,10 @@
 #include "UniformBuffer.h"
-#include "Renderer/Renderer.h"
+#include "Arcane/Renderer/Renderer.h"
 
 // Platform
 // -- Vulkan
-#include "Platform/Vulkan/VulkanUniformBuffer.h"
+#include "Arcane/Platform/Vulkan/VulkanUniformBuffer.h"
+
 namespace Arcane {
 	UniformBuffer* UniformBuffer::Create()
 	{

diff --git a/Arcane/src/Arcane/Renderer/VertexDescriptor.cpp b/Arcane/src/Arcane/Renderer/VertexDescriptor.cpp
@@ -3,7 +3,7 @@
 
 // Platform Specific
 // -- Vulkan
-#include "Platform/Vulkan/VulkanVertexDescriptor.h"
+#include "Arcane/Platform/Vulkan/VulkanVertexDescriptor.h"
 
 namespace Arcane {
 	VertexDescriptor* VertexDescriptor::Create(std::initializer_list<VertexType> vertexTypes)

diff --git a/EnchantingTable/premake5.lua b/EnchantingTable/premake5.lua
@@ -13,7 +13,7 @@ project "EnchantingTable"
 
     includedirs {
         "src",
-        "%{wks.location}/Arcane/src/Arcane",
+        "%{wks.location}/Arcane/src",
         "%{IncludeDirs.vulkan}",
         "%{IncludeDirs.glm}",
         "%{IncludeDirs.glfw}",