fix bugs

Ubpa · Mar 23, 2021 · 1148ac1 · 1148ac1
1 parent 653d6ab
commit 1148ac1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/include/UECS/Chunk.hpp b/include/UECS/Chunk.hpp
@@ -28,7 +28,11 @@ namespace Ubpa::UECS {
 
 		// if not contains the component, return nullptr
 		template<typename Cmpt>
-		std::span<Cmpt> GetCmptArray() const noexcept { return { (Cmpt*)GetCmptArray(TypeID_of<Cmpt>), GetHead()->num_component }; }
+		std::span<Cmpt> GetCmptArray() const noexcept {
+			void* ptr = GetCmptArray(TypeID_of<Cmpt>);
+			if (ptr) return { (Cmpt*)ptr,EntityNum() };
+			else return {};
+		}
 
 		std::span<Entity> GetEntityArray() const noexcept { return GetCmptArray<Entity>(); }
 

diff --git a/src/core/World.cpp b/src/core/World.cpp
@@ -60,6 +60,12 @@ World::~World() {
 }
 
 void World::Update() {
+	// 1. clear
+	schedule.Clear();
+
+	sync_frame_rsrc->release();
+	unsync_frame_rsrc->release();
+
 	entityMngr.NewFrame();
 
 	// 2. update schedule
@@ -102,11 +108,6 @@ void World::Update() {
 
 	// 4. update version
 	version++;
-
-	schedule.Clear();
-
-	sync_frame_rsrc->release();
-	unsync_frame_rsrc->release();
 }
 
 string World::DumpUpdateJobGraph() const {

diff --git a/src/test/24_rsrc/main.cpp b/src/test/24_rsrc/main.cpp
@@ -83,7 +83,7 @@ int main() {
 		w.systemMngr.RegisterAndCreate<FillSystem>();
 		w.systemMngr.Activate<FillSystem>();
 
-		for (std::size_t i = 0; i < 100000; i++)
+		for (std::size_t i = 0; i < 10000; i++)
 			w.entityMngr.Create(TypeIDs_of<Buffer>);
 
 		w.Update();