Test fixes

Author: muit

Include/PipeECS.h

@@ -251,7 +251,7 @@ namespace p
 		void Create(TView<Id> newIds);
 		bool Remove(TView<const Id> ids);
 		bool DeferredRemove(TView<const Id> ids);
-		void FlushDeferredRemoves();
+		void FlushDeferredRemovals();
 		const TArray<Id>& GetDeferredRemovals() const
 		{
 			return deferredRemoves;
@@ -2207,7 +2207,8 @@ namespace p
 	P_API void AddId(EntityContext& ctx, TView<Id> Ids);
 
 	// Remove
-	P_API void RmId(EntityContext& ctx, TView<const Id> ids, RmIdFlags flags = RmIdFlags::None);
+	P_API bool RmId(EntityContext& ctx, TView<const Id> ids, RmIdFlags flags = RmIdFlags::None);
+	P_API bool FlushDeferredRemovals(EntityContext& ctx);
 #pragma endregion Editing
 
 

Src/PipeECS.cpp

@@ -154,7 +154,7 @@ namespace p
 		return (deferredRemoves.Size() - lastPending) > 0;
 	}
 
-	void IdRegistry::FlushDeferredRemoves()
+	void IdRegistry::FlushDeferredRemovals()
 	{
 		available.ReserveMore(deferredRemoves.Size());
 		for (Id id : deferredRemoves)
@@ -1098,7 +1098,7 @@ namespace p
 		ctx.GetIdRegistry().Create(ids);
 	}
 
-	void RmId(EntityContext& ctx, TView<const Id> ids, RmIdFlags flags)
+	bool RmId(EntityContext& ctx, TView<const Id> ids, RmIdFlags flags)
 	{
 		TArray<Id> allIds;    // Only used when removing children. Here for scope purposes.
 		if (HasFlag(flags, p::RmIdFlags::RemoveChildren))
@@ -1115,14 +1115,24 @@ namespace p
 			{
 				pool.GetPool()->Remove(ids);
 			}
-			ctx.GetIdRegistry().Remove(ids);
+			return ctx.GetIdRegistry().Remove(ids);
 		}
 		else
 		{
-			ctx.GetIdRegistry().DeferredRemove(ids);
+			return ctx.GetIdRegistry().DeferredRemove(ids);
 		}
 	}
 
+	bool FlushDeferredRemovals(EntityContext& ctx)
+	{
+		TView<Id> ids = ctx.GetIdRegistry().GetDeferredRemovals();
+		for (auto& pool : ctx.GetPools())
+		{
+			pool.GetPool()->Remove(ids);
+		}
+		ctx.GetIdRegistry().FlushDeferredRemovals();
+	}
+
 
 	void AttachId(
 	    TAccessRef<TWrite<CChild>, TWrite<CParent>> access, Id parent, TView<const Id> children)

Tests/ECS/Filtering.spec.cpp

@@ -99,7 +99,7 @@ go_bandit([]() {
 				RmId(ctx, id3);    // Remove last in the pool
 				RmId(ctx, id4);    // Remove last in the pool
 
-				ctx.FlushDeferredRemoves();
+				FlushDeferredRemovals(ctx);
 
 				TArray<Id> ids = FindAllIdsWith<TypeB>(access);
 				AssertThat(ids.Contains(NoId), Is().False());

Tests/ECS/IdRegistry.spec.cpp

@@ -91,9 +91,9 @@ go_bandit([]() {
 
 		it("Removed id index gets reused", [&]() {
 			IdRegistry ids;
-			ids.Create(1);
+			ids.Create();
 			Id id = ids.Create();
-			ids.Create(1);
+			ids.Create();
 			AssertThat(ids.Remove(id), Is().True());
 			Id id2 = ids.Create();
 			AssertThat(id2.GetIndex(), Equals(id.GetIndex()));
@@ -103,13 +103,13 @@ go_bandit([]() {
 
 		it("Deferred removed id index doesn't get reused until flushed", [&]() {
 			IdRegistry ids;
-			ids.Create(1);
+			ids.Create();
 			Id id = ids.Create();
-			ids.Create(1);
+			ids.Create();
 			AssertThat(ids.DeferredRemove(id), Is().True());
 			Id id2 = ids.Create();
 			AssertThat(id2.GetIndex(), !Equals(id.GetIndex()));
-			ids.FlushDeferredRemoves();
+			ids.FlushDeferredRemovals();
 			Id id3 = ids.Create();
 			AssertThat(id3.GetIndex(), Equals(id.GetIndex()));
 			Id id4 = ids.Create();