Changes to the inharitance of some classes
This commit is contained in:
@@ -17,7 +17,7 @@ namespace openVulkanoCpp
|
|||||||
class IWindow;
|
class IWindow;
|
||||||
class IGraphicsAppManager;
|
class IGraphicsAppManager;
|
||||||
|
|
||||||
class IRenderer : virtual public ITickable, virtual public ICloseable
|
class IRenderer : public ITickable, public ICloseable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ~IRenderer() = default;
|
virtual ~IRenderer() = default;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ struct GLFWwindow;
|
|||||||
|
|
||||||
namespace openVulkanoCpp::GLFW
|
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:
|
private:
|
||||||
InputProviderGLFW& inputProvider;
|
InputProviderGLFW& inputProvider;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ namespace openVulkanoCpp
|
|||||||
/**
|
/**
|
||||||
* \brief A simple GraphicsAppManager. It can only handle one window.
|
* \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:
|
private:
|
||||||
std::unique_ptr<IPlatform> platform;
|
std::unique_ptr<IPlatform> platform;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace openVulkanoCpp
|
|||||||
/**
|
/**
|
||||||
* \brief A not managed buffer. This should be used rarely.
|
* \brief A not managed buffer. This should be used rarely.
|
||||||
*/
|
*/
|
||||||
struct Buffer : virtual public ICloseable
|
struct Buffer : public ICloseable
|
||||||
{
|
{
|
||||||
vk::Device device;
|
vk::Device device;
|
||||||
vk::DeviceMemory memory;
|
vk::DeviceMemory memory;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace openVulkanoCpp
|
|||||||
{
|
{
|
||||||
class Device;
|
class Device;
|
||||||
|
|
||||||
class Context final : virtual public ICloseable
|
class Context final : public ICloseable
|
||||||
{
|
{
|
||||||
bool enableValidationLayer, initialized;
|
bool enableValidationLayer, initialized;
|
||||||
std::set<std::string> requiredExtensions;
|
std::set<std::string> requiredExtensions;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace openVulkanoCpp
|
|||||||
{
|
{
|
||||||
namespace Vulkan
|
namespace Vulkan
|
||||||
{
|
{
|
||||||
class Device : virtual public ICloseable
|
class Device : public ICloseable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
vk::PhysicalDevice physicalDevice;
|
vk::PhysicalDevice physicalDevice;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace openVulkanoCpp::Vulkan
|
|||||||
virtual vk::ImageView GetView() = 0;
|
virtual vk::ImageView GetView() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Image : public Buffer, virtual public IImage
|
struct Image : public Buffer, public IImage
|
||||||
{
|
{
|
||||||
vk::Image image;
|
vk::Image image;
|
||||||
vk::Extent3D extent;
|
vk::Extent3D extent;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace openVulkanoCpp::Vulkan
|
|||||||
{
|
{
|
||||||
class FrameBuffer;
|
class FrameBuffer;
|
||||||
|
|
||||||
class RenderPass : virtual public ICloseable
|
class RenderPass : public ICloseable
|
||||||
{ //TODO allow to control the render rect size
|
{ //TODO allow to control the render rect size
|
||||||
protected:
|
protected:
|
||||||
vk::Device m_device;
|
vk::Device m_device;
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ namespace openVulkanoCpp
|
|||||||
class VulkanGeometry;
|
class VulkanGeometry;
|
||||||
class VulkanTexture;
|
class VulkanTexture;
|
||||||
|
|
||||||
class ResourceManager : virtual public ICloseable, virtual public IShaderOwner
|
class ResourceManager : public ICloseable, public IShaderOwner
|
||||||
{
|
{
|
||||||
Context* context;
|
Context* context;
|
||||||
vk::Device device = nullptr;
|
vk::Device device = nullptr;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace openVulkanoCpp
|
|||||||
{
|
{
|
||||||
namespace Vulkan
|
namespace Vulkan
|
||||||
{
|
{
|
||||||
struct SwapChainImage : virtual public IImage
|
struct SwapChainImage : public IImage
|
||||||
{
|
{
|
||||||
vk::Image image;
|
vk::Image image;
|
||||||
vk::ImageView view;
|
vk::ImageView view;
|
||||||
|
|||||||
Reference in New Issue
Block a user