Use Clock in Engine

Author: adazem009

src/engine/internal/engine.cpp

@@ -17,18 +17,19 @@
 #include <scratchcpp/keyevent.h>
 #include <cassert>
 #include <iostream>
-#include <thread>
 
 #include "engine.h"
 #include "blocksectioncontainer.h"
 #include "timer.h"
+#include "clock.h"
 #include "../../blocks/standardblocks.h"
 
 using namespace libscratchcpp;
 
 Engine::Engine() :
     m_defaultTimer(std::make_unique<Timer>()),
-    m_timer(m_defaultTimer.get())
+    m_timer(m_defaultTimer.get()),
+    m_clock(Clock::instance().get())
 {
 }
 
@@ -354,7 +355,7 @@ void Engine::run()
     start();
 
     while (true) {
-        auto lastFrameTime = std::chrono::steady_clock::now();
+        auto lastFrameTime = m_clock->currentSteadyTime();
         m_skipFrame = false;
 
         // Execute the frame
@@ -363,13 +364,13 @@ void Engine::run()
             break;
 
         // Sleep until the time for the next frame
-        auto currentTime = std::chrono::steady_clock::now();
+        auto currentTime = m_clock->currentSteadyTime();
         auto elapsedTime = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - lastFrameTime);
         auto sleepTime = m_frameDuration - elapsedTime;
         bool timeOut = sleepTime <= std::chrono::milliseconds::zero();
 
         if (!timeOut && !m_skipFrame)
-            std::this_thread::sleep_for(sleepTime);
+            m_clock->sleep(sleepTime);
 
         if ((m_skipFrame && timeOut) || !m_skipFrame) {
             // TODO: Repaint here

src/engine/internal/engine.h

@@ -15,6 +15,7 @@ namespace libscratchcpp
 {
 
 class Entity;
+class IClock;
 
 class Engine : public IEngine
 {
@@ -116,6 +117,8 @@ class Engine : public IEngine
         BlockSectionContainer *blockSectionContainer(const std::string &opcode) const;
         BlockSectionContainer *blockSectionContainer(IBlockSection *section) const;
 
+        IClock *m_clock = nullptr;
+
     private:
         void finalize();
         void deleteClones();

test/engine/engine_test.cpp

@@ -10,11 +10,18 @@
 #include "../common.h"
 #include "testsection.h"
 #include "engine/internal/engine.h"
+#include "engine/internal/clock.h"
 
 using namespace libscratchcpp;
 
 // NOTE: resolveIds() and compile() are tested in load_project_test
 
+TEST(EngineTest, Clock)
+{
+    Engine engine;
+    ASSERT_EQ(engine.m_clock, Clock::instance().get());
+}
+
 TEST(EngineTest, Clear)
 {
     Engine engine;