From 78d13c0ab8f69e0cd37641c0e9913aed474d9e5a Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Sat, 1 Oct 2022 14:28:13 +0800 Subject: [PATCH 1/3] Changed some couts and asserts to use SHLOG --- SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h | 2 +- SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp | 3 ++- SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h | 2 +- SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp | 2 +- SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h index 8921fbce..517fb4b9 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h +++ b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h @@ -439,7 +439,7 @@ namespace SHADE { if ((templateIDs[i] == oID)) { - assert("This Component is owned by another group"); + SHLOG_WARNING("Component type already owned by another component group"); } } } diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp index bbf8d400..b0332728 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp +++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp @@ -88,7 +88,8 @@ namespace SHADE if (!entityVec[eIndex]) { //There is still an entity stored there.Something went wrong - assert("FATAL ERROR: Entity Creation error. Entity Index Conflict"); + SHLOG_CRITICAL("FATAL ERROR: Entity Creation error. Entity index conflict.") + } //Reset it to a newly constructed entity diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h index f32ab2c4..fac97339 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h +++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h @@ -119,7 +119,7 @@ namespace SHADE if (!entityVec[eIndex]) { //There is still an entity stored there.Something went wrong - assert("FATAL ERROR: Entity Creation error. Entity Index Conflict"); + SHLOG_CRITICAL("FATAL ERROR: Entity Creation error. Entity index conflict.") } //Reset it to a newly constructed entity diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp index 551233db..35269863 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp +++ b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp @@ -29,7 +29,7 @@ namespace SHADE { system.second->Init(); #ifdef _DEBUG - std::cout << system.first << " Init" << std::endl; + SHLOG_INFO("{} Init", system.first); #endif } } diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h index 995a1cf5..25ff0c15 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h +++ b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h @@ -94,7 +94,8 @@ namespace SHADE if (systemContainer.find(id) == systemContainer.end()) { - std::cout << "System Manager error: System Version " << version << " does not exit." << std::endl; + SHLOG_WARNING("System Manager warning: System Version {} does not exist. Returning as nullptr", version) + return nullptr; } From 5aee22a5e3fc06b02dcdc66ef9f029f130956a71 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Sat, 1 Oct 2022 16:37:47 +0800 Subject: [PATCH 2/3] Revert "Changed some couts and asserts to use SHLOG" This reverts commit 78d13c0ab8f69e0cd37641c0e9913aed474d9e5a. --- SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h | 2 +- SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp | 3 +-- SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h | 2 +- SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp | 2 +- SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h index 517fb4b9..8921fbce 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h +++ b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h @@ -439,7 +439,7 @@ namespace SHADE { if ((templateIDs[i] == oID)) { - SHLOG_WARNING("Component type already owned by another component group"); + assert("This Component is owned by another group"); } } } diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp index b0332728..bbf8d400 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp +++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp @@ -88,8 +88,7 @@ namespace SHADE if (!entityVec[eIndex]) { //There is still an entity stored there.Something went wrong - SHLOG_CRITICAL("FATAL ERROR: Entity Creation error. Entity index conflict.") - + assert("FATAL ERROR: Entity Creation error. Entity Index Conflict"); } //Reset it to a newly constructed entity diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h index fac97339..f32ab2c4 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h +++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h @@ -119,7 +119,7 @@ namespace SHADE if (!entityVec[eIndex]) { //There is still an entity stored there.Something went wrong - SHLOG_CRITICAL("FATAL ERROR: Entity Creation error. Entity index conflict.") + assert("FATAL ERROR: Entity Creation error. Entity Index Conflict"); } //Reset it to a newly constructed entity diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp index 35269863..551233db 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp +++ b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.cpp @@ -29,7 +29,7 @@ namespace SHADE { system.second->Init(); #ifdef _DEBUG - SHLOG_INFO("{} Init", system.first); + std::cout << system.first << " Init" << std::endl; #endif } } diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h index 25ff0c15..995a1cf5 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h +++ b/SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h @@ -94,8 +94,7 @@ namespace SHADE if (systemContainer.find(id) == systemContainer.end()) { - SHLOG_WARNING("System Manager warning: System Version {} does not exist. Returning as nullptr", version) - + std::cout << "System Manager error: System Version " << version << " does not exit." << std::endl; return nullptr; } From f5f9b80490ceaa3c65e6029363dc0e7cfac96ef9 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Mon, 31 Oct 2022 15:06:08 +0800 Subject: [PATCH 3/3] Added GetEntityByName to EntityManager --- .../src/ECS_Base/Managers/SHEntityManager.cpp | 11 ++++++++++- SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp index bbf8d400..6ce4f277 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp +++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp @@ -213,5 +213,14 @@ namespace SHADE return SHSerialization::DeserializeEntityToSceneFromString(data); }*/ - + EntityID SHEntityManager::GetEntityByName(std::string const& name) noexcept + { + EntityID result = MAX_EID; + for (auto& entity : entityVec) + { + if (entity->name == name) + result = entity->GetEID(); + } + return result; + } } diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h index f32ab2c4..911748bd 100644 --- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h +++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h @@ -209,6 +209,8 @@ namespace SHADE //static EntityID DuplicateEntity(EntityID eid) noexcept; + static EntityID GetEntityByName(std::string const& name) noexcept; + protected: