update cage (optimize entities)

sources/common.h

@@ -2,6 +2,7 @@
 #define ants_common_h_sdg456ds4hg6
 
 #include <cage-core/entities.h>
+#include <cage-core/entitiesVisitor.h>
 #include <cage-core/math.h>
 #include <cage-core/profiling.h>
 #include <cage-engine/scene.h>
@@ -45,7 +46,8 @@ struct TimeoutComponent
 	sint32 ttl = 1;
 };
 
-extern EntityGroup *entitiesToDestroy;
+struct DestroyingComponent
+{};
 
 uint32 pickTargetPlanet(uint32 shipOwner);
 

sources/components.cpp

@@ -11,6 +11,7 @@ namespace
 			engineEntities()->defineComponent(ShipComponent());
 			engineEntities()->defineComponent(PlanetComponent());
 			engineEntities()->defineComponent(TimeoutComponent());
+			engineEntities()->defineComponent(DestroyingComponent());
 		},
-		-100);
+		-1000);
 }

sources/physics.cpp

@@ -5,20 +5,20 @@ namespace
 	const auto engineUpdateListener = controlThread().update.listen(
 		[]()
 		{
-			ProfilingScope profiling("physics");
-			for (Entity *e : engineEntities()->component<PhysicsComponent>()->entities())
-			{
-				TransformComponent &t = e->value<TransformComponent>();
-				PhysicsComponent &p = e->value<PhysicsComponent>();
-				CAGE_ASSERT(p.acceleration.valid() && p.velocity.valid() && t.position.valid());
-				CAGE_ASSERT(p.rotation.valid() && t.orientation.valid());
-				p.velocity += p.acceleration;
-				if (lengthSquared(p.velocity) > sqr(p.maxSpeed))
-					p.velocity = normalize(p.velocity) * p.maxSpeed;
-				p.acceleration = Vec3();
-				t.position += p.velocity;
-				t.orientation = p.rotation * t.orientation;
-			}
+			const ProfilingScope profiling("physics");
+			entitiesVisitor(
+				[](TransformComponent &t, PhysicsComponent &p)
+				{
+					CAGE_ASSERT(p.acceleration.valid() && p.velocity.valid() && t.position.valid());
+					CAGE_ASSERT(p.rotation.valid() && t.orientation.valid());
+					p.velocity += p.acceleration;
+					if (lengthSquared(p.velocity) > sqr(p.maxSpeed))
+						p.velocity = normalize(p.velocity) * p.maxSpeed;
+					p.acceleration = Vec3();
+					t.position += p.velocity;
+					t.orientation = p.rotation * t.orientation;
+				},
+				engineEntities(), false);
 		},
 		100);
 }

sources/planets.cpp

@@ -85,7 +85,7 @@ namespace
 	const auto engineUpdateListener = controlThread().update.listen(
 		[]()
 		{
-			ProfilingScope profiling("planets");
+			const ProfilingScope profiling("planets");
 			uint32 shipsCount = engineEntities()->component<ShipComponent>()->count();
 			uint32 planetsCount = engineEntities()->component<PlanetComponent>()->count();
 			uint32 currentIndex = 0;

sources/ships.cpp

@@ -1,7 +1,6 @@
 #include "common.h"
 
 #include <cage-core/concurrent.h>
-#include <cage-core/entitiesVisitor.h>
 #include <cage-core/geometry.h>
 #include <cage-core/hashString.h>
 #include <cage-core/random.h>
@@ -198,7 +197,7 @@ namespace
 			// add all physics objects into spatial data
 			clock->reset();
 			{
-				ProfilingScope profiling("spatial data");
+				const ProfilingScope profiling("spatial data");
 				spatialSearchData->clear();
 				entitiesVisitor(
 					[&](Entity *e, const PhysicsComponent &, const TransformComponent &t)
@@ -214,7 +213,7 @@ namespace
 			// update ships
 			clock->reset();
 			{
-				ProfilingScope profiling("update");
+				const ProfilingScope profiling("update");
 				std::vector<ShipUpdater> ships;
 				ships.reserve(10000);
 				entitiesVisitor([&](Entity *e, TransformComponent &t, ShipComponent &s, OwnerComponent &owner, PhysicsComponent &phys, LifeComponent &life) { ships.push_back({ e, t, s, owner, phys, life }); }, engineEntities(), false);

sources/timeout.cpp

@@ -3,8 +3,6 @@
 #include <cage-core/color.h>
 #include <cage-core/hashString.h>
 
-EntityGroup *entitiesToDestroy;
-
 namespace
 {
 	Vec3 colorVariation(const Vec3 &c)
@@ -49,32 +47,28 @@ namespace
 		[]()
 		{
 			{
-				ProfilingScope profiling("timeout");
+				const ProfilingScope profiling("timeout");
 				for (Entity *e : engineEntities()->component<TimeoutComponent>()->entities())
 				{
 					TimeoutComponent &t = e->value<TimeoutComponent>();
 					if (t.ttl-- <= 0)
-						e->add(entitiesToDestroy);
+						e->value<DestroyingComponent>();
 				}
 			}
 			{
-				ProfilingScope profiling("explosions");
+				const ProfilingScope profiling("explosions");
 				for (Entity *e : engineEntities()->component<LifeComponent>()->entities())
 				{
 					LifeComponent &l = e->value<LifeComponent>();
 					if (l.life <= 0)
 					{
-						e->add(entitiesToDestroy);
+						e->value<DestroyingComponent>();
 						if (e->has<ShipComponent>())
 							shipExplode(e);
 					}
 				}
 			}
-			{
-				entitiesToDestroy->destroy();
-			}
+			engineEntities()->component<DestroyingComponent>()->destroy();
 		},
 		90);
-
-	const auto engineInitListener = controlThread().initialize.listen([]() { entitiesToDestroy = engineEntities()->defineGroup(); }, -90);
 }