From c7928af6831183f1878c6c4d8875a2d017f8eefc Mon Sep 17 00:00:00 2001 From: Joey Pollack Date: Mon, 16 May 2022 18:24:37 -0400 Subject: [PATCH] Logger updated with static functions for each log level Platform terminal class implemented - allows changing terminal colors (test on linux) CoreLogListener implemented to use the terminal colors --- CMakeLists.txt | 5 +- docs/tasks/core.todo | 44 ++++-- src/core/common_defs.h | 10 ++ src/core/core.cpp | 36 ++++- src/core/core.h | 9 ++ src/core/run_mode.h | 2 +- src/core/state.h | 2 +- src/core/version.h | 2 +- src/graphics/graphics.h | 2 +- src/graphics/opengl/glGraphics.cpp | 2 +- src/graphics/opengl/glText.h | 2 +- src/input/inputManager.cpp | 2 +- src/input/keyboard.h | 2 +- src/internal_libs/assets/loaders/assetIndex.h | 2 +- src/internal_libs/gui/file_browser.h | 2 +- src/internal_libs/gui/gui.h | 2 +- src/internal_libs/gui/logGui.h | 2 +- src/internal_libs/gui/luaConsole.h | 2 +- src/main.cpp | 2 +- src/{window => platform}/keyCodes.h | 0 src/platform/terminal.cpp | 134 ++++++++++++++++++ src/platform/terminal.h | 48 +++++++ src/{window => platform}/window.cpp | 0 src/{window => platform}/window.h | 2 +- .../editor/contents/content_manager.h | 2 +- src/run_modes/editor/contents/editor_asset.h | 2 +- src/run_modes/editor/contents/tile_map.h | 2 +- src/run_modes/editor/editor.h | 2 +- src/run_modes/editor/panel_manager.h | 2 +- src/run_modes/editor/project.h | 2 +- .../editor/tools/map_editor/map_editor.h | 2 +- src/run_modes/game/world/world.h | 2 +- src/scripting/coreAPI.h | 2 +- src/scripting/scriptManager.h | 2 +- src/test_main.cpp | 2 +- src/utils/{opRes.cpp => op_res.cpp} | 2 +- src/utils/{opRes.h => op_res.h} | 0 37 files changed, 299 insertions(+), 41 deletions(-) rename src/{window => platform}/keyCodes.h (100%) create mode 100644 src/platform/terminal.cpp create mode 100644 src/platform/terminal.h rename src/{window => platform}/window.cpp (100%) rename src/{window => platform}/window.h (97%) rename src/utils/{opRes.cpp => op_res.cpp} (98%) rename src/utils/{opRes.h => op_res.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a99f184..7d2dd2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,8 +68,9 @@ set(LUNARIUM_SRC "src/utils/helpers.cpp" "src/utils/highResTimer.cpp" "src/utils/logger.cpp" -"src/utils/opRes.cpp" -"src/window/window.cpp" +"src/utils/op_res.cpp" +"src/platform/window.cpp" +"src/platform/terminal.cpp" "src/graphics/opengl/glGraphics.cpp" "src/graphics/opengl/glText.cpp" "src/graphics/opengl/glShader.cpp" diff --git a/docs/tasks/core.todo b/docs/tasks/core.todo index 2ac33d9..c04d4af 100644 --- a/docs/tasks/core.todo +++ b/docs/tasks/core.todo @@ -8,14 +8,19 @@ Build System: Core: ☐ Research EnTT for the ECS (https://github.com/skypjack/entt/) - ☐ Add Terminal subsystem to allow for printing colored text in a cross-platform way - ☐ Create a LogListener that uses the colored text (replace the current stdout listener) + ✔ Add Terminal subsystem to allow for printing colored text in a cross-platform way @done(22-05-16 18:05) + ✔ Create a LogListener that uses the colored text (replace the current stdout listener) @done(22-05-16 18:23) ☐ Replace XML with JSON (https://github.com/nlohmann/json) @high ☐ Move internal libs back into the core and refactor @high + ✔ Utils @done(22-05-13 17:29) + ☐ assets + ☐ gui ☐ Replace the File Browser (imgui) class with the NFD library (https://github.com/btzy/nativefiledialog-extended) @high ☐ For scripting switch to Wren instead of LUA (https://github.com/wren-lang/wren) @high ☐ Remove SOL ☐ Add log settings to the state file + ✔ Refactor log system to use separate log level methods instead of passing log level @done(22-05-12 16:46) + ✔ Add log level options to config script @done(22-05-12 16:46) ✔ Add run modes (Editor, Game, Test) to state file @done (9/15/2021, 7:27:03 PM) ✔ Add run mode interface class @done (9/15/2021, 8:22:35 PM) ✔ Read the window size and position on shutdown and write these to the state file @done (2/8/2022, 4:39:37 PM) @@ -38,6 +43,31 @@ Core: ✔ Add Roboto-Regular.ttf as an internal font @high @done (11/3/2021, 8:35:51 PM) ✔ Allow an image size to be passed in for rendering to an image @high @done (2/3/2022, 4:07:33 PM) + Scripting: + ☐ Replace LUA with Wren for scripting + + Script Managment class: + ✘ Manage LUA states @cancelled(22-05-13 17:31) + ☐ Initialize new scripts + ☐ Run given script with given state + ☐ Add any generated errors to the Script object + + Interface Class (Core API): + ☐ Provide Methods that give access to the C++ code + + ECS: + ☐ Research using ECS with a quadtree (regions will essentially be out quadtree) + ☐ Use 1 Entt registry with a component that stores the region ID (Index?) + ☐ Entity class - Store a reference to the registry? + Components: + ☐ Transform (store decomposed matrix) + ☐ Sprite Renderer + ☐ Scripts + Physics: + ☐ Rigid Body (Box2D) + ☐ Box Collider (Box2D) + + World (Lunariums version of a "Scene"): GUI: ✔ Dear ImGui class with basic initialization @done (9/10/2021, 1:42:19 PM) @@ -69,15 +99,7 @@ Core: ☐ Add OpenAL to the project ☐ Design Audio API - Scripting: - Script Managment class: - ☐ Manage LUA states - ☐ Initialize new scripts - ☐ Run given script with given state - ☐ Add any generated errors to the Script object - - Interface Class: - ☐ Provide Methods that give access to the C++ code + Utils: ✔ Make Logger fully static (no need to ever GetInstance) @done (10/26/2021, 4:43:55 PM) diff --git a/src/core/common_defs.h b/src/core/common_defs.h index e3c7944..949b88c 100644 --- a/src/core/common_defs.h +++ b/src/core/common_defs.h @@ -39,4 +39,14 @@ static_assert(sizeof(i64) == 8, "Expected i64 to be 8 bytes"); static_assert(sizeof(f32) == 4, "Expected f32 to be 4 bytes"); static_assert(sizeof(f64) == 8, "Expected f64 to be 8 bytes"); + +// Platform detection +#if defined(_WIN32) || defined(_WIN64) + #define LPLATFORM_WINDOWS +#elif defined(__linux__) || defined(__gnu_linux__) + #define LPLATFORM_LINUX +#else + #error "Unsupported platform. Must build on windows or linux" +#endif + #endif // LUNARIUM_COMMON_DEFS_H_ \ No newline at end of file diff --git a/src/core/core.cpp b/src/core/core.cpp index fbee2bc..2e1c5f9 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -14,12 +14,14 @@ #include #include +#include + // Run modes #include #include // Sub Systems -#include +#include #include #include #include @@ -433,4 +435,36 @@ namespace lunarium delete mPanels[id]; mPanels[id] = nullptr; } + + CoreLogListener::CoreLogListener(uint32_t acceptedLogLevels, uint32_t acceptedLogCategories, const char* myName) + : LogListener(acceptedLogLevels, acceptedLogCategories, myName) + { + } + + bool CoreLogListener::Log(LogMessage& message) + { + if (!LevelIsSet(message.LogLevel) || + !CategoryIsSet(message.LogCategory)) + return false; + + std::cout << std::endl; + + switch (message.LogLevel) + { + case LogLevel::GRAPHICS_INTERNAL_ERROR: + case LogLevel::FATAL_ERROR: + case LogLevel::ERROR: + std::cout << Terminal::Color(TermColor::TC_RED); break; + case LogLevel::WARNING: std::cout << Terminal::Color(TermColor::TC_YELLOW); break; + case LogLevel::INFO: std::cout << Terminal::Color(TermColor::TC_GREEN); break; + case LogLevel::DEBUG: std::cout << Terminal::Color(TermColor::TC_BLUE); break; + case LogLevel::TRACE: std::cout << Terminal::Color(TermColor::TC_CYAN); break; + case LogLevel::GRAPHICS_INTERNAL_DEBUG: break; + + } + + std::cout << Logger::TimeStamp() << Logger::GetCategoryName(message.LogCategory) + << Logger::GetLevelName(message.LogLevel) << message.Message << Terminal::Color(TermColor::TC_DEFAULT) << std::flush; + return true; + } } \ No newline at end of file diff --git a/src/core/core.h b/src/core/core.h index 6e81d24..0fc3322 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -98,6 +98,15 @@ namespace lunarium TestBed* mpTester; }; + + class CoreLogListener : public LogListener + { + public: + CoreLogListener(u32 acceptedLogLevels = LogLevel::ANY, + u32 acceptedLogCategories = LogCategory::ANY, const char* myName = "CoreLogListener"); + bool Log(LogMessage& message); + }; + } #endif // CORE_H_ \ No newline at end of file diff --git a/src/core/run_mode.h b/src/core/run_mode.h index e6d3c4b..92bbfa6 100644 --- a/src/core/run_mode.h +++ b/src/core/run_mode.h @@ -9,7 +9,7 @@ #ifndef RUN_MODE_H_ #define RUN_MODE_H_ -#include +#include #include #include diff --git a/src/core/state.h b/src/core/state.h index 7fd5cc5..a48ea6d 100644 --- a/src/core/state.h +++ b/src/core/state.h @@ -10,7 +10,7 @@ #define STATE_H_ #include -#include +#include namespace lunarium { diff --git a/src/core/version.h b/src/core/version.h index fa00066..462f7ed 100644 --- a/src/core/version.h +++ b/src/core/version.h @@ -14,7 +14,7 @@ #include -#include +#include namespace lunarium { diff --git a/src/graphics/graphics.h b/src/graphics/graphics.h index d22dd7c..e66b8d2 100644 --- a/src/graphics/graphics.h +++ b/src/graphics/graphics.h @@ -11,7 +11,7 @@ #define IGRAPHICS_H_ #include -#include +#include namespace lunarium { diff --git a/src/graphics/opengl/glGraphics.cpp b/src/graphics/opengl/glGraphics.cpp index ec7dbe1..6e2efdd 100644 --- a/src/graphics/opengl/glGraphics.cpp +++ b/src/graphics/opengl/glGraphics.cpp @@ -8,7 +8,7 @@ #include "glGraphics.h" #include "defaultShaders.h" -#include +#include #include #include "../openFontData.h" #include diff --git a/src/graphics/opengl/glText.h b/src/graphics/opengl/glText.h index 5a142b4..4d9db14 100644 --- a/src/graphics/opengl/glText.h +++ b/src/graphics/opengl/glText.h @@ -15,7 +15,7 @@ #include #include #include "glShader.h" -#include +#include #include #include diff --git a/src/input/inputManager.cpp b/src/input/inputManager.cpp index fd7cf07..934975d 100644 --- a/src/input/inputManager.cpp +++ b/src/input/inputManager.cpp @@ -8,7 +8,7 @@ * ******************************************************************************/ -#include +#include #include "inputManager.h" #include #include diff --git a/src/input/keyboard.h b/src/input/keyboard.h index 0a9ae29..8bee03b 100644 --- a/src/input/keyboard.h +++ b/src/input/keyboard.h @@ -14,7 +14,7 @@ #include #include -#include +#include namespace lunarium { diff --git a/src/internal_libs/assets/loaders/assetIndex.h b/src/internal_libs/assets/loaders/assetIndex.h index 427c4bf..54e1e60 100644 --- a/src/internal_libs/assets/loaders/assetIndex.h +++ b/src/internal_libs/assets/loaders/assetIndex.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include namespace lunarium diff --git a/src/internal_libs/gui/file_browser.h b/src/internal_libs/gui/file_browser.h index 29809d5..3a92977 100644 --- a/src/internal_libs/gui/file_browser.h +++ b/src/internal_libs/gui/file_browser.h @@ -14,7 +14,7 @@ #ifndef FILE_SELECT_H_ #define FILE_SELECT_H_ -#include +#include #include #include diff --git a/src/internal_libs/gui/gui.h b/src/internal_libs/gui/gui.h index 21fd894..cc908d2 100644 --- a/src/internal_libs/gui/gui.h +++ b/src/internal_libs/gui/gui.h @@ -9,7 +9,7 @@ #ifndef GUI_H_ #define GUI_H_ -#include +#include struct GLFWwindow; struct ImGuiStyle; diff --git a/src/internal_libs/gui/logGui.h b/src/internal_libs/gui/logGui.h index 81b175e..d5230ee 100644 --- a/src/internal_libs/gui/logGui.h +++ b/src/internal_libs/gui/logGui.h @@ -9,7 +9,7 @@ #ifndef LOG_GUI_H_ #define LOG_GUI_H_ -#include +#include #include #include #include diff --git a/src/internal_libs/gui/luaConsole.h b/src/internal_libs/gui/luaConsole.h index 2c83dfb..1830ca4 100644 --- a/src/internal_libs/gui/luaConsole.h +++ b/src/internal_libs/gui/luaConsole.h @@ -9,7 +9,7 @@ #ifndef LUA_CONSOLE_H_ #define LUA_CONSOLE_H_ -#include +#include #include #include diff --git a/src/main.cpp b/src/main.cpp index c3ebad9..5076aa4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char** argv) #endif // All log messages will go to stdout - lunarium::Logger::GetInstance()->AddListener(new lunarium::StandardListener( + lunarium::Logger::GetInstance()->AddListener(new lunarium::CoreLogListener( ll, lunarium::LogCategory::ANY)); lunarium::Core& core = lunarium::Core::GetInstance(); diff --git a/src/window/keyCodes.h b/src/platform/keyCodes.h similarity index 100% rename from src/window/keyCodes.h rename to src/platform/keyCodes.h diff --git a/src/platform/terminal.cpp b/src/platform/terminal.cpp new file mode 100644 index 0000000..0ddd909 --- /dev/null +++ b/src/platform/terminal.cpp @@ -0,0 +1,134 @@ +/****************************************************************************** +* File - terminal.cpp +* Author - Joey Pollack +* Date - 2022/05/13 (y/m/d) +* Mod Date - 2022/05/13 (y/m/d) +* Description - API for the cross-platform terminal +******************************************************************************/ + +#include "terminal.h" +#include + +#if defined(LPLATFORM_WINDOWS) +#define WIN32_LEAN_AN_MEAN +#include + +#elif defined(LPLATFORM_LINUX) + +#endif + +namespace lunarium +{ + u32 Terminal::WinPrevOutMode; + u32 Terminal::WinPrevInMode; + OpRes Terminal::Initialize() + { + #if defined(LPLATFORM_WINDOWS) + return InitWindowsTerm(); + #elif defined(LPLATFORM_LINUX) + // No init needed for linux + #endif + } + + void Terminal::Shutdown() + { + // Reset colors + std::cout << Color(TermColor::TC_DEFAULT); + + #if defined(LPLATFORM_WINDOWS) + ShutdownWinTerm(); + #elif defined(LPLATFORM_LINUX) + // No shutdown needed for linux + #endif + } + + const char* Terminal::Color(TermColor color) + { + switch (color) + { + case TermColor::TC_WHITE: return "\033[37m"; + case TermColor::TC_BLACK: return "\033[30m"; + case TermColor::TC_BLUE: return "\033[34m"; + case TermColor::TC_CYAN: return "\033[36m"; + case TermColor::TC_GREEN: return "\033[32m"; + case TermColor::TC_MAGENTA: return "\033[35m"; + case TermColor::TC_RED: return "\033[31m"; + case TermColor::TC_YELLOW: return "\033[33m"; + case TermColor::TC_DEFAULT: return "\033[0m"; + } + return ""; + } + + void Terminal::SetDefaultColor() + { + std::cout << "\033[0m"; + } + + OpRes Terminal::InitWindowsTerm() + { + // This code is from microsoft docs: + // https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences + + // Set output mode to handle virtual terminal sequences + HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE); + if (hOut == INVALID_HANDLE_VALUE) + { + return OpRes::Fail("Unable to get std out handle"); + } + HANDLE hIn = GetStdHandle(STD_INPUT_HANDLE); + if (hIn == INVALID_HANDLE_VALUE) + { + return OpRes::Fail("Unable to get std in handle"); + } + + DWORD dwOriginalOutMode = 0; + DWORD dwOriginalInMode = 0; + if (!GetConsoleMode(hOut, &dwOriginalOutMode)) + { + return OpRes::Fail("Unable to get current out console mode"); + } + if (!GetConsoleMode(hIn, &dwOriginalInMode)) + { + return OpRes::Fail("Unable to get current in console mode"); + } + + DWORD dwRequestedOutModes = ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN; + DWORD dwRequestedInModes = ENABLE_VIRTUAL_TERMINAL_INPUT; + + GetConsoleMode(hOut, (LPDWORD)&WinPrevOutMode); + GetConsoleMode(hIn, (LPDWORD)&WinPrevInMode); + + DWORD dwOutMode = dwOriginalOutMode | dwRequestedOutModes; + if (!SetConsoleMode(hOut, dwOutMode)) + { + // we failed to set both modes, try to step down mode gracefully. + dwRequestedOutModes = ENABLE_VIRTUAL_TERMINAL_PROCESSING; + dwOutMode = dwOriginalOutMode | dwRequestedOutModes; + if (!SetConsoleMode(hOut, dwOutMode)) + { + // Failed to set any VT mode, can't do anything here. + return OpRes::Fail("Unable to set console mode"); + } + } + + DWORD dwInMode = dwOriginalInMode | ENABLE_VIRTUAL_TERMINAL_INPUT; + if (!SetConsoleMode(hIn, dwInMode)) + { + // Failed to set VT input mode, can't do anything here. + return OpRes::Fail("Unable to set console mode"); + } + + return OpRes::OK(); + } + + void Terminal::ShutdownWinTerm() + { + // Assume we'll get valid handles since init worked + HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE); + HANDLE hIn = GetStdHandle(STD_INPUT_HANDLE); + + // Reset console mode + SetConsoleMode(hOut, WinPrevOutMode); + SetConsoleMode(hIn, WinPrevInMode); + } +} \ No newline at end of file diff --git a/src/platform/terminal.h b/src/platform/terminal.h new file mode 100644 index 0000000..c514b06 --- /dev/null +++ b/src/platform/terminal.h @@ -0,0 +1,48 @@ +/****************************************************************************** +* File - terminal.h +* Author - Joey Pollack +* Date - 2022/05/13 (y/m/d) +* Mod Date - 2022/05/13 (y/m/d) +* Description - API for the cross-platform terminal +******************************************************************************/ + +#ifndef LUNARIUM_TERMINAL_H_ +#define LUNARIUM_TERMINAL_H_ + +#include +#include + +namespace lunarium +{ + enum TermColor + { + TC_WHITE, + TC_BLACK, + TC_RED, + TC_YELLOW, + TC_GREEN, + TC_BLUE, + TC_CYAN, + TC_MAGENTA, + TC_DEFAULT + }; + + class Terminal + { + public: + static OpRes Initialize(); + static void Shutdown(); + static const char* Color(TermColor color); + static TermColor GetColor(); + static void SetDefaultColor(); + + private: + static OpRes InitWindowsTerm(); + static void ShutdownWinTerm(); + static u32 WinPrevOutMode; + static u32 WinPrevInMode; + + }; +} + +#endif // LUNARIUM_TERMINAL_H_ \ No newline at end of file diff --git a/src/window/window.cpp b/src/platform/window.cpp similarity index 100% rename from src/window/window.cpp rename to src/platform/window.cpp diff --git a/src/window/window.h b/src/platform/window.h similarity index 97% rename from src/window/window.h rename to src/platform/window.h index dd0aae6..5b3cc86 100644 --- a/src/window/window.h +++ b/src/platform/window.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include namespace lunarium { diff --git a/src/run_modes/editor/contents/content_manager.h b/src/run_modes/editor/contents/content_manager.h index 2a8f174..693c74b 100644 --- a/src/run_modes/editor/contents/content_manager.h +++ b/src/run_modes/editor/contents/content_manager.h @@ -14,7 +14,7 @@ #include "definitions.h" #include #include -#include +#include #include #include diff --git a/src/run_modes/editor/contents/editor_asset.h b/src/run_modes/editor/contents/editor_asset.h index ee8be88..a1c8fab 100644 --- a/src/run_modes/editor/contents/editor_asset.h +++ b/src/run_modes/editor/contents/editor_asset.h @@ -13,7 +13,7 @@ #include "content_manager.h" #include #include -#include +#include namespace lunarium { namespace editor { diff --git a/src/run_modes/editor/contents/tile_map.h b/src/run_modes/editor/contents/tile_map.h index a33dc63..ac5a952 100644 --- a/src/run_modes/editor/contents/tile_map.h +++ b/src/run_modes/editor/contents/tile_map.h @@ -11,7 +11,7 @@ #include "definitions.h" #include -#include +#include #include namespace lunarium { class IGraphics; } diff --git a/src/run_modes/editor/editor.h b/src/run_modes/editor/editor.h index c4ba599..618f646 100644 --- a/src/run_modes/editor/editor.h +++ b/src/run_modes/editor/editor.h @@ -10,7 +10,7 @@ #define EDITOR_H_ #include -#include +#include #include "project.h" #include "panel_manager.h" diff --git a/src/run_modes/editor/panel_manager.h b/src/run_modes/editor/panel_manager.h index 10ff1a5..63fc0be 100644 --- a/src/run_modes/editor/panel_manager.h +++ b/src/run_modes/editor/panel_manager.h @@ -9,7 +9,7 @@ #ifndef PANEL_MANAGER_H_ #define PANEL_MANAGER_H_ -#include +#include #include #include #include diff --git a/src/run_modes/editor/project.h b/src/run_modes/editor/project.h index f13edde..9cf39c8 100644 --- a/src/run_modes/editor/project.h +++ b/src/run_modes/editor/project.h @@ -9,7 +9,7 @@ #ifndef PROJECT_H_ #define PROJECT_H_ -#include +#include #include #include diff --git a/src/run_modes/editor/tools/map_editor/map_editor.h b/src/run_modes/editor/tools/map_editor/map_editor.h index ae43ffe..7fd01f2 100644 --- a/src/run_modes/editor/tools/map_editor/map_editor.h +++ b/src/run_modes/editor/tools/map_editor/map_editor.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "../../panel_manager.h" #include #include diff --git a/src/run_modes/game/world/world.h b/src/run_modes/game/world/world.h index 8307ee5..d9242c0 100644 --- a/src/run_modes/game/world/world.h +++ b/src/run_modes/game/world/world.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include namespace lunarium { diff --git a/src/scripting/coreAPI.h b/src/scripting/coreAPI.h index acf0341..c478c28 100644 --- a/src/scripting/coreAPI.h +++ b/src/scripting/coreAPI.h @@ -11,7 +11,7 @@ #ifndef CORE_API_H_ #define CORE_API_H_ -#include +#include namespace lunarium diff --git a/src/scripting/scriptManager.h b/src/scripting/scriptManager.h index ea2f788..e450f0d 100644 --- a/src/scripting/scriptManager.h +++ b/src/scripting/scriptManager.h @@ -12,7 +12,7 @@ #define SCRIPT_MANAGER_H_ #include -#include +#include namespace lunarium { diff --git a/src/test_main.cpp b/src/test_main.cpp index 2bca7ab..532b1c1 100644 --- a/src/test_main.cpp +++ b/src/test_main.cpp @@ -7,7 +7,7 @@ #include #include #include "utils/logger.h" -#include "utils/opRes.h" +#include "utils/op_res.h" #include "core/state.h" #include "core/version.h" #include "utils/args.h" diff --git a/src/utils/opRes.cpp b/src/utils/op_res.cpp similarity index 98% rename from src/utils/opRes.cpp rename to src/utils/op_res.cpp index 2cfeb4d..79cfd77 100644 --- a/src/utils/opRes.cpp +++ b/src/utils/op_res.cpp @@ -8,7 +8,7 @@ ******************************************************************************/ #include "logger.h" -#include "opRes.h" +#include "op_res.h" #include diff --git a/src/utils/opRes.h b/src/utils/op_res.h similarity index 100% rename from src/utils/opRes.h rename to src/utils/op_res.h