namespace -> Ubpa::UECS

Ubpa · Jul 30, 2020 · aef787a · aef787a
1 parent fefdb7b
commit aef787a
Show file tree

Hide file tree

Showing 62 changed files with 80 additions and 72 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(UECS VERSION 0.9.7)
+project(UECS VERSION 0.9.8)
 message(STATUS "[Project] ${PROJECT_NAME}")
 
 include(cmake/InitUCMake.cmake)

diff --git a/include/UECS/CmptPtr.h b/include/UECS/CmptPtr.h
@@ -4,7 +4,7 @@
 
 #include <cassert>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// CmptType + void*
 	class CmptPtr {
 	public:

diff --git a/include/UECS/CmptTag.h b/include/UECS/CmptTag.h
@@ -2,7 +2,7 @@
 
 #include <UTemplate/Typelist.h>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	namespace CmptTag {
 		// LastFrame -> Write -> Latest
 

diff --git a/include/UECS/CmptType.h b/include/UECS/CmptType.h
@@ -2,7 +2,7 @@
 
 #include <UTemplate/TypeID.h>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// Component Type
 	// use a hashcode to distinguish different type
 	class CmptType {

diff --git a/include/UECS/Entity.h b/include/UECS/Entity.h
@@ -2,7 +2,7 @@
 
 #include "detail/Util.h"
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// index + version
 	class Entity {
 	public:

diff --git a/include/UECS/EntityFilter.h b/include/UECS/EntityFilter.h
@@ -6,7 +6,7 @@
 
 #include <set>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// filter Archetype with All, Any and None
 	class EntityFilter {
 	public:

diff --git a/include/UECS/EntityLocator.h b/include/UECS/EntityLocator.h
@@ -6,7 +6,7 @@
 
 #include <set>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// locate components in function's argument list for Archetype
 	class EntityLocator {
 	public:

diff --git a/include/UECS/EntityMngr.h b/include/UECS/EntityMngr.h
@@ -9,7 +9,7 @@
 
 #include <mutex>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class World;
 
 	class IListener;

diff --git a/include/UECS/EntityQuery.h b/include/UECS/EntityQuery.h
@@ -3,7 +3,7 @@
 #include "EntityFilter.h"
 #include "EntityLocator.h"
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// EntityFilter + EntityLocator
 	class EntityQuery {
 	public:

diff --git a/include/UECS/IListener.h b/include/UECS/IListener.h
@@ -2,7 +2,7 @@
 
 #include <string_view>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class World;
 	class SystemMngr;
 	class EntityMngr;

diff --git a/include/UECS/RTDCmptTraits.h b/include/UECS/RTDCmptTraits.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <functional>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// run-time dynamic component traits, singleton
 	// size (> 0) is neccessary
 	// optional

diff --git a/include/UECS/RTDCmptsView.h b/include/UECS/RTDCmptsView.h
@@ -6,7 +6,7 @@
 
 #include <set>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class EntityLocator;
 
 	// use RTDCmptsView::Iterator to read CmptPtr

diff --git a/include/UECS/Schedule.h b/include/UECS/Schedule.h
@@ -8,11 +8,11 @@
 
 #include <map>
 
-namespace Ubpa::detail::Schedule_ {
+namespace Ubpa::UECS::detail::Schedule_ {
 	struct Compiler;
 }
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class EntityMngr;
 	class SystemMngr;
 

diff --git a/include/UECS/SystemFunc.h b/include/UECS/SystemFunc.h
@@ -6,7 +6,7 @@
 
 #include <functional>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// [description]
 	// system function registered by Schedule in <System>::OnUpdate(Schedule&)
 	// name + query + function<...>

diff --git a/include/UECS/SystemMngr.h b/include/UECS/SystemMngr.h
@@ -4,7 +4,7 @@
 
 #include <UContainer/xSTL/xMap.h>
 
-namespace Ubpa{
+namespace Ubpa::UECS{
 	class IListener;
 
 	// System Manager

diff --git a/include/UECS/World.h b/include/UECS/World.h
@@ -6,7 +6,7 @@
 
 #include <UGraphviz/UGraphviz.h>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class IListener;
 
 	// SystemMngr + EntityMngr

diff --git a/include/UECS/detail/Archetype.h b/include/UECS/detail/Archetype.h
@@ -14,7 +14,7 @@
 
 #include <map>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class EntityMngr;
 
 	// Entity is a special Component

diff --git a/include/UECS/detail/Archetype.inl b/include/UECS/detail/Archetype.inl
@@ -2,7 +2,7 @@
 
 #include <cassert>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename... Cmpts>
 	Archetype::Archetype(TypeList<Cmpts...>)
 		: types(TypeList<Entity, Cmpts...>{})

diff --git a/include/UECS/detail/Chunk.h b/include/UECS/detail/Chunk.h
@@ -5,7 +5,7 @@
 #include <tuple>
 #include <vector>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	using byte = uint8_t;
 	static_assert(sizeof(byte) == 1);
 	struct alignas(128) Chunk {

diff --git a/include/UECS/detail/CmptTag.inl b/include/UECS/detail/CmptTag.inl
@@ -2,12 +2,12 @@
 
 #include <type_traits>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class Entity;
 	class EntityLocator;
 }
 
-namespace Ubpa::CmptTag {
+namespace Ubpa::UECS::CmptTag {
 	template<typename Cmpt> struct RemoveTag<const Cmpt*> : IType<Cmpt> {};
 	template<typename Cmpt> struct RemoveTag<Cmpt*> : IType<Cmpt> {};
 	template<typename Cmpt> struct RemoveTag<LastFrame<Cmpt>> : IType<Cmpt> {};

diff --git a/include/UECS/detail/CmptType.inl b/include/UECS/detail/CmptType.inl
@@ -5,8 +5,8 @@ namespace std {
 	struct hash;
 
 	template<>
-	struct hash<Ubpa::CmptType> {
-		constexpr size_t operator()(const Ubpa::CmptType& t) const noexcept {
+	struct hash<Ubpa::UECS::CmptType> {
+		constexpr size_t operator()(const Ubpa::UECS::CmptType& t) const noexcept {
 			return t.HashCode();
 		}
 	};

diff --git a/include/UECS/detail/CmptTypeSet.h b/include/UECS/detail/CmptTypeSet.h
@@ -8,7 +8,7 @@
 
 #include <set>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class CmptTypeSet : std::set<CmptType> {
 	public:
 		CmptTypeSet() : hashcode{ TypeID<CmptTypeSet> } {}

diff --git a/include/UECS/detail/CmptTypeSet.inl b/include/UECS/detail/CmptTypeSet.inl
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	inline CmptTypeSet::CmptTypeSet(const CmptType* types, size_t num) {
 		assert(types != nullptr && num != 0);
 		for (size_t i = 0; i < num; i++)
@@ -106,8 +106,8 @@ namespace Ubpa {
 
 namespace std {
 	template<>
-	struct hash<Ubpa::CmptTypeSet> {
-		size_t operator()(const Ubpa::CmptTypeSet& types) const noexcept {
+	struct hash<Ubpa::UECS::CmptTypeSet> {
+		size_t operator()(const Ubpa::UECS::CmptTypeSet& types) const noexcept {
 			return types.HashCode();
 		}
 	};

diff --git a/include/UECS/detail/EntityFilter.inl b/include/UECS/detail/EntityFilter.inl
@@ -2,7 +2,7 @@
 
 #include "Util.h"
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename... AllCmpts, typename... AnyCmpts, typename... NoneCmpts>
 	EntityFilter::EntityFilter(TypeList<AllCmpts...>, TypeList<AnyCmpts...>, TypeList<NoneCmpts...>)
 		: allCmptTypes{ CmptType::Of<AllCmpts>... },
@@ -125,8 +125,8 @@ namespace std {
 	template<typename T>
 	struct hash;
 	template<>
-	struct hash<Ubpa::EntityFilter> {
-		size_t operator()(const Ubpa::EntityFilter& filter) const noexcept {
+	struct hash<Ubpa::UECS::EntityFilter> {
+		size_t operator()(const Ubpa::UECS::EntityFilter& filter) const noexcept {
 			return filter.HashCode();
 		}
 	};

diff --git a/include/UECS/detail/EntityLocator.inl b/include/UECS/detail/EntityLocator.inl
@@ -6,7 +6,7 @@
 
 #include <UTemplate/Func.h>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename TaggedCmptList>
 	EntityLocator::EntityLocator(TaggedCmptList)
 		: EntityLocator{ Filter_t<TaggedCmptList, CmptTag::IsLastFrame>{},

diff --git a/include/UECS/detail/EntityMngr.inl b/include/UECS/detail/EntityMngr.inl
@@ -5,7 +5,7 @@
 #include <UTemplate/Typelist.h>
 #include <UTemplate/Func.h>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename... Cmpts>
 	Archetype* EntityMngr::GetOrCreateArchetypeOf() {
 		static_assert(IsSet_v<TypeList<Entity, Cmpts...>>,

diff --git a/include/UECS/detail/EntityQuery.inl b/include/UECS/detail/EntityQuery.inl
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename... AllCmpts, typename... AnyCmpts, typename... NoneCmpts, typename... Cmpts>
 	EntityQuery::EntityQuery(TypeList<AllCmpts...>, TypeList<AnyCmpts...>, TypeList<NoneCmpts...>, TypeList<Cmpts...>)
 		: filter{ TypeList<AllCmpts...>{}, TypeList<AnyCmpts...>{}, TypeList<NoneCmpts...>{} },
@@ -13,8 +13,8 @@ namespace std {
 	template<typename T>
 	struct hash;
 	template<>
-	struct hash<Ubpa::EntityQuery> {
-		size_t operator()(const Ubpa::EntityQuery& query) const noexcept {
+	struct hash<Ubpa::UECS::EntityQuery> {
+		size_t operator()(const Ubpa::UECS::EntityQuery& query) const noexcept {
 			return query.HashCode();
 		}
 	};

diff --git a/include/UECS/detail/Job.h b/include/UECS/detail/Job.h
@@ -2,7 +2,7 @@
 
 #include "_deps/taskflow/taskflow.hpp"
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	using Job = tf::Taskflow;
 	using JobHandle = tf::Task;
 

diff --git a/include/UECS/detail/RTDCmptTraits.inl b/include/UECS/detail/RTDCmptTraits.inl
@@ -2,7 +2,7 @@
 
 #include "../RTDCmptTraits.h"
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	inline RTDCmptTraits& RTDCmptTraits::Instance() noexcept {
 		static RTDCmptTraits instance;
 		return instance;

diff --git a/include/UECS/detail/RTSCmptTraits.h b/include/UECS/detail/RTSCmptTraits.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <functional>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	// run-time static component traits
 	class RTSCmptTraits {
 	public:

diff --git a/include/UECS/detail/RTSCmptTraits.inl b/include/UECS/detail/RTSCmptTraits.inl
@@ -4,7 +4,7 @@
 
 #include <stdexcept>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	inline size_t RTSCmptTraits::Sizeof(CmptType type) const {
 		assert(sizeofs.find(type) != sizeofs.end());
 		return sizeofs.find(type)->second;

diff --git a/include/UECS/detail/Schedule.inl b/include/UECS/detail/Schedule.inl
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename Func>
 	Schedule& Schedule::Register(Func&& func, std::string name, EntityFilter filter) {
 		Request(std::forward<Func>(func), std::move(name), std::move(filter));

diff --git a/include/UECS/detail/SysFuncGraph.h b/include/UECS/detail/SysFuncGraph.h
@@ -4,7 +4,7 @@
 #include <unordered_set>
 #include <vector>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	class SystemFunc;
 	class SysFuncGraph {
 	public:

diff --git a/include/UECS/detail/SystemFunc.inl b/include/UECS/detail/SystemFunc.inl
@@ -2,12 +2,12 @@
 
 #include <_deps/nameof.hpp>
 
-namespace Ubpa::detail::System_ {
+namespace Ubpa::UECS::detail::System_ {
 	template<typename Func>
 	auto Pack(Func&& func) noexcept;
 }
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename Func>
 	SystemFunc::SystemFunc(Func&& func, std::string name, EntityLocator locator, EntityFilter filter)
 		: isJob{ IsEmpty_v<FuncTraits_ArgList<Func>> },
@@ -40,7 +40,7 @@ namespace Ubpa {
 	}
 }
 
-namespace Ubpa::detail::System_ {
+namespace Ubpa::UECS::detail::System_ {
 	template<typename DecayedArgList, typename SortedCmptList>
 	struct Packer;
 

diff --git a/include/UECS/detail/SystemMngr.inl b/include/UECS/detail/SystemMngr.inl
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Ubpa {
+namespace Ubpa::UECS {
 	template<typename System>
 	void SystemMngr::RegisterOne() {
 		Register(std::string{ nameof::nameof_type<System>() }, &System::OnUpdate);

diff --git a/include/UECS/detail/Util.h b/include/UECS/detail/Util.h
@@ -3,7 +3,7 @@
 #include <array>
 #include <string_view>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
     static constexpr size_t size_t_invalid = static_cast<size_t>(-1);
 
     inline constexpr size_t hash_combine(size_t x, size_t y) noexcept;

diff --git a/include/UECS/detail/Util.inl b/include/UECS/detail/Util.inl
@@ -2,7 +2,7 @@
 
 #include <UTemplate/TypeID.h>
 
-namespace Ubpa {
+namespace Ubpa::UECS {
     constexpr size_t hash_combine(size_t x, size_t y) noexcept {
         return x ^ (y + 0x9e3779b9 + (x << 6) + (x >> 2));
     }

diff --git a/src/core/Archetype.cpp b/src/core/Archetype.cpp
@@ -1,6 +1,6 @@
 #include <UECS/detail/Archetype.h>
 
-using namespace Ubpa;
+using namespace Ubpa::UECS;
 using namespace std;
 
 void Archetype::SetLayout() {