Systems destructor fix

Author: eprikazchikov

engine/includes/resources/resource.h

@@ -28,7 +28,6 @@ class ENGINE_EXPORT Resource : public Object {
 public:
     Resource();
     Resource(const Resource &origin);
-    ~Resource() override;
 
     State state() const;
 

engine/includes/systems/resourcesystem.h

@@ -54,6 +54,8 @@ class ENGINE_EXPORT ResourceSystem : public System {
 
     void processState(Resource *resource);
 
+    void removeObject(Object *object) override;
+
 private:
     ResourceSystem::Dictionary m_indexMap;
 

engine/src/engine.cpp

@@ -181,6 +181,15 @@ Engine::Engine(const char *path) {
 Engine::~Engine() {
     PROFILE_FUNCTION();
 
+    for(auto it : m_serial) {
+        delete it;
+    }
+
+    for(auto it : m_pool) {
+        delete it->m_system;
+        delete it;
+    }
+
     delete m_threadPool;
 
     if(m_platform) {

engine/src/resources/resource.cpp

@@ -48,12 +48,6 @@ Resource::Resource(const Resource &origin) :
         m_referenceCount(origin.m_referenceCount) {
 
 }
-
-Resource::~Resource() {
-    //assert(m_referenceCount == 0);
-
-    Engine::resourceSystem()->deleteFromCahe(this);
-}
 /*!
     Subscribes \a callback for \a object to handle resource status.
     Increases reference count.

engine/src/systems/resourcesystem.cpp

@@ -281,6 +281,12 @@ void ResourceSystem::processState(Resource *resource) {
     }
 }
 
+void ResourceSystem::removeObject(Object *object) {
+    ObjectSystem::removeObject(object);
+
+    deleteFromCahe(static_cast<Resource *>(object));
+}
+
 Resource *ResourceSystem::resource(TString &path) const {
     {
         auto it = m_indexMap.find(path);