From ab226e04bff7ccd709cf804f068f6f92c4dcfcca Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Thu, 5 Oct 2023 15:52:15 +0200 Subject: [PATCH] Cleanup GraphicsApp --- openVulkanoCpp/Base/IGraphicsApp.hpp | 12 ++++++------ openVulkanoCpp/ExampleApps/CubesExampleApp.cpp | 6 ------ openVulkanoCpp/ExampleApps/CubesExampleApp.hpp | 6 ++++++ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/openVulkanoCpp/Base/IGraphicsApp.hpp b/openVulkanoCpp/Base/IGraphicsApp.hpp index 259f9f7..638748c 100644 --- a/openVulkanoCpp/Base/IGraphicsApp.hpp +++ b/openVulkanoCpp/Base/IGraphicsApp.hpp @@ -18,15 +18,15 @@ namespace OpenVulkano class IGraphicsApp : public ITickable, public ICloseable { private: - IGraphicsAppManager* manager = nullptr; + IGraphicsAppManager* m_manager = nullptr; public: - virtual ~IGraphicsApp() = default; + ~IGraphicsApp() override = default; virtual void Init() = 0; - IGraphicsAppManager* GetGraphicsAppManager() const { return manager; } - void SetGraphicsAppManager(IGraphicsAppManager* manager) { this->manager = manager; } - virtual std::string GetAppName() = 0; - virtual Version GetAppVersion() = 0; + [[nodiscard]] IGraphicsAppManager* GetGraphicsAppManager() const { return m_manager; } + void SetGraphicsAppManager(IGraphicsAppManager* manager) { m_manager = manager; } + [[nodiscard]] virtual std::string GetAppName() const = 0; + [[nodiscard]] virtual Version GetAppVersion() const = 0; }; } diff --git a/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp b/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp index 0872a92..bb1b615 100644 --- a/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp +++ b/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp @@ -42,12 +42,6 @@ namespace OpenVulkano Vector3f_SIMD position = {0, 0, -10}; public: - std::string GetAppName() override - { return "ExampleApp"; } - - OpenVulkano::Version GetAppVersion() override - { return {"v1.0"}; } - void Init() override { auto engineConfig = OpenVulkano::EngineConfiguration::GetEngineConfiguration(); diff --git a/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp b/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp index eee5c10..fe876c2 100644 --- a/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp +++ b/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp @@ -17,5 +17,11 @@ namespace OpenVulkano static IGraphicsApp* Create(); static std::unique_ptr CreateUnique(); + + [[nodiscard]] std::string GetAppName() const final + { return "Cubes ExampleApp"; } + + [[nodiscard]] OpenVulkano::Version GetAppVersion() const final + { return {"v1.0"}; } }; } \ No newline at end of file