Crash in Engine destructor fixed

engine/includes/editor/assetmanager.h

@@ -5,6 +5,8 @@
 #include <QTimer>
 #include <QImage>
 
+#include <set>
+
 #include <engine.h>
 #include <module.h>
 #include <url.h>

engine/includes/editor/codebuilder.h

@@ -1,6 +1,8 @@
 #ifndef CODEBUILDER_H
 #define CODEBUILDER_H
 
+#include <set>
+
 #include "assetconverter.h"
 
 class QAbstractItemModel;

engine/includes/editor/projectsettings.h

@@ -1,6 +1,8 @@
 #ifndef PROJECTSETTINGS_H
 #define PROJECTSETTINGS_H
 
+#include <set>
+
 #include <engine.h>
 
 #include <resources/map.h>

engine/includes/engine.h

@@ -127,10 +127,12 @@ class ENGINE_EXPORT Engine : public ObjectSystem {
     void removeNativeBehaviour(NativeBehaviour *native);
 
 private:
+    friend class System;
+
     bool event(Event *event) override;
 
     static void addSystem(System *system);
-
+    static void removeSystem(System *system);
 };
 
 #endif // ENGINE_H

engine/includes/system.h

@@ -14,6 +14,7 @@ class ENGINE_EXPORT System : public ObjectSystem {
 
 public:
     System();
+    ~System();
 
     virtual bool init();
 

engine/src/engine.cpp

@@ -181,11 +181,13 @@ Engine::Engine(const char *path) {
 Engine::~Engine() {
     PROFILE_FUNCTION();
 
-    for(auto it : m_serial) {
+    auto localSerial = m_serial;
+    for(auto it : localSerial) {
         delete it;
     }
 
-    for(auto it : m_pool) {
+    auto localPool = m_pool;
+    for(auto it : localPool) {
         delete it->m_system;
         delete it;
     }
@@ -610,6 +612,21 @@ void Engine::addSystem(System *system) {
         m_resourceSystem = static_cast<ResourceSystem *>(system);
     }
 }
+/*!
+    Removes a game \a system from pool.
+*/
+void Engine::removeSystem(System *system) {
+    PROFILE_FUNCTION();
+
+    m_serial.remove(system);
+
+    for(auto it : m_pool) {
+        if(it->m_system == system) {
+            m_pool.remove(it);
+            break;
+        }
+    }
+}
 /*!
     Returns game World.
     \note The game can have only one scene graph. World is a root object, all map loads on this World.

engine/src/system.cpp

@@ -22,6 +22,11 @@ System::System() :
     m_world(nullptr) {
 
 }
+
+System::~System() {
+    Engine::removeSystem(this);
+}
+
 /*!
     Can be used to initialize and execute necessary routines.
     This method will be called automatically just after the engine started.

modules/renders/rendervk/src/wrappervk.cpp

@@ -3,6 +3,8 @@
 #include <log.h>
 #include <engine.h>
 
+#include <set>
+
 #if defined(SHARED_DEFINE)
 #include <QDebug>
 

thirdparty/next/inc/core/objectsystem.h

@@ -20,8 +20,6 @@
 #define OBJECTSYSTEM_H
 
 #include <unordered_map>
-#include <set>
-#include <memory>
 #include <thread>
 
 #include <astring.h>

worldeditor/src/screens/scenecomposer/actions/changeobjectproperty.cpp

@@ -3,6 +3,8 @@
 #include <components/actor.h>
 #include <components/component.h>
 
+#include <set>
+
 ChangeObjectProperty::ChangeObjectProperty(const Object::ObjectList &objects, const TString &property, const Variant &value, ObjectController *ctrl, const TString &name, UndoCommand *group) :
         UndoCommand(name, group),
         m_value(value),

worldeditor/src/screens/scenecomposer/actions/createobject.cpp

@@ -3,6 +3,8 @@
 #include <components/scene.h>
 #include <components/actor.h>
 
+#include <set>
+
 CreateObject::CreateObject(const TString &type, Scene *scene, ObjectController *ctrl, UndoCommand *group) :
         UndoCommand(QObject::tr("Create %1").arg(type.data()).toStdString(), group),
         m_type(type),

worldeditor/src/screens/scenecomposer/actions/createobjectserial.cpp

@@ -7,6 +7,8 @@
 
 #include <log.h>
 
+#include <set>
+
 CreateObjectSerial::CreateObjectSerial(const TString &ref, const Vector3 &position, uint32_t parent, ObjectController *ctrl, const TString &name, UndoCommand *group) :
         UndoCommand(name, group),
         m_reference(ref),

worldeditor/src/screens/scenecomposer/objectcontroller.cpp

@@ -423,7 +423,9 @@ bool ObjectController::setIsolatedPrefab(Prefab *prefab) {
         if(actor) {
             onSelectActor({actor});
 
-            onFocusActor(actor);
+            float bottom;
+            setFocusOn(actor, bottom);
+
             blockMovement(true);
             setFree(false);
         } else {
@@ -504,11 +506,6 @@ void ObjectController::onRemoveActor(Object::ObjectList objects) {
     undoRedo()->push(new DeleteObjects(objects, this));
 }
 
-void ObjectController::onFocusActor(Object *object) {
-    float bottom;
-    setFocusOn(dynamic_cast<Actor *>(object), bottom);
-}
-
 void ObjectController::onChangeTool() {
     std::string name(sender()->objectName().toStdString());
     for(auto &it : m_tools) {
@@ -564,7 +561,7 @@ void ObjectController::onUpdateSelected() {
 void ObjectController::onDrop(QDropEvent *event) {
     StringList list = TString(event->mimeData()->data(gMimeContent)).split(";");
     AssetManager *mgr = AssetManager::instance();
-    for(TString str : list) {
+    for(TString &str : list) {
         if(!str.isEmpty()) {
             if(mgr->assetTypeName(str) == Map::metaClass()->name()) {
                 emit dropMap((ProjectSettings::instance()->contentPath() + "/" + str).data(), (event->keyboardModifiers() & Qt::ControlModifier));

worldeditor/src/screens/scenecomposer/objectcontroller.h

@@ -71,8 +71,6 @@ public slots:
     void onSelectActor(Object::ObjectList list, bool additive = false);
     void onRemoveActor(Object::ObjectList objects);
 
-    void onFocusActor(Object *object);
-
     void onChangeTool();
 
     void onUpdated(Scene *scene = nullptr);

worldeditor/src/screens/scenecomposer/scenecomposer.cpp

@@ -329,7 +329,8 @@ void SceneComposer::onObjectCreate(TString type) {
 
 void SceneComposer::onObjectsSelected(Object::ObjectList objects, bool force) {
     if(force) {
-        m_controller->onFocusActor(objects.front());
+        float bottom;
+        m_controller->setFocusOn(dynamic_cast<Actor *>(objects.front()), bottom);
     }
 
     m_controller->onSelectActor(objects);