Prepare ProjectLoader for running projects in main thread

Author: adazem009

src/projectloader.cpp

@@ -12,11 +12,6 @@
 using namespace scratchcpprender;
 using namespace libscratchcpp;
 
-void runEventLoop(IEngine *engine)
-{
-    engine->runEventLoop();
-}
-
 ProjectLoader::ProjectLoader(QObject *parent) :
     QObject(parent)
 {
@@ -33,12 +28,6 @@ ProjectLoader::ProjectLoader(QObject *parent) :
     });
 
     initTimer();
-
-    // Update refresh rate when primary screen changes
-    connect(qApp, &QApplication::primaryScreenChanged, this, [this]() {
-        killTimer(m_timerId);
-        initTimer();
-    });
 }
 
 ProjectLoader::~ProjectLoader()
@@ -48,11 +37,6 @@ ProjectLoader::~ProjectLoader()
     if (m_loadThread.isRunning())
         m_loadThread.waitForFinished();
 
-    if (m_engine && m_eventLoopEnabled) {
-        m_engine->stopEventLoop();
-        m_eventLoop.waitForFinished();
-    }
-
     for (SpriteModel *sprite : m_sprites)
         sprite->deleteLater();
 }
@@ -72,11 +56,6 @@ void ProjectLoader::setFileName(const QString &newFileName)
 
     m_fileName = newFileName;
 
-    if (m_engine) {
-        m_engine->stopEventLoop();
-        m_eventLoop.waitForFinished();
-    }
-
     m_project.setScratchVersion(ScratchVersion::Scratch3);
     m_project.setFileName(m_fileName.toStdString());
     m_loadStatus = false;
@@ -164,17 +143,8 @@ void ProjectLoader::timerEvent(QTimerEvent *event)
     if (m_loadThread.isRunning())
         return;
 
-    auto stageRenderedTarget = m_stage.renderedTarget();
-
-    if (stageRenderedTarget)
-        stageRenderedTarget->updateProperties();
-
-    for (auto sprite : m_sprites) {
-        auto renderedTarget = sprite->renderedTarget();
-
-        if (renderedTarget)
-            renderedTarget->updateProperties();
-    }
+    if (m_engine)
+        m_engine->step();
 
     event->accept();
 }
@@ -213,7 +183,7 @@ void ProjectLoader::load()
     m_engine->setCloneLimit(m_cloneLimit);
     m_engine->setSpriteFencingEnabled(m_spriteFencing);
 
-    auto handler = std::bind(&ProjectLoader::emitTick, this);
+    auto handler = std::bind(&ProjectLoader::redraw, this);
     m_engine->setRedrawHandler(std::function<void()>(handler));
 
     // Load targets
@@ -240,12 +210,6 @@ void ProjectLoader::load()
         return;
     }
 
-    // Run event loop
-    m_engine->setSpriteFencingEnabled(false);
-
-    if (m_eventLoopEnabled)
-        m_eventLoop = QtConcurrent::run(&runEventLoop, m_engine);
-
     m_engineMutex.unlock();
 
     emit loadStatusChanged();
@@ -257,28 +221,15 @@ void ProjectLoader::load()
 
 void ProjectLoader::initTimer()
 {
-    QScreen *screen = qApp->primaryScreen();
-
-    if (screen)
-        m_timerId = startTimer(1000 / screen->refreshRate());
+    m_timerId = startTimer(1000 / m_fps);
 }
 
-void ProjectLoader::emitTick()
+void ProjectLoader::redraw()
 {
     if (m_loadThread.isRunning())
         m_loadThread.waitForFinished();
 
-    auto stageRenderedTarget = m_stage.renderedTarget();
-
-    if (stageRenderedTarget)
-        stageRenderedTarget->loadProperties();
-
-    for (auto sprite : m_sprites) {
-        auto renderedTarget = sprite->renderedTarget();
-
-        if (renderedTarget)
-            renderedTarget->loadProperties();
-    }
+    // TODO: Call beforeRedraw() of targets
 }
 
 double ProjectLoader::fps() const
@@ -299,6 +250,9 @@ void ProjectLoader::setFps(double newFps)
     } else
         m_fps = newFps;
 
