update with UTemplate

Ubpa · Feb 22, 2021 · fc56ee8 · fc56ee8
1 parent ae27608
commit fc56ee8
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(UECS VERSION 0.15.0)
+project(UECS VERSION 0.15.1)
 message(STATUS "[Project] ${PROJECT_NAME}")
 
 include(cmake/InitUCMake.cmake)
 Ubpa_InitUCMake(VERSION 0.6.4)
 
 Ubpa_InitProject()
 
-Ubpa_AddDep(UTemplate  0.6.0)
-Ubpa_AddDep(UGraphviz  0.2.0)
+Ubpa_AddDep(UTemplate 0.7.1)
+Ubpa_AddDep(UGraphviz 0.2.0)
 
 Ubpa_AddSubDirsRec(include)
 Ubpa_AddSubDirsRec(src)

diff --git a/README.md b/README.md
@@ -18,13 +18,11 @@
 
 **U**bpa **E**ntity-**C**omponent-**S**ystem in Unity3D-style
 
-## Environment
+## Compiler compatibility
 
-- Compiler
-  - MSVC: >=1926
-  - GCC: >= 10
-  - Clang: >= 10
-- C++ 20
+- Clang/LLVM >= 10.0
+- GCC >= 10.0
+- MSVC >= 1926
 
 ## Documentation
 

diff --git a/include/UECS/AccessTypeID.h b/include/UECS/AccessTypeID.h
@@ -4,7 +4,7 @@
 
 #include "details/Util.h"
 
-#include <UTemplate/TypeID.h>
+#include <UTemplate/Type.h>
 
 #include <set>
 

