fix: compilation errors

.clang-format

@@ -0,0 +1,3 @@
+BasedOnStyle: LLVM
+IndentWidth: 2
+BreakBeforeBraces: Allman

.gitignore

@@ -7,6 +7,7 @@
 !/tests
 
 # Include files
+!/.clang-format
 !/.gitignore
 !/CMakeLists.txt
 !/Makefile

include/engine/core/engine.hpp

@@ -1,10 +1,10 @@
 #ifndef __MCS_ENGINE_HPP__
 #define __MCS_ENGINE_HPP__
 
+#include <cstdint>
+#include <engine/core/engine_db_provider.hpp>
 #include <engine/core/engine_module.hpp>
 #include <engine/core/engine_module_api.hpp>
-#include <engine/core/engine_db_provider.hpp>
-#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -12,8 +12,6 @@
 class MscEngine : public IMscEngineModuleAPI
 {
 private:
-  using clock = std::chrono::steady_clock;
-
   /// @brief Loaded modules list
   std::vector<std::shared_ptr<MscEngineModule>> _modules;
 
@@ -39,10 +37,12 @@ public:
   void stop();
 
   MscEventBus &getBus() override;
-  std::unordered_map<std::string, std::uint16_t> getLoadedModules() const override;
+  std::unordered_map<std::string, std::uint16_t>
+  getLoadedModules() const override;
   MscEngineModule &getModule(const std::string &name) override;
   std::unique_ptr<MscEngineDBProvider> createDBProvider() override;
-  std::unique_ptr<MscEngineDBProvider> createDBProvider(const std::string &filepath) override;
+  std::unique_ptr<MscEngineDBProvider>
+  createDBProvider(const std::string &filepath) override;
 };
 
 #endif // __MCS_ENGINE_HPP__

include/engine/core/engine_module.hpp

@@ -1,8 +1,8 @@
 #ifndef __MCS_ENGINE_MODULE_HPP__
 #define __MCS_ENGINE_MODULE_HPP__
 
-#include "engine/utils/rev_range.hpp"
 #include "engine/core/engine_module_api.hpp"
+#include "engine/utils/rev_range.hpp"
 #include <cstdint>
 #include <string>
 #include <unordered_map>
@@ -34,7 +34,8 @@ public:
   /// @brief Engine update cycle step
   /// @param engine engine public API for modules
   /// @param dt loop delta
-  virtual void onUpdate(IMscEngineModuleAPI &engine, float dt) = 0;
+  virtual void onUpdate(IMscEngineModuleAPI &engine,
+                        IMscEngineModuleAPI::clock::duration dt) = 0;
 
   /// @brief Engine stop event handler
   /// @param engine engine public API for modules

include/engine/core/engine_module_api.hpp

@@ -1,25 +1,28 @@
 #ifndef __MSC_ENGINE_MODULE_API_HPP__
 #define __MSC_ENGINE_MODULE_API_HPP__
 
+#include <cstdint>
 #include <engine/core/engine_bus.hpp>
 #include <engine/core/engine_db_provider.hpp>
-#include <cstdint>
+#include <memory>
 #include <string>
 #include <unordered_map>
-#include <memory>
 
 class MscEngineModule;
 
 class IMscEngineModuleAPI
 {
 public:
+  using clock = std::chrono::steady_clock;
+
   virtual ~IMscEngineModuleAPI() = default;
 
   /// @brief Get access to engine event bus
   virtual MscEventBus &getBus() = 0;
 
   /// @brief Get access to loaded module list
-  virtual std::unordered_map<std::string, std::uint16_t> getLoadedModules() const = 0;
+  virtual std::unordered_map<std::string, std::uint16_t>
+  getLoadedModules() const = 0;
 
   /// @brief Access module by its name
   virtual MscEngineModule &getModule(const std::string &name) = 0;
@@ -28,7 +31,8 @@ public:
   virtual std::unique_ptr<MscEngineDBProvider> createDBProvider() = 0;
 
   /// @brief Create database provider with file database
-  virtual std::unique_ptr<MscEngineDBProvider> createDBProvider(const std::string &filepath) = 0;
+  virtual std::unique_ptr<MscEngineDBProvider>
+  createDBProvider(const std::string &filepath) = 0;
 };
 
 #endif // __MSC_ENGINE_MODULE_API_HPP__

include/engine/modules/test1/test1.hpp