+    killTimer(m_timerId);
+    initTimer();
+
     m_engineMutex.unlock();
     emit fpsChanged();
 }
@@ -405,32 +359,6 @@ void ProjectLoader::setSpriteFencing(bool newSpriteFencing)
     emit spriteFencingChanged();
 }
 
-bool ProjectLoader::eventLoopEnabled() const
-{
-    return m_eventLoopEnabled;
-}
-
-void ProjectLoader::setEventLoopEnabled(bool newEventLoopEnabled)
-{
-    if (m_eventLoopEnabled == newEventLoopEnabled)
-        return;
-
-    m_eventLoopEnabled = newEventLoopEnabled;
-    m_engineMutex.lock();
-
-    if (m_engine) {
-        if (m_eventLoopEnabled)
-            m_eventLoop = QtConcurrent::run(&runEventLoop, m_engine);
-        else {
-            m_engine->stopEventLoop();
-            m_eventLoop.waitForFinished();
-        }
-    }
-
-    m_engineMutex.unlock();
-    emit eventLoopEnabledChanged();
-}
-
 unsigned int ProjectLoader::downloadedAssets() const
 {
     return m_downloadedAssets;

src/projectloader.h

@@ -29,7 +29,6 @@ class ProjectLoader : public QObject
         Q_PROPERTY(unsigned int stageHeight READ stageHeight WRITE setStageHeight NOTIFY stageHeightChanged)
         Q_PROPERTY(int cloneLimit READ cloneLimit WRITE setCloneLimit NOTIFY cloneLimitChanged)
         Q_PROPERTY(bool spriteFencing READ spriteFencing WRITE setSpriteFencing NOTIFY spriteFencingChanged)
-        Q_PROPERTY(bool eventLoopEnabled READ eventLoopEnabled WRITE setEventLoopEnabled NOTIFY eventLoopEnabledChanged)
         Q_PROPERTY(unsigned int downloadedAssets READ downloadedAssets NOTIFY downloadedAssetsChanged)
         Q_PROPERTY(unsigned int assetCount READ assetCount NOTIFY assetCountChanged)
 
@@ -71,9 +70,6 @@ class ProjectLoader : public QObject
         bool spriteFencing() const;
         void setSpriteFencing(bool newSpriteFencing);
 
-        bool eventLoopEnabled() const;
-        void setEventLoopEnabled(bool newEventLoopEnabled);
-
         unsigned int downloadedAssets() const;
 
         unsigned int assetCount() const;
@@ -91,7 +87,6 @@ class ProjectLoader : public QObject
         void stageHeightChanged();
         void cloneLimitChanged();
         void spriteFencingChanged();
-        void eventLoopEnabledChanged();
         void downloadedAssetsChanged();
         void assetCountChanged();
 
@@ -102,7 +97,7 @@ class ProjectLoader : public QObject
         static void callLoad(ProjectLoader *loader);
         void load();
         void initTimer();
-        void emitTick();
+        void redraw();
 
         int m_timerId = -1;
         QString m_fileName;
@@ -113,14 +108,12 @@ class ProjectLoader : public QObject
         bool m_loadStatus = false;
         StageModel m_stage;
         QList<SpriteModel *> m_sprites;
-        QFuture<void> m_eventLoop;
         double m_fps = 30;
         bool m_turboMode = false;
         unsigned int m_stageWidth = 480;
         unsigned int m_stageHeight = 360;
         int m_cloneLimit = 300;
         bool m_spriteFencing = true;
-        bool m_eventLoopEnabled = true;
         std::atomic<unsigned int> m_downloadedAssets = 0;
         std::atomic<unsigned int> m_assetCount = 0;
         std::atomic<bool> m_stopLoading = false;

test/projectloader/projectloader_test.cpp

@@ -17,7 +17,6 @@ class ProjectLoaderTest : public testing::Test
         {
             static const std::chrono::milliseconds timeout(5000);
             auto startTime = std::chrono::steady_clock::now();
-            loader->setEventLoopEnabled(false);
             QSignalSpy fileNameSpy(loader, &ProjectLoader::fileNameChanged);
             QSignalSpy loadStatusSpy(loader, &ProjectLoader::loadStatusChanged);
             QSignalSpy loadingFinishedSpy(loader, &ProjectLoader::loadingFinished);
@@ -89,10 +88,20 @@ TEST_F(ProjectLoaderTest, StartStop)
     loader.stop();
 }
 
+TEST_F(ProjectLoaderTest, TimerEvent)
+{
+    ProjectLoader loader;
+    EngineMock engine;
+    loader.setEngine(&engine);
+    QTimerEvent event(0);
+
+    EXPECT_CALL(engine, step());
+    QCoreApplication::sendEvent(&loader, &event);
+}
+
 TEST_F(ProjectLoaderTest, Fps)
 {
     ProjectLoader loader;
-    loader.setEventLoopEnabled(false);
     EngineMock engine;
     loader.setEngine(&engine);
     ASSERT_EQ(loader.fps(), 30);
@@ -114,7 +123,6 @@ TEST_F(ProjectLoaderTest, Fps)
 TEST_F(ProjectLoaderTest, TurboMode)
 {
     ProjectLoader loader;
-    loader.setEventLoopEnabled(false);
     EngineMock engine;
     loader.setEngine(&engine);
     ASSERT_FALSE(loader.turboMode());
@@ -135,7 +143,6 @@ TEST_F(ProjectLoaderTest, TurboMode)
 TEST_F(ProjectLoaderTest, StageWidth)
 {
     ProjectLoader loader;
-    loader.setEventLoopEnabled(false);
     EngineMock engine;
     loader.setEngine(&engine);
     ASSERT_EQ(loader.stageWidth(), 480);
@@ -150,7 +157,6 @@ TEST_F(ProjectLoaderTest, StageWidth)
 TEST_F(ProjectLoaderTest, StageHeight)
 {
     ProjectLoader loader;
-    loader.setEventLoopEnabled(false);
     EngineMock engine;
     loader.setEngine(&engine);
     ASSERT_EQ(loader.stageHeight(), 360);
@@ -165,7 +171,6 @@ TEST_F(ProjectLoaderTest, StageHeight)
 TEST_F(ProjectLoaderTest, CloneLimit)
 {
     ProjectLoader loader;
-    loader.setEventLoopEnabled(false);
     EngineMock engine;
     loader.setEngine(&engine);
     ASSERT_EQ(loader.cloneLimit(), 300);
@@ -187,7 +192,6 @@ TEST_F(ProjectLoaderTest, CloneLimit)
 TEST_F(ProjectLoaderTest, SpriteFencing)
 {
     ProjectLoader loader;
-    loader.setEventLoopEnabled(false);
     EngineMock engine;
     loader.setEngine(&engine);
     ASSERT_TRUE(loader.spriteFencing());
@@ -204,29 +208,3 @@ TEST_F(ProjectLoaderTest, SpriteFencing)
     ASSERT_EQ(spy.count(), 1);
     ASSERT_TRUE(loader.spriteFencing());
 }
-
-TEST_F(ProjectLoaderTest, EventLoopEnabled)
-{
-    ProjectLoader loader;
-    EngineMock engine;
-    loader.setEngine(&engine);
-    ASSERT_TRUE(loader.eventLoopEnabled());
-
-    EXPECT_CALL(engine, stopEventLoop());
-    QSignalSpy spy(&loader, SIGNAL(eventLoopEnabledChanged()));
-    loader.setEventLoopEnabled(false);
-    ASSERT_EQ(spy.count(), 1);
-    ASSERT_FALSE(loader.eventLoopEnabled());
-
-    EXPECT_CALL(engine, runEventLoop());
-    spy.clear();
-    loader.setEventLoopEnabled(true);
-    ASSERT_EQ(spy.count(), 1);
-    ASSERT_TRUE(loader.eventLoopEnabled());
-
-    EXPECT_CALL(engine, stopEventLoop());
-    spy.clear();
-    loader.setEventLoopEnabled(false);
-    ASSERT_EQ(spy.count(), 1);
-    ASSERT_FALSE(loader.eventLoopEnabled());
-}