Refactor config and logging

.github/workflows/quality.yml

@@ -150,7 +150,7 @@ jobs:
         continue-on-error: true
 
       - name: Run clang-tidy
-        if: ${{ steps.check-compile-commands.outcome == 'success' }} && ${{ steps.list-files.outcome == 'success' }}
+        if: ${{ steps.check-compile-commands.outcome == 'success' && steps.list-files.outcome == 'success' }}
         shell: bash
         run: |
           cat files.txt | xargs clang-tidy --quiet --config-file=.clang-tidy -p=${{ github.workspace }}/build

.gitignore

@@ -45,3 +45,6 @@ dev/
 # Logging
 logs/
 *.log
+
+# Configuration
+config/config.ini

.vscode/settings.json

@@ -5,7 +5,7 @@
     "C_Cpp.loggingLevel": "Debug",
     //
     "clangd.arguments": [
-        "-log=verbose",
+        "--log=verbose",
         "--clang-tidy",
     ],
     //

.vscode/tasks.json

@@ -1,7 +1,4 @@
 {
-    //! Executing tasks on Windows requires Git Bash (or other unix-like shell) to be installed.
-    // Default shell on Windows is either Powershell or CMD, which do not support grep or xargs.
-    // Basically it is easier to require specific shell than to maintain multiplatform tasks.
     "version": "2.0.0",
     "tasks": [
         {
@@ -17,17 +14,17 @@
                 "clear": true,
                 "panel": "dedicated",
                 "reveal": "silent",
-                "showReuseMessage": false,
-            },
+                "showReuseMessage": false
+            }
         },
         {
-            "label": "Run clang-tidy",
+            "label": "Run clang-tidy (all files)",
             "detail": "Run clang-tidy on all C++ files in src/ directory.",
             "type": "shell",
             "command": "cmake -P ./cmake/clang-tidy.cmake",
             "icon": {
                 "color": "terminal.ansiCyan",
-                "id": "sparkle",
+                "id": "sparkle"
             },
             "problemMatcher": {
                 "source": "clang-tidy",
@@ -42,26 +39,60 @@
                         "column": 3,
                         "severity": 4,
                         "message": 5,
-                        "code": 6,
+                        "code": 6
                     }
-                ],
+                ]
             },
             "presentation": {
                 "clear": true,
                 "panel": "dedicated",
                 "reveal": "silent",
-                "showReuseMessage": false,
+                "showReuseMessage": false
+            }
+        },
+        {
+            "label": "Run clang-tidy (current file)",
+            "detail": "Run clang-tidy on the currently active open file.",
+            "type": "shell",
+            "command": "clang-tidy --quiet --config-file=.clang-tidy -p=build/ ${file}",
+            "icon": {
+                "color": "terminal.ansiWhite",
+                "id": "sparkle"
+            },
+            "problemMatcher": {
+                "source": "clang-tidy",
+                "owner": "clang-tidy",
+                "applyTo": "openDocuments",
+                "fileLocation": "absolute",
+                "pattern": [
+                    {
+                        "regexp": "^(.*):([0-9]{1,6}):([0-9]{1,6}):\\s([a-z]+):\\s(.*)\\[(.*)\\]$",
+                        "file": 1,
+                        "line": 2,
+                        "column": 3,
+                        "severity": 4,
+                        "message": 5,
+                        "code": 6
+                    }
+                ]
             },
+            "presentation": {
+                "clear": true,
+                "echo": true,
+                "panel": "dedicated",
+                "reveal": "silent",
+                "showReuseMessage": false
+            }
         },
         {
             "label": "Setup hooks",
             "detail": "Copy git hooks to .git/hooks/ directory.",
             "type": "shell",
             "linux": {
-                "command": "cp -r .githooks/* .git/hooks/",
+                "command": "cp -r .githooks/* .git/hooks/"
             },
             "windows": {
-                "command": "Copy-Item -Path '.githooks/*' -Destination '.git/hooks/' -Exclude '.*'",
+                "command": "Copy-Item -Path '.githooks/*' -Destination '.git/hooks/' -Exclude '.*'"
             },
             "icon": {
                 "color": "terminal.ansiYellow",
@@ -70,7 +101,7 @@
             "presentation": {
                 "clear": true,
                 "reveal": "silent",
-                "showReuseMessage": false,
+                "showReuseMessage": false
             },
             "hide": true,
             "runOptions": {
@@ -95,7 +126,7 @@
                 "clear": true,
                 "panel": "dedicated",
                 "reveal": "silent",
-                "showReuseMessage": false,
+                "showReuseMessage": false
             }
         },
         {
@@ -116,7 +147,7 @@
                 "clear": true,
                 "panel": "dedicated",
                 "reveal": "silent",
-                "showReuseMessage": false,
+                "showReuseMessage": false
             }
         }
     ]

