Skip to content

Commit

Permalink
detail -> details
Browse files Browse the repository at this point in the history
  • Loading branch information
Ubpa committed Jan 23, 2021
1 parent 46b2132 commit 487c580
Show file tree
Hide file tree
Showing 45 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions include/UECS/AccessTypeID.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "CmptTag.h"

#include "detail/Util.h"
#include "details/Util.h"

#include <UTemplate/TypeID.h>

Expand Down Expand Up @@ -31,4 +31,4 @@ namespace Ubpa::UECS {
using AccessTypeIDSet = std::set<AccessTypeID, std::less<>>;
}

#include "detail/AccessTypeID.inl"
#include "details/AccessTypeID.inl"
2 changes: 1 addition & 1 deletion include/UECS/ChunkView.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/ChunkView.inl"
#include "details/ChunkView.inl"
2 changes: 1 addition & 1 deletion include/UECS/CmptLocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/CmptsLocator.inl"
#include "details/CmptsLocator.inl"
2 changes: 1 addition & 1 deletion include/UECS/CmptTag.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/CmptTag.inl"
#include "details/CmptTag.inl"
2 changes: 1 addition & 1 deletion include/UECS/Entity.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "detail/Util.h"
#include "details/Util.h"

namespace Ubpa::UECS {
// index + version
Expand Down
6 changes: 3 additions & 3 deletions include/UECS/EntityMngr.h
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -145,4 +145,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/EntityMngr.inl"
#include "details/EntityMngr.inl"
4 changes: 2 additions & 2 deletions include/UECS/EntityQuery.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "ArchetypeFilter.h"
#include "CmptLocator.h"
#include "detail/Util.h"
#include "details/Util.h"

namespace Ubpa::UECS {
// ArchetypeFilter + CmptLocator
Expand All @@ -18,4 +18,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/EntityQuery.inl"
#include "details/EntityQuery.inl"
2 changes: 1 addition & 1 deletion include/UECS/RTDCmptTraits.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/RTDCmptTraits.inl"
#include "details/RTDCmptTraits.inl"
10 changes: 5 additions & 5 deletions include/UECS/Schedule.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once

#include "detail/SystemFunc.h"
#include "detail/Job.h"
#include "details/SystemFunc.h"
#include "details/Job.h"

#include <map>
#include <memory>
#include <memory_resource>

namespace Ubpa::UECS::detail {
namespace Ubpa::UECS::details {
struct Compiler;
}

Expand Down Expand Up @@ -97,7 +97,7 @@ namespace Ubpa::UECS {
std::vector<SystemFunc*> writeSysFuncs;
std::vector<SystemFunc*> latestSysFuncs;
};
friend struct detail::Compiler;
friend struct details::Compiler;
std::unordered_map<TypeID, CmptSysFuncs> GenCmptSysFuncsMap() const;

SysFuncGraph GenSysFuncGraph() const;
Expand All @@ -124,4 +124,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/Schedule.inl"
#include "details/Schedule.inl"
2 changes: 1 addition & 1 deletion include/UECS/SingletonLocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/SingletonLocator.inl"
#include "details/SingletonLocator.inl"
2 changes: 1 addition & 1 deletion include/UECS/SystemMngr.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/SystemMngr.inl"
#include "details/SystemMngr.inl"
2 changes: 1 addition & 1 deletion include/UECS/SystemTraits.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/SystemTraits.inl"
#include "details/SystemTraits.inl"
2 changes: 1 addition & 1 deletion include/UECS/World.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ namespace Ubpa::UECS {
};
}

#include "detail/World.inl"
#include "details/World.inl"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <UTemplate/Func.h>

namespace Ubpa::UECS::detail {
namespace Ubpa::UECS::details {
template<typename... Cmpts>
CmptLocator GenerateCmptLocator(TypeList<Cmpts...>) {
if constexpr (sizeof...(Cmpts) > 0) {
Expand All @@ -19,7 +19,7 @@ namespace Ubpa::UECS {
CmptLocator CmptLocator::Generate() {
using ArgList = FuncTraits_ArgList<std::decay_t<Func>>;
using CmptList = Filter_t<ArgList, IsNonSingleton>;
return detail::GenerateCmptLocator(CmptList{});
return details::GenerateCmptLocator(CmptList{});
}

template<typename Func>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <UTemplate/Func.h>

namespace Ubpa::UECS::detail {
namespace Ubpa::UECS::details {
template<typename... Singletons>
SingletonLocator GenerateSingletonLocator(TypeList<Singletons...>) {
if constexpr (sizeof...(Singletons) > 0) {
Expand All @@ -19,7 +19,7 @@ namespace Ubpa::UECS {
SingletonLocator SingletonLocator::Generate() {
using ArgList = FuncTraits_ArgList<std::decay_t<Func>>;
using SingletonList = Filter_t<ArgList, IsSingleton>;
return detail::GenerateSingletonLocator(SingletonList{});
return details::GenerateSingletonLocator(SingletonList{});
}

template<typename Func>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <UTemplate/Func.h>

namespace Ubpa::UECS::detail {
namespace Ubpa::UECS::details {
template<typename Func>
auto Pack(Func&& func) noexcept;
}
Expand All @@ -26,7 +26,7 @@ namespace Ubpa::UECS {
name{ std::move(name) },
hashCode{ GetValue(this->name) },
isParallel{ isParallel },
func{ detail::Pack(std::forward<Func>(func)) }
func{ details::Pack(std::forward<Func>(func)) }
{
using ArgList = FuncTraits_ArgList<std::decay_t<Func>>;

Expand Down Expand Up @@ -56,7 +56,7 @@ namespace Ubpa::UECS {
name{ std::move(name) },
hashCode{ GetValue(this->name) },
isParallel{ isParallel },
func{ detail::Pack(std::forward<Func>(func)) }
func{ details::Pack(std::forward<Func>(func)) }
{
using ArgList = FuncTraits_ArgList<std::decay_t<Func>>;

Expand Down Expand Up @@ -88,7 +88,7 @@ namespace Ubpa::UECS {
name{ std::move(name) },
hashCode{ GetValue(this->name) },
isParallel{ false },
func{ detail::Pack(std::forward<Func>(func)) }
func{ details::Pack(std::forward<Func>(func)) }
{
using ArgList = FuncTraits_ArgList<std::decay_t<Func>>;

Expand All @@ -105,7 +105,7 @@ namespace Ubpa::UECS {
}
}

namespace Ubpa::UECS::detail {
namespace Ubpa::UECS::details {
template<typename DecayedArgList, typename SortedSingletonList, typename SortedNonSingletonList>
struct Packer;

Expand Down Expand Up @@ -143,7 +143,7 @@ namespace Ubpa::UECS::detail {
using ArgList = FuncTraits_ArgList<Func>;

using DecayedArgList = Transform_t<ArgList, DecayArg>;
static_assert(IsSet_v<DecayedArgList>, "detail::System_::Pack: <Func>'s argument types must be a set");
static_assert(IsSet_v<DecayedArgList>, "details::System_::Pack: <Func>'s argument types must be a set");

using TaggedCmptList = Filter_t<ArgList, IsTaggedCmpt>;

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <UTemplate/Name.h>

namespace Ubpa::UECS::detail {
namespace Ubpa::UECS::details {
template<typename System>
concept HaveOnCreate = requires(World* w) { { System::OnCreate(w) }; };
template<typename System>
Expand Down Expand Up @@ -34,7 +34,7 @@ namespace Ubpa::UECS::detail {
namespace Ubpa::UECS {
template<typename... Systems>
std::array<std::size_t, sizeof...(Systems)> SystemTraits::Register() {
return { detail::Register<Systems>(*this)... };
return { details::Register<Systems>(*this)... };
}

template<typename System>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/core/Archetype.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <UECS/detail/Archetype.h>
#include <UECS/details/Archetype.h>

using namespace Ubpa::UECS;
using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion src/core/ArchetypeFilter.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <UECS/ArchetypeFilter.h>

#include <UECS/detail/Util.h>
#include <UECS/details/Util.h>

using namespace Ubpa::UECS;

Expand Down
2 changes: 1 addition & 1 deletion src/core/Chunk.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <UECS/detail/Chunk.h>
#include <UECS/details/Chunk.h>

#include <algorithm>

Expand Down
2 changes: 1 addition & 1 deletion src/core/ChunkView.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <UECS/ChunkView.h>

#include <UECS/detail/Archetype.h>
#include <UECS/details/Archetype.h>

using namespace Ubpa::UECS;

Expand Down
2 changes: 1 addition & 1 deletion src/core/CmptLocator.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <UECS/CmptLocator.h>

#include <UECS/detail/Util.h>
#include <UECS/details/Util.h>

using namespace Ubpa::UECS;

Expand Down
2 changes: 1 addition & 1 deletion src/core/EntityMngr.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <UECS/EntityMngr.h>

#include <UECS/detail/SystemFunc.h>
#include <UECS/details/SystemFunc.h>
#include <UECS/IListener.h>

using namespace Ubpa::UECS;
Expand Down
8 changes: 4 additions & 4 deletions src/core/Schedule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -483,7 +483,7 @@ SysFuncGraph Schedule::GenSysFuncGraph() const {
auto cmptSysFuncsMap = GenCmptSysFuncsMap();

// [gen groupMap]
unordered_map<SystemFunc*, detail::NoneGroup> groupMap;
unordered_map<SystemFunc*, details::NoneGroup> groupMap;
for (const auto& [hashcode, sysFunc] : sysFuncs)
groupMap.emplace(sysFunc, sysFunc);

Expand All @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion src/core/SystemFunc.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <UECS/detail/SystemFunc.h>
#include <UECS/details/SystemFunc.h>

using namespace Ubpa::UECS;

Expand Down

0 comments on commit 487c580

Please sign in to comment.