From d84d2935ffcc06af7185b3b5be836e82170c6a0c Mon Sep 17 00:00:00 2001
From: GeorgH93 <git@georgh93.eu>
Date: Tue, 22 Aug 2023 00:40:20 +0200
Subject: [PATCH] Changes to the inharitance of some classes

---
 openVulkanoCpp/Base/Render/IRenderer.hpp            | 2 +-
 openVulkanoCpp/Host/GLFW/WindowGLFW.hpp             | 2 +-
 openVulkanoCpp/Host/GraphicsAppManager.hpp          | 2 +-
 openVulkanoCpp/Vulkan/Buffer.hpp                    | 2 +-
 openVulkanoCpp/Vulkan/Context.hpp                   | 2 +-
 openVulkanoCpp/Vulkan/Device.hpp                    | 2 +-
 openVulkanoCpp/Vulkan/Image.hpp                     | 2 +-
 openVulkanoCpp/Vulkan/RenderPass.hpp                | 2 +-
 openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp | 2 +-
 openVulkanoCpp/Vulkan/SwapChain.hpp                 | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/openVulkanoCpp/Base/Render/IRenderer.hpp b/openVulkanoCpp/Base/Render/IRenderer.hpp
index 6610e42..6ab8484 100644
--- a/openVulkanoCpp/Base/Render/IRenderer.hpp
+++ b/openVulkanoCpp/Base/Render/IRenderer.hpp
@@ -17,7 +17,7 @@ namespace openVulkanoCpp
 	class IWindow;
 	class IGraphicsAppManager;
 
-	class IRenderer : virtual public ITickable, virtual public ICloseable
+	class IRenderer : public ITickable, public ICloseable
 	{
 	public:
 		virtual ~IRenderer() = default;
diff --git a/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp b/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp
index 89ab79c..1192c3c 100644
--- a/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp
+++ b/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp
@@ -17,7 +17,7 @@ struct GLFWwindow;
 
 namespace openVulkanoCpp::GLFW
 {
-	class WindowGLFW final : public BaseWindow, virtual public IVulkanWindow, virtual public IOpenGlWindow
+	class WindowGLFW final : virtual public BaseWindow, virtual public IVulkanWindow, virtual public IOpenGlWindow
 	{
 	private:
 		InputProviderGLFW& inputProvider;
diff --git a/openVulkanoCpp/Host/GraphicsAppManager.hpp b/openVulkanoCpp/Host/GraphicsAppManager.hpp
index 8bab42b..7bba1a8 100644
--- a/openVulkanoCpp/Host/GraphicsAppManager.hpp
+++ b/openVulkanoCpp/Host/GraphicsAppManager.hpp
@@ -22,7 +22,7 @@ namespace openVulkanoCpp
 	/**
 	 * \brief A simple GraphicsAppManager. It can only handle one window.
 	 */
-	class GraphicsAppManager final : virtual public IGraphicsAppManager, virtual public IWindowHandler
+	class GraphicsAppManager final : public IGraphicsAppManager, public IWindowHandler
 	{
 	private:
 		std::unique_ptr<IPlatform> platform;
diff --git a/openVulkanoCpp/Vulkan/Buffer.hpp b/openVulkanoCpp/Vulkan/Buffer.hpp
index c98dfbc..9b8d5da 100644
--- a/openVulkanoCpp/Vulkan/Buffer.hpp
+++ b/openVulkanoCpp/Vulkan/Buffer.hpp
@@ -9,7 +9,7 @@ namespace openVulkanoCpp
 		/**
 		 * \brief A not managed buffer. This should be used rarely.
 		 */
-		struct Buffer : virtual public ICloseable
+		struct Buffer : public ICloseable
 		{
 			vk::Device device;
 			vk::DeviceMemory memory;
diff --git a/openVulkanoCpp/Vulkan/Context.hpp b/openVulkanoCpp/Vulkan/Context.hpp
index e47a0de..22dfc3b 100644
--- a/openVulkanoCpp/Vulkan/Context.hpp
+++ b/openVulkanoCpp/Vulkan/Context.hpp
@@ -21,7 +21,7 @@ namespace openVulkanoCpp
 	{
 		class Device;
 
-		class Context final : virtual public ICloseable
+		class Context final : public ICloseable
 		{
 			bool enableValidationLayer, initialized;
 			std::set<std::string> requiredExtensions;
diff --git a/openVulkanoCpp/Vulkan/Device.hpp b/openVulkanoCpp/Vulkan/Device.hpp
index 47b7e8d..8e9ee3a 100644
--- a/openVulkanoCpp/Vulkan/Device.hpp
+++ b/openVulkanoCpp/Vulkan/Device.hpp
@@ -16,7 +16,7 @@ namespace openVulkanoCpp
 {
 	namespace Vulkan
 	{
-		class Device : virtual public ICloseable
+		class Device : public ICloseable
 		{
 		public:
 			vk::PhysicalDevice physicalDevice;
diff --git a/openVulkanoCpp/Vulkan/Image.hpp b/openVulkanoCpp/Vulkan/Image.hpp
index fb74dc7..77e8527 100644
--- a/openVulkanoCpp/Vulkan/Image.hpp
+++ b/openVulkanoCpp/Vulkan/Image.hpp
@@ -21,7 +21,7 @@ namespace openVulkanoCpp::Vulkan
 		virtual vk::ImageView GetView() = 0;
 	};
 
-	struct Image : public Buffer, virtual public IImage
+	struct Image : public Buffer, public IImage
 	{
 		vk::Image image;
 		vk::Extent3D extent;
diff --git a/openVulkanoCpp/Vulkan/RenderPass.hpp b/openVulkanoCpp/Vulkan/RenderPass.hpp
index fcb5d94..cc7a076 100644
--- a/openVulkanoCpp/Vulkan/RenderPass.hpp
+++ b/openVulkanoCpp/Vulkan/RenderPass.hpp
@@ -13,7 +13,7 @@ namespace openVulkanoCpp::Vulkan
 {
 	class FrameBuffer;
 
-	class RenderPass : virtual public ICloseable
+	class RenderPass : public ICloseable
 	{ //TODO allow to control the render rect size
 	protected:
 		vk::Device m_device;
diff --git a/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp b/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp
index d63b962..848d317 100644
--- a/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp
+++ b/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp
@@ -29,7 +29,7 @@ namespace openVulkanoCpp
 		class VulkanGeometry;
 		class VulkanTexture;
 
-		class ResourceManager : virtual public ICloseable, virtual public IShaderOwner
+		class ResourceManager : public ICloseable, public IShaderOwner
 		{
 			Context* context;
 			vk::Device device = nullptr;
diff --git a/openVulkanoCpp/Vulkan/SwapChain.hpp b/openVulkanoCpp/Vulkan/SwapChain.hpp
index 8d2be46..f33e090 100644
--- a/openVulkanoCpp/Vulkan/SwapChain.hpp
+++ b/openVulkanoCpp/Vulkan/SwapChain.hpp
@@ -16,7 +16,7 @@ namespace openVulkanoCpp
 {
 	namespace Vulkan
 	{
-		struct SwapChainImage : virtual public IImage
+		struct SwapChainImage : public IImage
 		{
 			vk::Image image;
 			vk::ImageView view;