Automatically delete clones when the project stops

Author: adazem009

include/scratchcpp/iengine.h

@@ -81,6 +81,9 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /*! Calls the "when I start as a clone" blocks of the given sprite. */
         virtual void initClone(Sprite *clone) = 0;
 
+        /*! Automatically called from clones that are being deleted. */
+        virtual void deinitClone(Sprite *clone) = 0;
+
         /*!
          * Runs the event loop and calls "when green flag clicked" blocks.
          * \note This function returns when all scripts finish.\n

src/engine/internal/engine.cpp

@@ -32,11 +32,17 @@ Engine::Engine() :
 {
 }
 
+Engine::~Engine()
+{
+    m_clones.clear();
+}
+
 void Engine::clear()
 {
     m_sections.clear();
     m_targets.clear();
     m_broadcasts.clear();
+    m_clones.clear();
 }
 
 // Resolves ID references and sets pointers of entities.
@@ -172,6 +178,11 @@ void Engine::frame()
 
 void Engine::start()
 {
+    if (m_running)
+        finalize();
+
+    deleteClones();
+
     m_timer->reset();
     m_running = true;
 
@@ -184,9 +195,8 @@ void Engine::start()
 
 void Engine::stop()
 {
-    m_runningScripts.clear();
-    m_scriptsToRemove.clear();
-    m_running = false;
+    finalize();
+    deleteClones();
 }
 
 void Engine::startScript(std::shared_ptr<Block> topLevelBlock, std::shared_ptr<Target> target)
@@ -328,6 +338,14 @@ void Engine::initClone(Sprite *clone)
             m_runningScripts.push_back(vm);
         }
     }
+
+    assert(std::find(m_clones.begin(), m_clones.end(), clone) == m_clones.end());
+    m_clones.push_back(clone);
+}
+
+void Engine::deinitClone(Sprite *clone)
+{
+    m_clones.erase(std::remove(m_clones.begin(), m_clones.end(), clone), m_clones.end());
 }
 
 void Engine::run()
@@ -360,7 +378,7 @@ void Engine::run()
         lastFrameTime = currentTime;
     }
 
-    stop();
+    finalize();
 }
 
 bool Engine::isRunning() const
@@ -879,6 +897,31 @@ BlockSectionContainer *Engine::blockSectionContainer(IBlockSection *section) con
     return nullptr;
 }
 
+void Engine::finalize()
+{
+    m_runningScripts.clear();
+    m_scriptsToRemove.clear();
+    m_running = false;
+}
+
+void Engine::deleteClones()
+{
+    m_clones.clear();
+
+    for (auto target : m_targets) {
+        Sprite *sprite = dynamic_cast<Sprite *>(target.get());
+
+        if (sprite) {
+            std::vector<std::shared_ptr<Sprite>> clones = sprite->children();
+
+            for (auto clone : clones) {
+                assert(clone);
+                clone->~Sprite();
+            }
+        }
+    }
+}
+
 void Engine::updateFrameDuration()
 {
     m_frameDuration = std::chrono::milliseconds(static_cast<long>(1000 / m_fps));

src/engine/internal/engine.h

@@ -21,6 +21,7 @@ class Engine : public IEngine
     public:
         Engine();
         Engine(const Engine &) = delete;
+        ~Engine();
 
         void clear() override;
         void resolveIds();
@@ -35,6 +36,7 @@ class Engine : public IEngine
         void stopScript(VirtualMachine *vm) override;
         void stopTarget(Target *target, VirtualMachine *exceptScript) override;
         void initClone(libscratchcpp::Sprite *clone) override;
+        void deinitClone(libscratchcpp::Sprite *clone) override;
         void run() override;
 
         bool isRunning() const override;
@@ -109,6 +111,8 @@ class Engine : public IEngine
         BlockSectionContainer *blockSectionContainer(IBlockSection *section) const;
 
     private:
+        void finalize();
+        void deleteClones();
         std::shared_ptr<Block> getBlock(const std::string &id);
         std::shared_ptr<Variable> getVariable(const std::string &id);
         std::shared_ptr<List> getList(const std::string &id);
@@ -142,6 +146,7 @@ class Engine : public IEngine
         bool m_mousePressed = false;
         unsigned int m_stageWidth = 480;
         unsigned int m_stageHeight = 360;
+        std::vector<Sprite *> m_clones;
 
         bool m_running = false;
         bool m_breakFrame = false;

src/scratch/sprite.cpp

@@ -23,6 +23,16 @@ Sprite::Sprite() :
 Sprite::~Sprite()
 {
     if (isClone()) {
+        IEngine *eng = engine();
+
+        if (eng) {
+            eng->deinitClone(this);
+
+            auto children = allChildren();
+            for (auto child : children)
+                eng->deinitClone(child.get());
+        }
+
         assert(impl->cloneParent);
         impl->cloneParent->impl->removeClone(this);
     }

test/mocks/enginemock.h

@@ -23,6 +23,7 @@ class EngineMock : public IEngine
         MOCK_METHOD(void, stopScript, (VirtualMachine *), (override));
         MOCK_METHOD(void, stopTarget, (Target *, VirtualMachine *), (override));
         MOCK_METHOD(void, initClone, (Sprite *), (override));
+        MOCK_METHOD(void, deinitClone, (Sprite *), (override));
         MOCK_METHOD(void, run, (), (override));
 
         MOCK_METHOD(bool, isRunning, (), (const, override));