registSingleton

ActivePeter · Feb 3, 2022 · be8f4b0 · be8f4b0
1 parent 1cc666f
commit be8f4b0
Show file tree

Hide file tree

Showing 12 changed files with 448 additions and 505 deletions.
diff --git a/README.md b/README.md
@@ -8,13 +8,6 @@ c++ implementation of ECS （Entity Component System）lib
 
 c++的ecs库 （Entity Component System）
 
-## Table of Contents (内容)
-
-- [Record](./records/record.md)
-- [Background](#Background)
-- [Features](#Features)
-- [Todo](#Todo)
-
 ## [Record (记录)](./records/record.md)
 
 ## Background (背景)
@@ -80,8 +73,10 @@ When I'm writing a minecraft like game, I knows that ecs is a way to improve gam
             .addEmptyComponent<B>();
     ```
 
-  - **Random Access** Input pointer to access entity by entityID
+  - **Random Access/随机访问** 
 
+    Input pointer to access entity by entityID
+
     输入指针然后访问entity对应组件的数据，
 
     ```c++
@@ -97,9 +92,24 @@ When I'm writing a minecraft like game, I knows that ecs is a way to improve gam
     cameraPtr->Position = pos;
     ```
 
+  - **Rigist singleton/注册单例资源**
+
+    ```c++
+    ecs.scene->registSingleton<ContextId>(
+        [this](ContextId& cid)
+        {
+            cid.id = this->context_id.id;
+        });
+    ```
+
+
 
 ## Todo
 
+- [x] easy to add sys and entity
+
+  便捷注册 **系统** 和 **实体**
+
 - [x] random access
 
   随机访问
@@ -108,6 +118,10 @@ When I'm writing a minecraft like game, I knows that ecs is a way to improve gam
 
   系统组概念
 
+- [x] Rigist singleton
+
+  注册单例资源
+
 - [ ] multiple threads 
 
   多线程支持
diff --git a/README_CN.md b/README_CN.md
diff --git a/example/example.cpp b/example/example.cpp
diff --git a/src/paecs/Archtype.h b/src/paecs/Archtype.h
@@ -25,11 +25,11 @@ namespace paecs
 		//archtype中某个插件在chunk中的offset
 		int compOffsetInOneChunk;
 		//archtype中某个插件的描述信息引用
-		ComponentDiscription *compDiscription;
+		ComponentDiscription* compDiscription;
 		// size_t compSize;
 		CompInfoInArchtype() {}
-		CompInfoInArchtype(int offset, ComponentDiscription &disc) : compOffsetInOneChunk(offset),
-																	 compDiscription(&disc) {}
+		CompInfoInArchtype(int offset, ComponentDiscription& disc) : compOffsetInOneChunk(offset),
+			compDiscription(&disc) {}
 	};
 
 	//class Archtype;
@@ -45,22 +45,22 @@ namespace paecs
 	public:
 		// variables /////////////////////
 		ComponentMask componentMask;
-		ArchtypeManager &archtypeManager;
+		ArchtypeManager& archtypeManager;
 		//////////////////////////////////
 
-		Archtype(ArchtypeManager &archtypeManager1, int index1,
-				 const ComponentMask &componentMask1,
-				 std::vector<BaseComponent::Id> componentsIds1,
-				 std::vector<int> componentsOffsets1,
-				 int maxCnt1);
+		Archtype(ArchtypeManager& archtypeManager1, int index1,
+			const ComponentMask& componentMask1,
+			std::vector<BaseComponent::Id> componentsIds1,
+			std::vector<int> componentsOffsets1,
+			int maxCnt1);
 
 		// : archtypeManager(archtypeManager1) {}
 		//用于通过插件id直接查找插件信息，也可用于遍历插件信息
 		// std::unordered_map<BaseComponent::Id, CompInfoInArchtype> compIds2InfoMap;
 		phmap::flat_hash_map<BaseComponent::Id, CompInfoInArchtype> compIds2InfoMap;
 
 		template <typename Comp>
-		CompInfoInArchtype &getCompInfo()
+		CompInfoInArchtype& getCompInfo()
 		{
 			return compIds2InfoMap[Component<Comp>::getId()];
 		}
@@ -81,8 +81,8 @@ namespace paecs
 		// std::list<Chunk> chunks;
 		//在创建entity时调用
 		// void registMemForAnEntity(EntityDataPos &entityDataPos);
-		void allocateMemForAnEntity(EntityDataPos &entityDataPos);
-		void deallocateMemForAnEntity(EntityDataPos &entityDataPos);
+		void allocateMemForAnEntity(EntityDataPos& entityDataPos);
+		void deallocateMemForAnEntity(EntityDataPos& entityDataPos);
 	};
 
 	// Archtype a;
@@ -110,35 +110,36 @@ namespace paecs
 		 * @param id       插件id，需要这个id来获取在当前chunk中应该用的size和offset
 		 * @param index    entity在chunk中的位置
 		 */
-		void cpyComponentDataFromOldDatapos2ChunkIndex_ifContainId(uint8_t *oldDataPos, BaseComponent::Id id, uint32_t index)
+		void cpyComponentDataFromOldDatapos2ChunkIndex_ifContainId(uint8_t* oldDataPos, BaseComponent::Id id, uint32_t index)
 		{
 			if (archtypePtr->compIds2InfoMap.count(id))
 			{
 				// auto size = BaseComponent::getDiscriptionOfComponentById(id).componentSize;
-				auto &compInfo = archtypePtr->compIds2InfoMap[id];
-				auto &size = compInfo.compDiscription->componentSize;
-				auto &offset = compInfo.compOffsetInOneChunk;
+				auto& compInfo = archtypePtr->compIds2InfoMap[id];
+				auto& size = compInfo.compDiscription->componentSize;
+				auto& offset = compInfo.compOffsetInOneChunk;
 				// auto offset = .compOffsetInOneChunk;
 				// auto size=
 				memcpy(&storage[offset + index * size], oldDataPos, size);
 				// storage[offset+]
 			}
 		}
 		template <typename Comp>
-		Comp &getCompDataOfIndex(int index)
+		Comp& getCompDataOfIndex(int index)
 		{
-			CompInfoInArchtype &info = this->archtypePtr->getCompInfo<Comp>();
+			CompInfoInArchtype& info = this->archtypePtr->getCompInfo<Comp>();
 			assert(&info);
 			return
 				// (Comp &)
-				*((Comp *)&(storage[info.compOffsetInOneChunk + info.compDiscription->componentSize * index]));
+				*((Comp*)&(storage[info.compOffsetInOneChunk + info.compDiscription->componentSize * index]));
 		}
 		template <typename Comp>
-		Comp *getCompDataPtrOfIndex(int index)
+		Comp* getCompDataPtrOfIndex(int index)
 		{
-			CompInfoInArchtype &info = this->archtypePtr->getCompInfo<Comp>();
+
+			CompInfoInArchtype& info = this->archtypePtr->getCompInfo<Comp>();
 			assert(&info);
-			return (Comp *)(&(storage[info.compOffsetInOneChunk + info.compDiscription->componentSize * index]));
+			return (Comp*)(&(storage[info.compOffsetInOneChunk + info.compDiscription->componentSize * index]));
 		}
 	};
 

diff --git a/src/paecs/ArchtypeManager.cpp b/src/paecs/ArchtypeManager.cpp
@@ -1,6 +1,7 @@
 //#include "Archtype.h"
-#include "parallel_hashmap/phmap.h"
 #include "ArchtypeManager.h"
+#include "parallel_hashmap/phmap.h"
+
 
 namespace paecs
 {