More code cleanup

openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp

@@ -7,37 +7,45 @@
 #pragma once
 
 #include <vulkan/vulkan.hpp>
-#include "../../Scene/Shader.hpp"
 #include "../../Base/ICloseable.hpp"
-#include "../Resources/IShaderOwner.hpp"
 #include "IRecordable.hpp"
 
-namespace openVulkanoCpp::Vulkan
+namespace openVulkanoCpp
 {
-	class Context;
-
-	struct VulkanShader final : virtual public ICloseable, virtual public IRecordable
+	namespace Scene
 	{
-		Scene::Shader* shader = nullptr;
-		vk::Device device;
-		vk::ShaderModule shaderModuleVertex, shaderModuleFragment;
-		vk::Pipeline pipeline;
-		IShaderOwner* owner;
-		Context* context;
+		class Shader;
+	}
 
-		VulkanShader() = default;
-		~VulkanShader() override { if (shader) VulkanShader::Close(); }
+	namespace Vulkan
+	{
+		class Context;
+		class IShaderOwner;
 
-		void Init(Context* context, Scene::Shader* shader, IShaderOwner* owner);
+		struct VulkanShader final : virtual public ICloseable, virtual public IRecordable
+		{
+			Scene::Shader* shader = nullptr;
+			vk::Device device;
+			vk::ShaderModule shaderModuleVertex, shaderModuleFragment;
+			vk::Pipeline pipeline;
+			IShaderOwner* owner;
+			Context* context;
 
-		void Resize();
+			VulkanShader() = default;
 
-		void Record(vk::CommandBuffer& cmdBuffer, uint32_t bufferId) override;
+			~VulkanShader() override
+			{ if (shader) VulkanShader::Close(); }
 
-		void Close() override;
+			void Init(Context* context, Scene::Shader* shader, IShaderOwner* owner);
 
-	private:
-		void BuildPipeline();
-	};
+			void Resize();
 
-}
+			void Record(vk::CommandBuffer& cmdBuffer, uint32_t bufferId) override;
+
+			void Close() override;
+
+		private:
+			void BuildPipeline();
+		};
+	}
+}