@@ -1,21 +0,0 @@
-#ifndef __MSC_TEST_1_MODULE_HPP__
-#define __MSC_TEST_1_MODULE_HPP__
-
-#include "engine/core/engine_module.hpp"
-#include "engine/core/engine_module_api.hpp"
-#include <cstdint>
-
-class Test1Module : public MscEngineModule
-{
-public:
-  ~Test1Module() = default;
-
-  std::string getName() const override;
-  uint16_t getRev() const override;
-  const std::unordered_map<std::string, MscRevisionRange> &
-  getDependencies() const override;
-
-  void onInitialize(IMscEngineModuleAPI &engine) override;
-};
-
-#endif // __MSC_TEST_1_MODULE_HPP__

src/engine/core/engine.cpp

@@ -1,12 +1,16 @@
+#include "engine/core/engine_module_api.hpp"
+#include <chrono>
 #include <cstdint>
 #include <engine/core/engine.hpp>
+#include <functional>
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <thread>
 #include <unordered_map>
 #include <vector>
 
-uint16_t MscEngine::REV = 0;
+std::uint16_t MscEngine::REV = 1;
 
 MscEngine::MscEngine(std::vector<std::shared_ptr<MscEngineModule>> modules)
 {
@@ -64,13 +68,42 @@ void MscEngine::start()
   _isRunning = true;
   _lastUpdate = clock::now();
 
-  double accumulator = 0.0;
+  for (auto &m : _modules)
-  constexpr double fixedDt = 1.0 / 30.0;
+    m->onStart(*this);
+
+  constexpr auto tickDuration = std::chrono::milliseconds(50);
+  auto nextTick = clock::now();
+
+  using UpdateFn = std::function<void(IMscEngineModuleAPI & engine,
+                                      IMscEngineModuleAPI::clock::duration dt)>;
+  std::vector<UpdateFn> updateFns;
+  updateFns.reserve(_modules.size());
+
+  for (auto &m : _modules)
+    updateFns.emplace_back([m](IMscEngineModuleAPI &engine,
+                               IMscEngineModuleAPI::clock::duration dt)
+                           { m->onUpdate(engine, dt); });
 
   while (_isRunning)
   {
-    //
+    nextTick += tickDuration;
+    const auto currentTick = clock::now();
+    const auto dt = currentTick - _lastUpdate;
+
+    // TODO: process
+
+    for (auto upd : updateFns)
+      upd(*this, dt);
+
+    _lastUpdate = currentTick;
+
+    std::this_thread::sleep_until(nextTick);
+    if (clock::now() > nextTick + std::chrono::seconds(1))
+      nextTick = clock::now();
   }
+
+  for (auto &m : _modules)
+    m->onStop(*this);
 }
 
 void MscEngine::stop()
@@ -81,12 +114,10 @@ void MscEngine::stop()
   _isRunning = false;
 }
 
-MscEventBus &MscEngine::getBus()
+MscEventBus &MscEngine::getBus() { return _bus; }
-{
-  return _bus;
-}
 
-std::unordered_map<std::string, std::uint16_t> MscEngine::getLoadedModules() const
+std::unordered_map<std::string, std::uint16_t>
+MscEngine::getLoadedModules() const
 {
   std::unordered_map<std::string, std::uint16_t> result;
   for (const auto &module : _modules)
@@ -117,7 +148,8 @@ std::unique_ptr<MscEngineDBProvider> MscEngine::createDBProvider()
   return std::make_unique<MscEngineDBProvider>();
 }
 
-std::unique_ptr<MscEngineDBProvider> MscEngine::createDBProvider(const std::string &filepath)
+std::unique_ptr<MscEngineDBProvider>
+MscEngine::createDBProvider(const std::string &filepath)
 {
   return std::make_unique<MscEngineDBProvider>(filepath);
 }

src/main.cpp

@@ -1,16 +1,9 @@
-#include "engine/modules/test1/test1.hpp"
 #include <cstdio>
 #include <engine/core/engine.hpp>
-#include <memory>
 #include <stdlib.h>
-#include <vector>
 
 int main(int argc, char **argv)
 {
-  auto engine =
+  printf("Hello, engine!\n");
-      std::make_unique<MscEngine>(std::vector<std::shared_ptr<MscEngineModule>>{
-          std::make_shared<Test1Module>()});
-
-  printf("Hello, CMake, %p!\n", &engine);
   return 0;
 }

tests/engine/engine_test.cpp

@@ -1,71 +1,70 @@
 #include <cassert>
-#include <string>
 #include <cstdint>
-#include <memory>
-#include <stdexcept>
-#include <unordered_map>
-#include <engine/utils/rev_range.hpp>
 #include <engine/core/engine.hpp>
 #include <engine/core/engine_module.hpp>
