From 487c580f4653dfb90d7ed70a51081c88fe8d1f0e Mon Sep 17 00:00:00 2001 From: Ubpa Date: Sat, 23 Jan 2021 15:22:54 +0800 Subject: [PATCH] detail -> details --- include/UECS/AccessTypeID.h | 4 ++-- include/UECS/ChunkView.h | 2 +- include/UECS/CmptLocator.h | 2 +- include/UECS/CmptTag.h | 2 +- include/UECS/Entity.h | 2 +- include/UECS/EntityMngr.h | 6 +++--- include/UECS/EntityQuery.h | 4 ++-- include/UECS/RTDCmptTraits.h | 2 +- include/UECS/Schedule.h | 10 +++++----- include/UECS/SingletonLocator.h | 2 +- include/UECS/SystemMngr.h | 2 +- include/UECS/SystemTraits.h | 2 +- include/UECS/World.h | 2 +- include/UECS/{detail => details}/AccessTypeID.inl | 0 include/UECS/{detail => details}/Archetype.h | 0 include/UECS/{detail => details}/Archetype.inl | 0 .../UECS/{detail => details}/ArchetypeCmptTraits.h | 0 .../UECS/{detail => details}/ArchetypeCmptTraits.inl | 0 include/UECS/{detail => details}/Chunk.h | 0 include/UECS/{detail => details}/ChunkView.inl | 0 include/UECS/{detail => details}/CmptTag.inl | 0 include/UECS/{detail => details}/CmptsLocator.inl | 4 ++-- include/UECS/{detail => details}/EntityMngr.inl | 0 include/UECS/{detail => details}/EntityQuery.inl | 0 include/UECS/{detail => details}/Job.h | 0 include/UECS/{detail => details}/RTDCmptTraits.inl | 0 include/UECS/{detail => details}/Schedule.inl | 0 .../UECS/{detail => details}/SingletonLocator.inl | 4 ++-- include/UECS/{detail => details}/SystemFunc.h | 0 include/UECS/{detail => details}/SystemFunc.inl | 12 ++++++------ include/UECS/{detail => details}/SystemMngr.inl | 0 include/UECS/{detail => details}/SystemTraits.inl | 4 ++-- include/UECS/{detail => details}/TypeIDSet.h | 0 include/UECS/{detail => details}/TypeIDSet.inl | 0 include/UECS/{detail => details}/Util.h | 0 include/UECS/{detail => details}/Util.inl | 0 include/UECS/{detail => details}/World.inl | 0 src/core/Archetype.cpp | 2 +- src/core/ArchetypeFilter.cpp | 2 +- src/core/Chunk.cpp | 2 +- src/core/ChunkView.cpp | 2 +- src/core/CmptLocator.cpp | 2 +- src/core/EntityMngr.cpp | 2 +- src/core/Schedule.cpp | 8 ++++---- src/core/SystemFunc.cpp | 2 +- 45 files changed, 44 insertions(+), 44 deletions(-) rename include/UECS/{detail => details}/AccessTypeID.inl (100%) rename include/UECS/{detail => details}/Archetype.h (100%) rename include/UECS/{detail => details}/Archetype.inl (100%) rename include/UECS/{detail => details}/ArchetypeCmptTraits.h (100%) rename include/UECS/{detail => details}/ArchetypeCmptTraits.inl (100%) rename include/UECS/{detail => details}/Chunk.h (100%) rename include/UECS/{detail => details}/ChunkView.inl (100%) rename include/UECS/{detail => details}/CmptTag.inl (100%) rename include/UECS/{detail => details}/CmptsLocator.inl (89%) rename include/UECS/{detail => details}/EntityMngr.inl (100%) rename include/UECS/{detail => details}/EntityQuery.inl (100%) rename include/UECS/{detail => details}/Job.h (100%) rename include/UECS/{detail => details}/RTDCmptTraits.inl (100%) rename include/UECS/{detail => details}/Schedule.inl (100%) rename include/UECS/{detail => details}/SingletonLocator.inl (89%) rename include/UECS/{detail => details}/SystemFunc.h (100%) rename include/UECS/{detail => details}/SystemFunc.inl (94%) rename include/UECS/{detail => details}/SystemMngr.inl (100%) rename include/UECS/{detail => details}/SystemTraits.inl (95%) rename include/UECS/{detail => details}/TypeIDSet.h (100%) rename include/UECS/{detail => details}/TypeIDSet.inl (100%) rename include/UECS/{detail => details}/Util.h (100%) rename include/UECS/{detail => details}/Util.inl (100%) rename include/UECS/{detail => details}/World.inl (100%) diff --git a/include/UECS/AccessTypeID.h b/include/UECS/AccessTypeID.h index 51dd699..2627fa5 100644 --- a/include/UECS/AccessTypeID.h +++ b/include/UECS/AccessTypeID.h @@ -2,7 +2,7 @@ #include "CmptTag.h" -#include "detail/Util.h" +#include "details/Util.h" #include @@ -31,4 +31,4 @@ namespace Ubpa::UECS { using AccessTypeIDSet = std::set>; } -#include "detail/AccessTypeID.inl" +#include "details/AccessTypeID.inl" diff --git a/include/UECS/ChunkView.h b/include/UECS/ChunkView.h index a4691af..fc2265f 100644 --- a/include/UECS/ChunkView.h +++ b/include/UECS/ChunkView.h @@ -29,4 +29,4 @@ namespace Ubpa::UECS { }; } -#include "detail/ChunkView.inl" +#include "details/ChunkView.inl" diff --git a/include/UECS/CmptLocator.h b/include/UECS/CmptLocator.h index 2b732c6..efb0146 100644 --- a/include/UECS/CmptLocator.h +++ b/include/UECS/CmptLocator.h @@ -37,4 +37,4 @@ namespace Ubpa::UECS { }; } -#include "detail/CmptsLocator.inl" +#include "details/CmptsLocator.inl" diff --git a/include/UECS/CmptTag.h b/include/UECS/CmptTag.h index 87e3d99..689ab5a 100644 --- a/include/UECS/CmptTag.h +++ b/include/UECS/CmptTag.h @@ -97,4 +97,4 @@ namespace Ubpa::UECS { }; } -#include "detail/CmptTag.inl" +#include "details/CmptTag.inl" diff --git a/include/UECS/Entity.h b/include/UECS/Entity.h index 5c4f437..413dcf3 100644 --- a/include/UECS/Entity.h +++ b/include/UECS/Entity.h @@ -1,6 +1,6 @@ #pragma once -#include "detail/Util.h" +#include "details/Util.h" namespace Ubpa::UECS { // index + version diff --git a/include/UECS/EntityMngr.h b/include/UECS/EntityMngr.h index 57580bb..3498a4e 100644 --- a/include/UECS/EntityMngr.h +++ b/include/UECS/EntityMngr.h @@ -1,7 +1,7 @@ #pragma once -#include "detail/Archetype.h" -#include "detail/Job.h" +#include "details/Archetype.h" +#include "details/Job.h" #include "EntityQuery.h" #include "SingletonLocator.h" @@ -145,4 +145,4 @@ namespace Ubpa::UECS { }; } -#include "detail/EntityMngr.inl" +#include "details/EntityMngr.inl" diff --git a/include/UECS/EntityQuery.h b/include/UECS/EntityQuery.h index bd2130b..6a6586c 100644 --- a/include/UECS/EntityQuery.h +++ b/include/UECS/EntityQuery.h @@ -2,7 +2,7 @@ #include "ArchetypeFilter.h" #include "CmptLocator.h" -#include "detail/Util.h" +#include "details/Util.h" namespace Ubpa::UECS { // ArchetypeFilter + CmptLocator @@ -18,4 +18,4 @@ namespace Ubpa::UECS { }; } -#include "detail/EntityQuery.inl" +#include "details/EntityQuery.inl" diff --git a/include/UECS/RTDCmptTraits.h b/include/UECS/RTDCmptTraits.h index ec39e50..eecd39b 100644 --- a/include/UECS/RTDCmptTraits.h +++ b/include/UECS/RTDCmptTraits.h @@ -79,4 +79,4 @@ namespace Ubpa::UECS { }; } -#include "detail/RTDCmptTraits.inl" +#include "details/RTDCmptTraits.inl" diff --git a/include/UECS/Schedule.h b/include/UECS/Schedule.h index b368302..1bb1a0a 100644 --- a/include/UECS/Schedule.h +++ b/include/UECS/Schedule.h @@ -1,13 +1,13 @@ #pragma once -#include "detail/SystemFunc.h" -#include "detail/Job.h" +#include "details/SystemFunc.h" +#include "details/Job.h" #include #include #include -namespace Ubpa::UECS::detail { +namespace Ubpa::UECS::details { struct Compiler; } @@ -97,7 +97,7 @@ namespace Ubpa::UECS { std::vector writeSysFuncs; std::vector latestSysFuncs; }; - friend struct detail::Compiler; + friend struct details::Compiler; std::unordered_map GenCmptSysFuncsMap() const; SysFuncGraph GenSysFuncGraph() const; @@ -124,4 +124,4 @@ namespace Ubpa::UECS { }; } -#include "detail/Schedule.inl" +#include "details/Schedule.inl" diff --git a/include/UECS/SingletonLocator.h b/include/UECS/SingletonLocator.h index 7d1b5d0..94cb9c7 100644 --- a/include/UECS/SingletonLocator.h +++ b/include/UECS/SingletonLocator.h @@ -27,4 +27,4 @@ namespace Ubpa::UECS { }; } -#include "detail/SingletonLocator.inl" +#include "details/SingletonLocator.inl" diff --git a/include/UECS/SystemMngr.h b/include/UECS/SystemMngr.h index 365d27e..5e3aa89 100644 --- a/include/UECS/SystemMngr.h +++ b/include/UECS/SystemMngr.h @@ -79,4 +79,4 @@ namespace Ubpa::UECS { }; } -#include "detail/SystemMngr.inl" +#include "details/SystemMngr.inl" diff --git a/include/UECS/SystemTraits.h b/include/UECS/SystemTraits.h index 60c8eab..36c045f 100644 --- a/include/UECS/SystemTraits.h +++ b/include/UECS/SystemTraits.h @@ -94,4 +94,4 @@ namespace Ubpa::UECS { }; } -#include "detail/SystemTraits.inl" +#include "details/SystemTraits.inl" diff --git a/include/UECS/World.h b/include/UECS/World.h index 0f206ad..041cb86 100644 --- a/include/UECS/World.h +++ b/include/UECS/World.h @@ -131,4 +131,4 @@ namespace Ubpa::UECS { }; } -#include "detail/World.inl" +#include "details/World.inl" diff --git a/include/UECS/detail/AccessTypeID.inl b/include/UECS/details/AccessTypeID.inl similarity index 100% rename from include/UECS/detail/AccessTypeID.inl rename to include/UECS/details/AccessTypeID.inl diff --git a/include/UECS/detail/Archetype.h b/include/UECS/details/Archetype.h similarity index 100% rename from include/UECS/detail/Archetype.h rename to include/UECS/details/Archetype.h diff --git a/include/UECS/detail/Archetype.inl b/include/UECS/details/Archetype.inl similarity index 100% rename from include/UECS/detail/Archetype.inl rename to include/UECS/details/Archetype.inl diff --git a/include/UECS/detail/ArchetypeCmptTraits.h b/include/UECS/details/ArchetypeCmptTraits.h similarity index 100% rename from include/UECS/detail/ArchetypeCmptTraits.h rename to include/UECS/details/ArchetypeCmptTraits.h diff --git a/include/UECS/detail/ArchetypeCmptTraits.inl b/include/UECS/details/ArchetypeCmptTraits.inl similarity index 100% rename from include/UECS/detail/ArchetypeCmptTraits.inl rename to include/UECS/details/ArchetypeCmptTraits.inl diff --git a/include/UECS/detail/Chunk.h b/include/UECS/details/Chunk.h similarity index 100% rename from include/UECS/detail/Chunk.h rename to include/UECS/details/Chunk.h diff --git a/include/UECS/detail/ChunkView.inl b/include/UECS/details/ChunkView.inl similarity index 100% rename from include/UECS/detail/ChunkView.inl rename to include/UECS/details/ChunkView.inl diff --git a/include/UECS/detail/CmptTag.inl b/include/UECS/details/CmptTag.inl similarity index 100% rename from include/UECS/detail/CmptTag.inl rename to include/UECS/details/CmptTag.inl diff --git a/include/UECS/detail/CmptsLocator.inl b/include/UECS/details/CmptsLocator.inl similarity index 89% rename from include/UECS/detail/CmptsLocator.inl rename to include/UECS/details/CmptsLocator.inl index 6808d95..f00d0da 100644 --- a/include/UECS/detail/CmptsLocator.inl +++ b/include/UECS/details/CmptsLocator.inl @@ -2,7 +2,7 @@ #include -namespace Ubpa::UECS::detail { +namespace Ubpa::UECS::details { template CmptLocator GenerateCmptLocator(TypeList) { if constexpr (sizeof...(Cmpts) > 0) { @@ -19,7 +19,7 @@ namespace Ubpa::UECS { CmptLocator CmptLocator::Generate() { using ArgList = FuncTraits_ArgList>; using CmptList = Filter_t; - return detail::GenerateCmptLocator(CmptList{}); + return details::GenerateCmptLocator(CmptList{}); } template diff --git a/include/UECS/detail/EntityMngr.inl b/include/UECS/details/EntityMngr.inl similarity index 100% rename from include/UECS/detail/EntityMngr.inl rename to include/UECS/details/EntityMngr.inl diff --git a/include/UECS/detail/EntityQuery.inl b/include/UECS/details/EntityQuery.inl similarity index 100% rename from include/UECS/detail/EntityQuery.inl rename to include/UECS/details/EntityQuery.inl diff --git a/include/UECS/detail/Job.h b/include/UECS/details/Job.h similarity index 100% rename from include/UECS/detail/Job.h rename to include/UECS/details/Job.h diff --git a/include/UECS/detail/RTDCmptTraits.inl b/include/UECS/details/RTDCmptTraits.inl similarity index 100% rename from include/UECS/detail/RTDCmptTraits.inl rename to include/UECS/details/RTDCmptTraits.inl diff --git a/include/UECS/detail/Schedule.inl b/include/UECS/details/Schedule.inl similarity index 100% rename from include/UECS/detail/Schedule.inl rename to include/UECS/details/Schedule.inl diff --git a/include/UECS/detail/SingletonLocator.inl b/include/UECS/details/SingletonLocator.inl similarity index 89% rename from include/UECS/detail/SingletonLocator.inl rename to include/UECS/details/SingletonLocator.inl index 9107e47..1d9945c 100644 --- a/include/UECS/detail/SingletonLocator.inl +++ b/include/UECS/details/SingletonLocator.inl @@ -2,7 +2,7 @@ #include -namespace Ubpa::UECS::detail { +namespace Ubpa::UECS::details { template SingletonLocator GenerateSingletonLocator(TypeList) { if constexpr (sizeof...(Singletons) > 0) { @@ -19,7 +19,7 @@ namespace Ubpa::UECS { SingletonLocator SingletonLocator::Generate() { using ArgList = FuncTraits_ArgList>; using SingletonList = Filter_t; - return detail::GenerateSingletonLocator(SingletonList{}); + return details::GenerateSingletonLocator(SingletonList{}); } template diff --git a/include/UECS/detail/SystemFunc.h b/include/UECS/details/SystemFunc.h similarity index 100% rename from include/UECS/detail/SystemFunc.h rename to include/UECS/details/SystemFunc.h diff --git a/include/UECS/detail/SystemFunc.inl b/include/UECS/details/SystemFunc.inl similarity index 94% rename from include/UECS/detail/SystemFunc.inl rename to include/UECS/details/SystemFunc.inl index d9b4071..4ee363c 100644 --- a/include/UECS/detail/SystemFunc.inl +++ b/include/UECS/details/SystemFunc.inl @@ -2,7 +2,7 @@ #include -namespace Ubpa::UECS::detail { +namespace Ubpa::UECS::details { template auto Pack(Func&& func) noexcept; } @@ -26,7 +26,7 @@ namespace Ubpa::UECS { name{ std::move(name) }, hashCode{ GetValue(this->name) }, isParallel{ isParallel }, - func{ detail::Pack(std::forward(func)) } + func{ details::Pack(std::forward(func)) } { using ArgList = FuncTraits_ArgList>; @@ -56,7 +56,7 @@ namespace Ubpa::UECS { name{ std::move(name) }, hashCode{ GetValue(this->name) }, isParallel{ isParallel }, - func{ detail::Pack(std::forward(func)) } + func{ details::Pack(std::forward(func)) } { using ArgList = FuncTraits_ArgList>; @@ -88,7 +88,7 @@ namespace Ubpa::UECS { name{ std::move(name) }, hashCode{ GetValue(this->name) }, isParallel{ false }, - func{ detail::Pack(std::forward(func)) } + func{ details::Pack(std::forward(func)) } { using ArgList = FuncTraits_ArgList>; @@ -105,7 +105,7 @@ namespace Ubpa::UECS { } } -namespace Ubpa::UECS::detail { +namespace Ubpa::UECS::details { template struct Packer; @@ -143,7 +143,7 @@ namespace Ubpa::UECS::detail { using ArgList = FuncTraits_ArgList; using DecayedArgList = Transform_t; - static_assert(IsSet_v, "detail::System_::Pack: 's argument types must be a set"); + static_assert(IsSet_v, "details::System_::Pack: 's argument types must be a set"); using TaggedCmptList = Filter_t; diff --git a/include/UECS/detail/SystemMngr.inl b/include/UECS/details/SystemMngr.inl similarity index 100% rename from include/UECS/detail/SystemMngr.inl rename to include/UECS/details/SystemMngr.inl diff --git a/include/UECS/detail/SystemTraits.inl b/include/UECS/details/SystemTraits.inl similarity index 95% rename from include/UECS/detail/SystemTraits.inl rename to include/UECS/details/SystemTraits.inl index 35a6a26..983c644 100644 --- a/include/UECS/detail/SystemTraits.inl +++ b/include/UECS/details/SystemTraits.inl @@ -2,7 +2,7 @@ #include -namespace Ubpa::UECS::detail { +namespace Ubpa::UECS::details { template concept HaveOnCreate = requires(World* w) { { System::OnCreate(w) }; }; template @@ -34,7 +34,7 @@ namespace Ubpa::UECS::detail { namespace Ubpa::UECS { template std::array SystemTraits::Register() { - return { detail::Register(*this)... }; + return { details::Register(*this)... }; } template diff --git a/include/UECS/detail/TypeIDSet.h b/include/UECS/details/TypeIDSet.h similarity index 100% rename from include/UECS/detail/TypeIDSet.h rename to include/UECS/details/TypeIDSet.h diff --git a/include/UECS/detail/TypeIDSet.inl b/include/UECS/details/TypeIDSet.inl similarity index 100% rename from include/UECS/detail/TypeIDSet.inl rename to include/UECS/details/TypeIDSet.inl diff --git a/include/UECS/detail/Util.h b/include/UECS/details/Util.h similarity index 100% rename from include/UECS/detail/Util.h rename to include/UECS/details/Util.h diff --git a/include/UECS/detail/Util.inl b/include/UECS/details/Util.inl similarity index 100% rename from include/UECS/detail/Util.inl rename to include/UECS/details/Util.inl diff --git a/include/UECS/detail/World.inl b/include/UECS/details/World.inl similarity index 100% rename from include/UECS/detail/World.inl rename to include/UECS/details/World.inl diff --git a/src/core/Archetype.cpp b/src/core/Archetype.cpp index 31aba91..d538a01 100644 --- a/src/core/Archetype.cpp +++ b/src/core/Archetype.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace Ubpa::UECS; using namespace std; diff --git a/src/core/ArchetypeFilter.cpp b/src/core/ArchetypeFilter.cpp index e3aa618..119d5de 100644 --- a/src/core/ArchetypeFilter.cpp +++ b/src/core/ArchetypeFilter.cpp @@ -1,6 +1,6 @@ #include -#include +#include using namespace Ubpa::UECS; diff --git a/src/core/Chunk.cpp b/src/core/Chunk.cpp index cb283c3..a25165c 100644 --- a/src/core/Chunk.cpp +++ b/src/core/Chunk.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/src/core/ChunkView.cpp b/src/core/ChunkView.cpp index de70d3a..0d998e3 100644 --- a/src/core/ChunkView.cpp +++ b/src/core/ChunkView.cpp @@ -1,6 +1,6 @@ #include -#include +#include using namespace Ubpa::UECS; diff --git a/src/core/CmptLocator.cpp b/src/core/CmptLocator.cpp index c59d73b..e2c2ab9 100644 --- a/src/core/CmptLocator.cpp +++ b/src/core/CmptLocator.cpp @@ -1,6 +1,6 @@ #include -#include +#include using namespace Ubpa::UECS; diff --git a/src/core/EntityMngr.cpp b/src/core/EntityMngr.cpp index 868debc..5e1503c 100644 --- a/src/core/EntityMngr.cpp +++ b/src/core/EntityMngr.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include using namespace Ubpa::UECS; diff --git a/src/core/Schedule.cpp b/src/core/Schedule.cpp index 494a4ef..1edebf5 100644 --- a/src/core/Schedule.cpp +++ b/src/core/Schedule.cpp @@ -6,7 +6,7 @@ using namespace Ubpa; using namespace Ubpa::UECS; using namespace std; -namespace Ubpa::UECS::detail { +namespace Ubpa::UECS::details { struct NoneGroup { NoneGroup() = default; NoneGroup(SystemFunc* func) @@ -483,7 +483,7 @@ SysFuncGraph Schedule::GenSysFuncGraph() const { auto cmptSysFuncsMap = GenCmptSysFuncsMap(); // [gen groupMap] - unordered_map groupMap; + unordered_map groupMap; for (const auto& [hashcode, sysFunc] : sysFuncs) groupMap.emplace(sysFunc, sysFunc); @@ -510,14 +510,14 @@ SysFuncGraph Schedule::GenSysFuncGraph() const { // [gen graph] - edge - time point for (const auto& [type, cmptSysFuncs] : cmptSysFuncsMap) - detail::Compiler::SetPrePostEdge(graph, cmptSysFuncs, groupMap); + details::Compiler::SetPrePostEdge(graph, cmptSysFuncs, groupMap); // [gen graph] - edge - none group for (const auto& [type, cmptSysFuncs] : cmptSysFuncsMap) { if (cmptSysFuncs.writeSysFuncs.empty()) continue; - auto sortedGroup = detail::Compiler::GenSortNoneGroup(graph, cmptSysFuncs, groupMap); + auto sortedGroup = details::Compiler::GenSortNoneGroup(graph, cmptSysFuncs, groupMap); for (std::size_t i = 0; i < sortedGroup.size() - 1; i++) { const auto& gx = sortedGroup[i]; diff --git a/src/core/SystemFunc.cpp b/src/core/SystemFunc.cpp index 7add28d..2e4b123 100644 --- a/src/core/SystemFunc.cpp +++ b/src/core/SystemFunc.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace Ubpa::UECS;