From d79258e191fc1176a515c0b767b0ad7df93e0b26 Mon Sep 17 00:00:00 2001
From: Jiga228 <danilkorshikov80@mail.ru>
Date: Sat, 18 Oct 2025 16:39:43 +0700
Subject: [PATCH] Refactor

---
 Core/Core/RenderEngine/ModelManager.cpp |  4 ++--
 Core/Core/RenderEngine/RenderEngine.cpp |  4 ++--
 Core/Log/Log.cpp                        | 12 ++++++------
 Core/Log/Log.hpp                        | 11 +++++++----
 TestGame/src/Actors/TestActor.cpp       |  2 +-
 TestGame/src/Worlds/TestWorld.cpp       |  7 +++++--
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Core/Core/RenderEngine/ModelManager.cpp b/Core/Core/RenderEngine/ModelManager.cpp
index 121ccd8..5d51dcd 100644
--- a/Core/Core/RenderEngine/ModelManager.cpp
+++ b/Core/Core/RenderEngine/ModelManager.cpp
@@ -51,7 +51,7 @@ unsigned int ModelManager::FNV1aHash(const char* buf)
 
 void ModelManager::OnDestroySometimeModelCaller(const std::string& name)
 {
-    Log("Free model: " + name);
+    Loging::Log("Free model: " + name);
     OnDestroySometimeModel.Call(name);
 }
 
@@ -76,7 +76,7 @@ ModelManager::StaticModel* ModelManager::LoadModel(const std::string& name)
         return counter->second.model;
     }
 
-    Log("Load new model: " + name);
+    Loging::Log("Load new model: " + name);
     
     std::vector<Voxel> model_data;
     // Load model_data
diff --git a/Core/Core/RenderEngine/RenderEngine.cpp b/Core/Core/RenderEngine/RenderEngine.cpp
index 7d643f2..141482a 100644
--- a/Core/Core/RenderEngine/RenderEngine.cpp
+++ b/Core/Core/RenderEngine/RenderEngine.cpp
@@ -27,7 +27,7 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(
 
     std::string msg = "validation layer: ";
     msg += pCallbackData->pMessage;
-    Log(msg);
+    Loging::Log(msg);
 
     return VK_FALSE;
 }
@@ -338,7 +338,7 @@ void RenderEngine::pick_physical_device()
                 physical_device_ = device;
                 VkPhysicalDeviceProperties device_properties;
                 vkGetPhysicalDeviceProperties(physical_device_, &device_properties);
-                Log("Using device: " + std::string(device_properties.deviceName));
+                Loging::Log("Using device: " + std::string(device_properties.deviceName));
                 break;
             }
         }
diff --git a/Core/Log/Log.cpp b/Core/Log/Log.cpp
index 8bae583..e31faa3 100644
--- a/Core/Log/Log.cpp
+++ b/Core/Log/Log.cpp
@@ -6,34 +6,34 @@
 std::mutex mOutput;
 
 #ifdef _DEBUG
-void Log(const char* msg)
+void Loging::Log(const char* msg)
 {
     std::lock_guard lock(mOutput);
     std::cout << msg << '\n';
 }
 
-void Log(const std::string& msg)
+void Loging::Log(const std::string& msg)
 {
     std::lock_guard lock(mOutput);
     std::cout << msg << '\n';
 }
 #else
-void Log(const char* msg)
+void Loging::Log(const char* msg)
 {
 }
 
-void Log(const std::string& msg)
+void Loging::Log(const std::string& msg)
 {
 }
 #endif
 
-void Message(const char* msg)
+void Loging::Message(const char* msg)
 {
     std::lock_guard lock(mOutput);
     std::cout << msg << '\n';
 }
 
-void Message(const std::string& msg)
+void Loging::Message(const std::string& msg)
 {
     std::lock_guard lock(mOutput);
     std::cout << msg << '\n';
diff --git a/Core/Log/Log.hpp b/Core/Log/Log.hpp
index 8027a10..3ba073c 100644
--- a/Core/Log/Log.hpp
+++ b/Core/Log/Log.hpp
@@ -2,8 +2,11 @@
 
 #include <string>
 
-void Log(const char* msg);
-void Log(const std::string& msg);
+namespace Loging
+{
+    void Log(const char* msg);
+    void Log(const std::string& msg);
 
-void Message(const char* msg);
-void Message(const std::string& msg);
\ No newline at end of file
+    void Message(const char* msg);
+    void Message(const std::string& msg);
+}
diff --git a/TestGame/src/Actors/TestActor.cpp b/TestGame/src/Actors/TestActor.cpp
index 1d398f1..c5fe540 100644
--- a/TestGame/src/Actors/TestActor.cpp
+++ b/TestGame/src/Actors/TestActor.cpp
@@ -5,5 +5,5 @@
 void TestActor::BeginPlay()
 {
     Actor::BeginPlay();
-    Log("TestActor::BeginPlay");
+    Loging::Log("TestActor::BeginPlay");
 }
\ No newline at end of file
diff --git a/TestGame/src/Worlds/TestWorld.cpp b/TestGame/src/Worlds/TestWorld.cpp
index a2def3c..fe65334 100644
--- a/TestGame/src/Worlds/TestWorld.cpp
+++ b/TestGame/src/Worlds/TestWorld.cpp
@@ -10,7 +10,9 @@ TestWorld::TestWorld(GameInstance& game_instance) : World(game_instance)
 void TestWorld::BeginPlay()
 {
     World::BeginPlay();
-    Log("TestWorld::BeginPlay");
+    std::vector<UType::object_ptr<Actor>> meshes = GetActorsByClass<Actor>();
+    for (const auto& i : meshes)
+        Loging::Log("Load actor: " + i->GetName());
 }
 
 void TestWorld::Tick(double delta_time)
@@ -20,14 +22,15 @@ void TestWorld::Tick(double delta_time)
     time += delta_time;
     if (time >= 10.0)
     {
-        Message("TestWorld: Time out");
         std::vector<UType::object_ptr<Mesh>> meshes = GetActorsByClass<Mesh>();
         if (!meshes.empty())
         {
+            Loging::Message("TestWorld destroy: " + meshes[0]->GetName());
             DestroyActor(static_cast<UType::object_ptr<Actor>>(meshes[0]));
             time = 7.0;
             return;
         }
+        Loging::Message("TestWorld: Time out");
         GetGameInstance().quit();
     }
 }