+#include <engine/utils/rev_range.hpp>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
 
 class FirstTestModuleR1 : public MscEngineModule
 {
 public:
-    std::string getName() const override
+  std::string getName() const override { return "first_tmod"; };
-    {
-        return "first_tmod";
-    };
 
-    std::uint16_t getRev() const override
+  std::uint16_t getRev() const override { return 1; }
-    {
-        return 1;
-    }
 
-    const std::unordered_map<std::string, MscRevisionRange> &getDependencies() const override
+  const std::unordered_map<std::string, MscRevisionRange> &
+  getDependencies() const override
   {
     static const std::unordered_map<std::string, MscRevisionRange> deps{};
     return deps;
   }
 
   void onInitialize(IMscEngineModuleAPI &engine) override {}
+  void onStart(IMscEngineModuleAPI &engine) override {}
+  void onUpdate(IMscEngineModuleAPI &engine,
+                IMscEngineModuleAPI::clock::duration dt) override
+  {
+  }
+  void onStop(IMscEngineModuleAPI &engine) override {}
+  void onDestory(IMscEngineModuleAPI &engine) override {}
 };
 
 class FirstTestModuleR2 : public MscEngineModule
 {
 public:
-    std::string getName() const override
+  std::string getName() const override { return "first_tmod"; };
-    {
-        return "first_tmod";
-    };
 
-    std::uint16_t getRev() const override
+  std::uint16_t getRev() const override { return 2; }
-    {
-        return 2;
-    }
 
-    const std::unordered_map<std::string, MscRevisionRange> &getDependencies() const override
+  const std::unordered_map<std::string, MscRevisionRange> &
+  getDependencies() const override
   {
     static const std::unordered_map<std::string, MscRevisionRange> deps{};
     return deps;
   }
 
   void onInitialize(IMscEngineModuleAPI &engine) override {}
+  void onStart(IMscEngineModuleAPI &engine) override {}
+  void onUpdate(IMscEngineModuleAPI &engine,
+                IMscEngineModuleAPI::clock::duration dt) override
+  {
+  }
+  void onStop(IMscEngineModuleAPI &engine) override {}
+  void onDestory(IMscEngineModuleAPI &engine) override {}
 };
 
 class SecondTestModuleE1 : public MscEngineModule
 {
 public:
-    std::string getName() const override
+  std::string getName() const override { return "second_tmod"; }
-    {
-        return "second_tmod";
-    }
 
-    std::uint16_t getRev() const override
+  std::uint16_t getRev() const override { return 1; }
-    {
-        return 1;
-    }
 
-    const std::unordered_map<std::string, MscRevisionRange> &getDependencies() const override
+  const std::unordered_map<std::string, MscRevisionRange> &
+  getDependencies() const override
   {
     static const std::unordered_map<std::string, MscRevisionRange> deps{
         {"first_tmod", MscRevisionRange{1, 1}}};
@@ -73,22 +72,24 @@ public:
   }
 
   void onInitialize(IMscEngineModuleAPI &engine) override {}
+  void onStart(IMscEngineModuleAPI &engine) override {}
+  void onUpdate(IMscEngineModuleAPI &engine,
+                IMscEngineModuleAPI::clock::duration dt) override
+  {
+  }
+  void onStop(IMscEngineModuleAPI &engine) override {}
+  void onDestory(IMscEngineModuleAPI &engine) override {}
 };
 
 class SecondTestModuleE2 : public MscEngineModule
 {
 public:
-    std::string getName() const override
+  std::string getName() const override { return "second_tmod"; }
-    {
-        return "second_tmod";
-    }
 
-    std::uint16_t getRev() const override
+  std::uint16_t getRev() const override { return 1; }
-    {
-        return 1;
-    }
 
-    const std::unordered_map<std::string, MscRevisionRange> &getDependencies() const override
+  const std::unordered_map<std::string, MscRevisionRange> &
+  getDependencies() const override
   {
     static const std::unordered_map<std::string, MscRevisionRange> deps{
         {"first_tmod", MscRevisionRange{1, 2}}};
@@ -96,6 +97,13 @@ public:
   }
 
   void onInitialize(IMscEngineModuleAPI &engine) override {}
+  void onStart(IMscEngineModuleAPI &engine) override {}
+  void onUpdate(IMscEngineModuleAPI &engine,
+                IMscEngineModuleAPI::clock::duration dt) override
+  {
+  }
+  void onStop(IMscEngineModuleAPI &engine) override {}
+  void onDestory(IMscEngineModuleAPI &engine) override {}
 };
 
 void testSatisfiedModules()