CMakeLists.txt

@@ -27,7 +27,7 @@ endif()
 if(CMAKE_BUILD_TYPE EQUAL "")
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 endif()
-string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "Debug" DEBUG_MODE)
+string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "Debug" DEBUG_BUILD)
 
 include(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
 

src/engine/CMakeLists.txt

@@ -5,7 +5,7 @@ project(MONOENGINE LANGUAGES CXX C)
 if(CMAKE_BUILD_TYPE EQUAL "")
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 endif()
-string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "Debug" DEBUG_MODE)
+string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "Debug" DEBUG_BUILD)
 
 option(MOLD_LINKER_PATH "Path to the mold linker executable (Unix only)" "")
 
@@ -70,6 +70,7 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/module/resource")
 add_subdirectory("${PROJECT_SOURCE_DIR}/module/time")
 add_subdirectory("${PROJECT_SOURCE_DIR}/module/config")
 add_subdirectory("${PROJECT_SOURCE_DIR}/module/util")
+add_subdirectory("${PROJECT_SOURCE_DIR}/module/dev_ui")
 
 
 # Use mold linker if present in the system (to speed up linking time)

src/engine/module/audio/CMakeLists.txt

@@ -3,9 +3,9 @@ include_guard()
 add_library(mono_module_audio)
 add_library(mono::audio ALIAS mono_module_audio)
 
-if(DEBUG_MODE)
+if(DEBUG_BUILD)
     target_compile_definitions(mono_module_audio
-        PRIVATE "DEBUG_MODE"
+        PRIVATE "DEBUG_BUILD"
     )
 endif()
 

src/engine/module/camera/CMakeLists.txt

@@ -3,10 +3,9 @@ include_guard()
 add_library(mono_module_camera)
 add_library(mono::camera ALIAS mono_module_camera)
 
-if(DEBUG_MODE)
+if(DEBUG_BUILD)
     target_compile_definitions(mono_module_camera
-
-        PRIVATE "DEBUG_MODE"
+        PRIVATE "DEBUG_BUILD"
     )
 endif()
 

src/engine/module/config/CMakeLists.txt

@@ -9,14 +9,21 @@ target_compile_features(mono_module_config
 
 target_sources(mono_module_config
     PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/ConfigLoader.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/Config.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/ConfigItem.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/ConfigStorage.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/CallbackGuard.cpp"
 )
 
 target_include_directories(mono_module_config
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/mono"
     INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
 
 target_link_libraries(mono_module_config
     PUBLIC inifile::inifile
            spdlog::spdlog
+           glm::glm
+           mono::traits
+           mono::log
 )

src/engine/module/config/include/mono/config/CallbackGuard.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+namespace mono::config
+{
+
+class ConfigItem;
+
+class CallbackGuard
+{
+    public:
+    explicit CallbackGuard(ConfigItem& config_item);
+    ~CallbackGuard() noexcept;
+
+    CallbackGuard(const CallbackGuard& other) = delete;
+    CallbackGuard(CallbackGuard&& other) noexcept = delete;
+    CallbackGuard& operator=(const CallbackGuard& other) = delete;
+    CallbackGuard& operator=(CallbackGuard&& other) noexcept = delete;
+
+    private:
+    ConfigItem& m_configItem;
+};
+
+}  // namespace mono::config

src/engine/module/config/include/mono/config/Config.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <inicpp.h>
+
+#include "ConfigStorage.hpp"
+#include "mono/log/priv/BufferedSink.hpp"
+#include "priv/StaticConfiguration.hpp"  // IWYU pragma: export
+#include "priv/converters/GlmVec2Converter.hpp"  // IWYU pragma: export
+#include "priv/converters/SpdlogLevelConverter.hpp"  // IWYU pragma: export
+
+namespace mono::config
+{
+
+
+namespace priv
+{
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+inline std::shared_ptr<log::priv::BufferedSink> buffered_sink;
+
+}  // namespace priv
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+inline ConfigStorage runtime;
+
+void initialize();
+
+}  // namespace mono::config