This commit is contained in:
Jiga228
2025-10-18 16:39:43 +07:00
parent 450b3839c6
commit d79258e191
6 changed files with 23 additions and 17 deletions
+2 -2
View File
@@ -51,7 +51,7 @@ unsigned int ModelManager::FNV1aHash(const char* buf)
void ModelManager::OnDestroySometimeModelCaller(const std::string& name) void ModelManager::OnDestroySometimeModelCaller(const std::string& name)
{ {
Log("Free model: " + name); Loging::Log("Free model: " + name);
OnDestroySometimeModel.Call(name); OnDestroySometimeModel.Call(name);
} }
@@ -76,7 +76,7 @@ ModelManager::StaticModel* ModelManager::LoadModel(const std::string& name)
return counter->second.model; return counter->second.model;
} }
Log("Load new model: " + name); Loging::Log("Load new model: " + name);
std::vector<Voxel> model_data; std::vector<Voxel> model_data;
// Load model_data // Load model_data
+2 -2
View File
@@ -27,7 +27,7 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(
std::string msg = "validation layer: "; std::string msg = "validation layer: ";
msg += pCallbackData->pMessage; msg += pCallbackData->pMessage;
Log(msg); Loging::Log(msg);
return VK_FALSE; return VK_FALSE;
} }
@@ -338,7 +338,7 @@ void RenderEngine::pick_physical_device()
physical_device_ = device; physical_device_ = device;
VkPhysicalDeviceProperties device_properties; VkPhysicalDeviceProperties device_properties;
vkGetPhysicalDeviceProperties(physical_device_, &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; break;
} }
} }
+6 -6
View File
@@ -6,34 +6,34 @@
std::mutex mOutput; std::mutex mOutput;
#ifdef _DEBUG #ifdef _DEBUG
void Log(const char* msg) void Loging::Log(const char* msg)
{ {
std::lock_guard lock(mOutput); std::lock_guard lock(mOutput);
std::cout << msg << '\n'; std::cout << msg << '\n';
} }
void Log(const std::string& msg) void Loging::Log(const std::string& msg)
{ {
std::lock_guard lock(mOutput); std::lock_guard lock(mOutput);
std::cout << msg << '\n'; std::cout << msg << '\n';
} }
#else #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 #endif
void Message(const char* msg) void Loging::Message(const char* msg)
{ {
std::lock_guard lock(mOutput); std::lock_guard lock(mOutput);
std::cout << msg << '\n'; std::cout << msg << '\n';
} }
void Message(const std::string& msg) void Loging::Message(const std::string& msg)
{ {
std::lock_guard lock(mOutput); std::lock_guard lock(mOutput);
std::cout << msg << '\n'; std::cout << msg << '\n';
+3
View File
@@ -2,8 +2,11 @@
#include <string> #include <string>
namespace Loging
{
void Log(const char* msg); void Log(const char* msg);
void Log(const std::string& msg); void Log(const std::string& msg);
void Message(const char* msg); void Message(const char* msg);
void Message(const std::string& msg); void Message(const std::string& msg);
}
+1 -1
View File
@@ -5,5 +5,5 @@
void TestActor::BeginPlay() void TestActor::BeginPlay()
{ {
Actor::BeginPlay(); Actor::BeginPlay();
Log("TestActor::BeginPlay"); Loging::Log("TestActor::BeginPlay");
} }
+5 -2
View File
@@ -10,7 +10,9 @@ TestWorld::TestWorld(GameInstance& game_instance) : World(game_instance)
void TestWorld::BeginPlay() void TestWorld::BeginPlay()
{ {
World::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) void TestWorld::Tick(double delta_time)
@@ -20,14 +22,15 @@ void TestWorld::Tick(double delta_time)
time += delta_time; time += delta_time;
if (time >= 10.0) if (time >= 10.0)
{ {
Message("TestWorld: Time out");
std::vector<UType::object_ptr<Mesh>> meshes = GetActorsByClass<Mesh>(); std::vector<UType::object_ptr<Mesh>> meshes = GetActorsByClass<Mesh>();
if (!meshes.empty()) if (!meshes.empty())
{ {
Loging::Message("TestWorld destroy: " + meshes[0]->GetName());
DestroyActor(static_cast<UType::object_ptr<Actor>>(meshes[0])); DestroyActor(static_cast<UType::object_ptr<Actor>>(meshes[0]));
time = 7.0; time = 7.0;
return; return;
} }
Loging::Message("TestWorld: Time out");
GetGameInstance().quit(); GetGameInstance().quit();
} }
} }