diff --git a/include/UECS/CmptTag.h b/include/UECS/CmptTag.h
@@ -14,9 +14,9 @@ namespace Ubpa::UECS {
 	// 6. Latest<Singleton<Cmpt>>
 
 	enum class AccessMode : std::size_t {
-		LAST_FRAME           = 0b000, // LastFrame<Cmpt>
-		WRITE                = 0b001, // Write<Cmpt> / Cmpt*
-		LATEST               = 0b010, // Latest<Cmpt> / const Cmpt*
+		LAST_FRAME = 0b000, // LastFrame<Cmpt>
+		WRITE      = 0b001, // Write<Cmpt> / Cmpt*
+		LATEST     = 0b010, // Latest<Cmpt> / const Cmpt*
 	};
 
 	template<typename Cmpt>

diff --git a/include/UECS/config.h b/include/UECS/config.h
@@ -5,10 +5,10 @@ namespace Ubpa::UECS {
 
 	// Cache-Lines size is (typically) 64 bytes
 	// it has to be an exponent of 2 and >= 16
-	constexpr std::size_t CHUNK_ALIGNMENT = 64;
+	constexpr std::size_t ChunkAlignment = 64;
 
 	// 16384 bytes : 16 KB
-	// it has to be a multiple of UECS_CHUNK_ALIGNMENT and an exponent of 2
-	constexpr std::size_t CHUNK_SIZE = 16384;
+	// it has to be a multiple of ChunkAlignment and an exponent of 2
+	constexpr std::size_t ChunkSize = 16384;
 }
 
diff --git a/include/UECS/details/Archetype.inl b/include/UECS/details/Archetype.inl
@@ -9,7 +9,7 @@ namespace Ubpa::UECS {
 		types(GenTypeIDSet<Cmpts...>()),
 		chunkAllocator{ chunkAllocator }
 	{
-		static_assert(IsSet_v<TypeList<Entity, Cmpts...>>,
+		static_assert(IsUnique_v<TypeList<Entity, Cmpts...>>,
 			"<Cmpts>... must be different");
 		cmptTraits.Register<Entity>();
 		(cmptTraits.Register<Cmpts>(), ...);
@@ -19,7 +19,7 @@ namespace Ubpa::UECS {
 	template<typename... Cmpts>
 	Archetype* Archetype::Add(const Archetype* from) {
 		static_assert(sizeof...(Cmpts) > 0);
-		static_assert(IsSet_v<TypeList<Entity, Cmpts...>>,
+		static_assert(IsUnique_v<TypeList<Entity, Cmpts...>>,
 			"<Cmpts>... must be different");
 		assert(!(from->types.Contains(TypeID_of<Cmpts>) &&...));
 
@@ -39,7 +39,7 @@ namespace Ubpa::UECS {
 	std::tuple<std::size_t, std::tuple<Cmpts *...>> Archetype::Create(Entity e) {
 		static_assert((std::is_constructible_v<Cmpts> &&...),
 			"<Cmpts> isn't constructible");
-		static_assert(IsSet_v<TypeList<Entity, Cmpts...>>,
+		static_assert(IsUnique_v<TypeList<Entity, Cmpts...>>,
 			"<Cmpts>... must be different");
 
 		assert((types.Contains(TypeID_of<Cmpts>) &&...) && types.data.size() == 1 + sizeof...(Cmpts));
@@ -58,7 +58,7 @@ namespace Ubpa::UECS {
 	template<typename... Cmpts>
 	TypeIDSet Archetype::GenTypeIDSet() {
 		if constexpr (sizeof...(Cmpts) > 0) {
-			static_assert(IsSet_v<TypeList<Entity, Cmpts...>>,
+			static_assert(IsUnique_v<TypeList<Entity, Cmpts...>>,
 				"<Cmpts>... must be different");
 
 			constexpr std::array types = { TypeID_of<Cmpts>... };

diff --git a/include/UECS/details/Chunk.h b/include/UECS/details/Chunk.h
@@ -9,8 +9,8 @@
 namespace Ubpa::UECS {
 	using byte = uint8_t;
 	static_assert(sizeof(byte) == 1);
-	struct alignas(CHUNK_ALIGNMENT) Chunk {
-		static constexpr std::size_t size = CHUNK_SIZE;
+	struct alignas(ChunkAlignment) Chunk {
+		static constexpr std::size_t size = ChunkSize;
 
 		struct Layout {
 			std::size_t capacity;

diff --git a/include/UECS/details/SystemFunc.inl b/include/UECS/details/SystemFunc.inl
@@ -143,7 +143,7 @@ namespace Ubpa::UECS::details {
 		using ArgList = FuncTraits_ArgList<Func>;
 
 		using DecayedArgList = Transform_t<ArgList, DecayArg>;
-		static_assert(IsSet_v<DecayedArgList>, "details::System_::Pack: <Func>'s argument types must be a set");
+		static_assert(IsUnique_v<DecayedArgList>, "details::System_::Pack: <Func>'s argument types must be a set");
 
 		using TaggedCmptList = Filter_t<ArgList, IsTaggedCmpt>;
 

diff --git a/include/UECS/details/Util.inl b/include/UECS/details/Util.inl
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <UTemplate/TypeID.h>
+#include <UTemplate/Type.h>
 
 namespace Ubpa::UECS {
     constexpr std::size_t hash_combine(std::size_t x, std::size_t y) noexcept {

diff --git a/src/app/CmptHashCode/main.cpp b/src/app/CmptHashCode/main.cpp
@@ -1,4 +1,4 @@
-#include <UTemplate/TypeID.h>
+#include <UTemplate/Type.h>
 
 #include <iostream>
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -6,6 +6,16 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   list(APPEND c_options "-pthread")
 endif()
+
+set(c_options_private "")
+if(MSVC)
+  list(APPEND c_options_private "/MP")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  #
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  #
+endif()
+
 set(l_options "")
 if(MSVC)
   #..
@@ -27,6 +37,8 @@ Ubpa_AddTarget(
     "${PROJECT_SOURCE_DIR}/include"
   C_OPTION
     ${c_options}
+  C_OPTION_PRIVATE
+    ${c_options_private}
   L_OPTION
     ${l_options}
 )