From bab7fc8f12dd88556fcd96a9e2a7b6bffd46132c Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Sun, 29 Dec 2024 20:37:49 +0100 Subject: [PATCH] Added missing virtual destructors --- Engine/Graphics/UI.hpp | 4 ++-- Engine/World/DbgCube.hpp | 2 +- Engine/World/Tank.hpp | 2 +- Engine/World/WorldObject.hpp | 1 + Engine/World/WorldObject.tpp | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Engine/Graphics/UI.hpp b/Engine/Graphics/UI.hpp index ba1f68d..9fa9c9c 100644 --- a/Engine/Graphics/UI.hpp +++ b/Engine/Graphics/UI.hpp @@ -36,7 +36,7 @@ inline UI::~UI() {} class CockpitUI final : public UI { public: CockpitUI(unsigned int w, unsigned int h); - ~CockpitUI() {} + ~CockpitUI() override {} CockpitUI(CockpitUI&&) = default; CockpitUI& operator= (CockpitUI&&) = default; @@ -54,7 +54,7 @@ private: class WorldUI final : public UI { public: WorldUI(unsigned int w, unsigned int h, std::shared_ptr& engineInstance); - ~WorldUI() {} + ~WorldUI() override {} WorldUI(WorldUI&&) = default; WorldUI& operator= (WorldUI&&) = default; diff --git a/Engine/World/DbgCube.hpp b/Engine/World/DbgCube.hpp index 1f52eca..52fca14 100644 --- a/Engine/World/DbgCube.hpp +++ b/Engine/World/DbgCube.hpp @@ -6,7 +6,7 @@ class ObjectDbgCube final : public WorldObjectAbstract { public: ObjectDbgCube(); - ~ObjectDbgCube() {} + ~ObjectDbgCube() override {} private: diff --git a/Engine/World/Tank.hpp b/Engine/World/Tank.hpp index 4ff5a13..163bd36 100644 --- a/Engine/World/Tank.hpp +++ b/Engine/World/Tank.hpp @@ -6,7 +6,7 @@ class Tank final : public WorldObjectAbstract { public: Tank(); - ~Tank() {} + ~Tank() override {} private: diff --git a/Engine/World/WorldObject.hpp b/Engine/World/WorldObject.hpp index 3e5f42d..119a8f3 100644 --- a/Engine/World/WorldObject.hpp +++ b/Engine/World/WorldObject.hpp @@ -5,6 +5,7 @@ class WorldObject { public: + virtual ~WorldObject() = 0; virtual const Mesh& GetObjectMesh() const = 0; virtual const size_t GetObjectVerticesCount() const = 0; const M3D_MATRIX GetTransform() noexcept { diff --git a/Engine/World/WorldObject.tpp b/Engine/World/WorldObject.tpp index 4b23c7a..4e51d80 100644 --- a/Engine/World/WorldObject.tpp +++ b/Engine/World/WorldObject.tpp @@ -1,6 +1,8 @@ #include "WorldObject.hpp" +inline WorldObject::~WorldObject() {} + template inline WorldObjectAbstract::~WorldObjectAbstract() {}