Add clone support to ProjectLoader

Author: adazem009

src/projectloader.cpp

@@ -116,6 +116,16 @@ const QList<SpriteModel *> &ProjectLoader::spriteList() const
     return m_sprites;
 }
 
+QQmlListProperty<SpriteModel> ProjectLoader::clones()
+{
+    return QQmlListProperty<SpriteModel>(this, &m_clones);
+}
+
+const QList<SpriteModel *> &ProjectLoader::cloneList() const
+{
+    return m_clones;
+}
+
 void ProjectLoader::start()
 {
     if (m_loadThread.isRunning())
@@ -196,6 +206,7 @@ void ProjectLoader::load()
             SpriteModel *sprite = new SpriteModel;
             sprite->moveToThread(qApp->thread());
             dynamic_cast<Sprite *>(target.get())->setInterface(sprite);
+            connect(sprite, &SpriteModel::cloned, this, &ProjectLoader::addClone);
             m_sprites.push_back(sprite);
         }
     }
@@ -240,6 +251,31 @@ void ProjectLoader::redraw()
         if (renderedTarget)
             renderedTarget->beforeRedraw();
     }
+
+    for (auto sprite : m_clones) {
+        auto renderedTarget = sprite->renderedTarget();
+
+        if (renderedTarget)
+            renderedTarget->beforeRedraw();
+    }
+}
+
+void ProjectLoader::addClone(SpriteModel *model)
+{
+    connect(model, &SpriteModel::cloneDeleted, this, &ProjectLoader::deleteClone);
+    m_clones.push_back(model);
+    emit cloneCreated(model);
+    emit clonesChanged();
+}
+
+void ProjectLoader::deleteClone(SpriteModel *model)
+{
+    m_clones.removeAll(model);
+    emit cloneDeleted(model);
+    Q_ASSERT(model->renderedTarget());
+    model->renderedTarget()->deinitClone();
+    model->deleteLater();
+    emit clonesChanged();
 }
 
 double ProjectLoader::fps() const

src/projectloader.h

@@ -9,6 +9,8 @@
 
 #include "stagemodel.h"
 
+Q_MOC_INCLUDE("spritemodel.h");
+
 namespace scratchcpprender
 {
 
@@ -23,6 +25,7 @@ class ProjectLoader : public QObject
         Q_PROPERTY(libscratchcpp::IEngine *engine READ engine NOTIFY engineChanged)
         Q_PROPERTY(StageModel *stage READ stage NOTIFY stageChanged)
         Q_PROPERTY(QQmlListProperty<SpriteModel> sprites READ sprites NOTIFY spritesChanged)
+        Q_PROPERTY(QQmlListProperty<SpriteModel> clones READ clones NOTIFY clonesChanged)
         Q_PROPERTY(double fps READ fps WRITE setFps NOTIFY fpsChanged)
         Q_PROPERTY(bool turboMode READ turboMode WRITE setTurboMode NOTIFY turboModeChanged)
         Q_PROPERTY(unsigned int stageWidth READ stageWidth WRITE setStageWidth NOTIFY stageWidthChanged)
@@ -49,6 +52,9 @@ class ProjectLoader : public QObject
         QQmlListProperty<SpriteModel> sprites();
         const QList<SpriteModel *> &spriteList() const;
 
+        QQmlListProperty<SpriteModel> clones();
+        const QList<SpriteModel *> &cloneList() const;
+
         Q_INVOKABLE void start();
         Q_INVOKABLE void stop();
 
@@ -81,6 +87,7 @@ class ProjectLoader : public QObject
         void engineChanged();
         void stageChanged();
         void spritesChanged();
+        void clonesChanged();
         void fpsChanged();
         void turboModeChanged();
         void stageWidthChanged();
@@ -89,6 +96,8 @@ class ProjectLoader : public QObject
         void spriteFencingChanged();
         void downloadedAssetsChanged();
         void assetCountChanged();
+        void cloneCreated(SpriteModel *model);
+        void cloneDeleted(SpriteModel *model);
 
     protected:
         void timerEvent(QTimerEvent *event) override;
@@ -98,6 +107,8 @@ class ProjectLoader : public QObject
         void load();
         void initTimer();
         void redraw();
+        void addClone(SpriteModel *model);
+        void deleteClone(SpriteModel *model);
 
         int m_timerId = -1;
         QString m_fileName;
@@ -108,6 +119,7 @@ class ProjectLoader : public QObject
         bool m_loadStatus = false;
         StageModel m_stage;
         QList<SpriteModel *> m_sprites;
+        QList<SpriteModel *> m_clones;
         double m_fps = 30;
         bool m_turboMode = false;
         unsigned int m_stageWidth = 480;

test/clones.sb3

@@ -2,6 +2,7 @@
 #include <projectloader.h>
 #include <spritemodel.h>
 #include <enginemock.h>
+#include <renderedtargetmock.h>
 
 #include "../common.h"
 
@@ -73,6 +74,44 @@ TEST_F(ProjectLoaderTest, Load)
     ASSERT_EQ(sprites[1]->sprite(), engine->targetAt(2));
 }
 
+TEST_F(ProjectLoaderTest, Clones)
+{
+    ProjectLoader loader;
+    QSignalSpy cloneCreatedSpy(&loader, &ProjectLoader::cloneCreated);
+    QSignalSpy cloneDeletedSpy(&loader, &ProjectLoader::cloneDeleted);
+    QSignalSpy clonesChangedSpy(&loader, &ProjectLoader::clonesChanged);
+    load(&loader, "clones.sb3");
+    ASSERT_TRUE(cloneCreatedSpy.empty());
+    ASSERT_TRUE(cloneDeletedSpy.empty());
+    ASSERT_TRUE(clonesChangedSpy.empty());
+
+    auto engine = loader.engine();
+    engine->run();
+    ASSERT_EQ(cloneCreatedSpy.count(), 3);
+    ASSERT_EQ(cloneDeletedSpy.count(), 0);
+    ASSERT_EQ(clonesChangedSpy.count(), 3);
+
+    const auto &sprites = loader.spriteList();
+    const auto &clones = loader.cloneList();
+    ASSERT_EQ(sprites.size(), 1);
+    ASSERT_EQ(clones.size(), 3);
+    ASSERT_EQ(clones[0]->sprite()->cloneSprite(), sprites[0]->sprite());
+    ASSERT_EQ(clones[1]->sprite()->cloneSprite(), sprites[0]->sprite());
+    ASSERT_EQ(clones[2]->sprite()->cloneSprite(), sprites[0]->sprite());
+
+    RenderedTargetMock target1, target2, target3;
+    clones[0]->setRenderedTarget(&target1);
+    clones[1]->setRenderedTarget(&target2);
+    clones[2]->setRenderedTarget(&target3);
+
+    EXPECT_CALL(target2, deinitClone());
+    clones[1]->sprite()->deleteClone();
+    ASSERT_EQ(cloneCreatedSpy.count(), 3);
+    ASSERT_EQ(cloneDeletedSpy.count(), 1);
+    ASSERT_EQ(clonesChangedSpy.count(), 4);
+    ASSERT_EQ(clones.size(), 2);
+}
+
 TEST_F(ProjectLoaderTest, StartStop)
 {
     ProjectLoader loader;