Remove ICloseable

openVulkanoCpp/Base/ICloseable.hpp

@@ -1,12 +0,0 @@
-#pragma once
-
-namespace OpenVulkano
-{
-	class ICloseable
-	{
-	public:
-		virtual ~ICloseable() = default;
-
-		virtual void Close() = 0;
-	};
-}

openVulkanoCpp/Base/IGraphicsApp.hpp

@@ -7,7 +7,6 @@
 #pragma once
 
 #include "ITickable.hpp"
-#include "ICloseable.hpp"
 #include "Version.hpp"
 #include <string>
 
@@ -15,7 +14,7 @@ namespace OpenVulkano
 {
 	class IGraphicsAppManager;
 
-	class IGraphicsApp : public ITickable, public ICloseable
+	class IGraphicsApp : public ITickable
 	{
 	private:
 		IGraphicsAppManager* m_manager = nullptr;
@@ -25,6 +24,7 @@ namespace OpenVulkano
 
 		virtual void Init() = 0;
 		virtual void InitPostGraphics() {}
+		virtual void Close() {}
 		virtual void CloseFinalize() {}
 		[[nodiscard]] IGraphicsAppManager* GetGraphicsAppManager() const { return m_manager; }
 		void SetGraphicsAppManager(IGraphicsAppManager* manager) { m_manager = manager; }

openVulkanoCpp/Base/IPlatform.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "ITickable.hpp"
-#include "ICloseable.hpp"
 #include "UI/IWindow.hpp"
 
 namespace OpenVulkano
@@ -12,11 +11,11 @@ namespace OpenVulkano
 		PlatformInitFailedException(char const* const message) : runtime_error(message) {}
 	};
 
-	class IPlatform : public ITickable, public ICloseable
+	class IPlatform : public ITickable
 	{
 	public:
 		virtual void Init() = 0;
-
+		virtual void Close() = 0;
 		virtual IWindow* MakeWindow() = 0;
 	};
 }

openVulkanoCpp/Base/Render/IRenderer.hpp

@@ -8,7 +8,6 @@
 
 #include "IResourceManager.hpp"
 #include "Base/ITickable.hpp"
-#include "Base/ICloseable.hpp"
 #include "Scene/Scene.hpp"
 #include "Scene/UI/UI.hpp"
 #include <string>
@@ -18,12 +17,13 @@ namespace OpenVulkano
 	class IWindow;
 	class IGraphicsAppManager;
 
-	class IRenderer : public ITickable, public ICloseable
+	class IRenderer : public ITickable
 	{
 	public:
 		virtual ~IRenderer() = default;
 
 		virtual void Init(IGraphicsAppManager* graphicsAppManager, IWindow* window) = 0;
+		virtual void Close() = 0;
 
 		virtual std::string GetMainRenderDeviceName() = 0;
 		virtual void Resize(uint32_t newWidth, uint32_t newHeight) = 0;

openVulkanoCpp/Base/UI/IWindow.hpp

@@ -8,7 +8,6 @@
 
 #include "Math/Math.hpp"
 #include "Base/PlatformEnums.hpp"
-#include "Base/ICloseable.hpp"
 #include <string>
 #include <stdexcept>
 
@@ -36,12 +35,13 @@ namespace OpenVulkano
 		bool resizeable = true;
 	};
 
-	class IWindow : public ICloseable
+	class IWindow
 	{
 	public:
-		~IWindow() override = default;
+		virtual ~IWindow() = default;
 
 		virtual void Init(RenderAPI::RenderApi renderApi) = 0;
+		virtual void Close() = 0;
 
 		virtual bool WindowHasBeenDestroyed() const = 0;
 		virtual void SetWindowHasBeenDestroyed() = 0;