Merge remote-tracking branch 'refs/remotes/origin/game-editor' into g…

…ame-editor
maelbecel · Jan 9, 2024 · fffeffd · fffeffd
2 parents f810cda + 87fc64e
commit fffeffd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 34 deletions.
diff --git a/Exodia/src/Layer/EditorLayer.hpp b/Exodia/src/Layer/EditorLayer.hpp
@@ -88,7 +88,7 @@ namespace Exodia {
         Scope<ContentBrowser> _ContentBrowser;
         SceneHierarchy _SceneHierarchy;
         StatistcsPanel _StatisticsPanel;
-        Console        _Console;
+        Console _Console;
 
         // Entity
         GameObject _HoveredEntity;

diff --git a/Exodia/src/Panel/Console/Console.cpp b/Exodia/src/Panel/Console/Console.cpp
@@ -14,8 +14,7 @@ namespace Exodia {
     // Methods //
     /////////////
 
-    void Console::OnImGuiRender()
-    {
+    void Console::OnImGuiRender() {
         ImGui::Begin("Console");
 
         for (std::string &log : GetLogs())
@@ -28,10 +27,9 @@ namespace Exodia {
     // Getters & Setters //
     ///////////////////////
 
-    std::vector<std::string> Console::GetLogs()
-    {
+    std::vector<std::string> Console::GetLogs() {
         LogHistory coreHistory = Log::GetCoreLoggerHistory();
-        std::vector <std::string> logs;
+        std::vector<std::string> logs;
 
         for (const std::string &logFileName : coreHistory.GetLogs()) {
             std::ifstream logFile(logFileName);
@@ -47,4 +45,4 @@ namespace Exodia {
 
         return logs;
     }
-};
+}; // namespace Exodia
diff --git a/Exodia/src/Panel/Console/Console.hpp b/Exodia/src/Panel/Console/Console.hpp
@@ -6,11 +6,11 @@
 */
 
 #ifndef CONSOLE_HPP_
-    #define CONSOLE_HPP_
+#define CONSOLE_HPP_
 
-    // External includes
-    #include <vector>
-    #include <string>
+// External includes
+#include <vector>
+#include <string>
 
 namespace Exodia {
 
@@ -19,25 +19,22 @@ namespace Exodia {
         //////////////////////////////
         // Constructor & Destructor //
         //////////////////////////////
-        public:
-
-            Console() = default;
-            ~Console() = default;
+      public:
+        Console() = default;
+        ~Console() = default;
 
         /////////////
         // Methods //
         /////////////
-        public:
+      public:
+        void OnImGuiRender();
 
-            void OnImGuiRender();
-
         ///////////////////////
         // Getters & Setters //
         ///////////////////////
-        private:
-
-            std::vector<std::string> GetLogs();
+      private:
+        std::vector<std::string> GetLogs();
     };
-};
+}; // namespace Exodia
 
 #endif /* !CONSOLE_HPP_ */
diff --git a/Library/Debug/src/Logger/Log.cpp b/Library/Debug/src/Logger/Log.cpp
@@ -59,8 +59,7 @@ namespace Exodia {
     // Getters & Setters //
     ///////////////////////
 
-    LogHistory Log::GetCoreLoggerHistory()
-    {
+    LogHistory Log::GetCoreLoggerHistory() {
         LogHistory history;
 
         for (const auto &sink : _CoreLogger->sinks()) {
@@ -70,8 +69,7 @@ namespace Exodia {
         return history;
     }
 
-    LogHistory Log::GetClientLoggerHistory()
-    {
+    LogHistory Log::GetClientLoggerHistory() {
         LogHistory history;
 
         for (const auto &sink : _ClientLogger->sinks()) {

diff --git a/Library/Debug/src/Logger/Log.hpp b/Library/Debug/src/Logger/Log.hpp
@@ -20,15 +20,9 @@ namespace Exodia {
     struct LogHistory {
         std::vector<std::string> Logs;
 
-        void AddLog(const std::string &log)
-        {
-            Logs.push_back(log);
-        }
+        void AddLog(const std::string &log) { Logs.push_back(log); }
 
-        const std::vector<std::string> &GetLogs() const
-        {
-            return Logs;
-        }
+        const std::vector<std::string> &GetLogs() const { return Logs; }
     };
 
     /**