update

Author: malytomas

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
         cmake --version
         git --version
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -32,7 +32,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake -A${{ matrix.build-arch }} ${{ matrix.build-tool }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} ..
+        cmake -A${{ matrix.build-arch }} ${{ matrix.build-tool }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} -Dcage_use_steam_sockets=OFF ..
 
     - name: Build
       shell: bash
@@ -55,30 +55,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os-version: [22]
-        build-config: [debug, release, relwithdebinfo]
+        os-version: [24]
+        build-config: [debug, release]
         compiler:
-        - {
-            cc: gcc-12,
-            cxx: g++-12,
-            install: gcc-12 g++-12
-          }
         - {
             cc: gcc-13,
             cxx: g++-13,
             install: gcc-13 g++-13
           }
         - {
-            cc: clang-15,
-            cxx: clang++-15,
-            install: clang-15
+            cc: clang-18,
+            cxx: clang++-18,
+            install: clang-18
           }
 
     steps:
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y xorg-dev nasm ${{ matrix.compiler.install }}
+        sudo apt-get install -y xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev ${{ matrix.compiler.install }}
 
     - name: Versions
       run: |
@@ -87,20 +82,20 @@ jobs:
         ${{ matrix.compiler.cc }} --version
         ${{ matrix.compiler.cxx }} --version
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Configure
       run: |
         mkdir build
         cd build
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} ..
+        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} -Dcage_use_steam_sockets=0 ..
 
     - name: Build
       run: |
         cd build
-        cmake --build . --config ${{ matrix.build-config }} -- -j3
+        cmake --build . -- -j$(( `nproc` + 1 ))
 
     - name: Assets
       run: |

CMakeLists.txt

@@ -14,3 +14,4 @@ target_link_libraries(space-ants cage-simple)
 cage_ide_category(space-ants space-ants)
 cage_ide_sort_files(space-ants)
 cage_ide_working_dir_in_place(space-ants)
+cage_ide_startup_project(space-ants)

externals/cage

@@ -1,11 +1,11 @@
-#include "common.h"
-
 #include <cage-core/hashString.h>
 #include <cage-core/variableSmoothingBuffer.h>
 #include <cage-engine/sceneScreenSpaceEffects.h>
 #include <cage-engine/window.h>
 #include <cage-simple/fpsCamera.h>
 
+#include "common.h"
+
 namespace
 {
 	class AutoCamera
@@ -15,7 +15,7 @@ namespace
 
 		void updatePositions()
 		{
-			if (engineEntities()->has(shipName))
+			if (engineEntities()->exists(shipName))
 			{
 				Entity *ship = engineEntities()->get(shipName);
 				TransformComponent &t = ship->value<TransformComponent>();
@@ -28,7 +28,7 @@ namespace
 			{
 				uint32 cnt = engineEntities()->component<ShipComponent>()->count();
 				uint32 i = randomRange(0u, cnt);
-				shipName = engineEntities()->component<ShipComponent>()->entities()[i]->name();
+				shipName = engineEntities()->component<ShipComponent>()->entities()[i]->id();
 			}
 		}
 

sources/camera.cpp

@@ -1,15 +1,15 @@
 #ifndef ants_common_h_sdg456ds4hg6
 #define ants_common_h_sdg456ds4hg6
 
+//#include <atomic>
+
 #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>
 #include <cage-simple/engine.h>
 
-#include <atomic>
-
 using namespace cage;
 
 struct PhysicsComponent

sources/common.h

@@ -1,10 +1,10 @@
-#include "common.h"
+#include <initializer_list>
 
 #include <cage-core/string.h>
 #include <cage-engine/guiBuilder.h>
 #include <cage-engine/guiManager.h>
 
-#include <initializer_list>
+#include "common.h"
 
 namespace
 {
@@ -32,7 +32,7 @@ namespace
 
 	void guiEvent(input::GuiValue in)
 	{
-		const uint32 index = in.entity->name() - 20;
+		const uint32 index = in.entity->id() - 20;
 		if (index < array_size(propertyValues))
 		{
 			GuiInputComponent &input = in.entity->value<GuiInputComponent>();

sources/gui.cpp

@@ -1,10 +1,6 @@
-#include <cage-core/assetManager.h>
-#include <cage-core/config.h>
+#include <cage-core/assetsManager.h>
 #include <cage-core/hashString.h>
-#include <cage-core/ini.h>
 #include <cage-core/logger.h>
-#include <cage-core/math.h>
-
 #include <cage-engine/highPerformanceGpuHint.h>
 #include <cage-engine/window.h>
 #include <cage-simple/engine.h>
@@ -17,27 +13,22 @@ int main(int argc, const char *args[])
 {
 	try
 	{
-		Holder<Logger> log1 = newLogger();
-		log1->format.bind<logFormatConsole>();
-		log1->output.bind<logOutputStdOut>();
-
-		configSetBool("cage/config/autoSave", true);
+		initializeConsoleLogger();
 		engineInitialize(EngineCreateConfig());
-		controlThread().updatePeriod(1000000 / 30);
-		engineAssets()->add(HashString("ants/ants.pack"));
+		controlThread().updatePeriod(1'000'000 / 30);
+		engineAssets()->load(HashString("ants/ants.pack"));
 
 		const auto closeListener = engineWindow()->events.listen(inputFilter([](input::WindowClose) { engineStop(); }));
 		engineWindow()->title("space-ants");
 
 		{
 			Holder<FullscreenSwitcher> fullscreen = newFullscreenSwitcher({});
 			Holder<StatisticsGui> engineStatistics = newStatisticsGui();
-			engineStatistics->statisticsScope = StatisticsGuiScopeEnum::None;
 
 			engineRun();
 		}
 
-		engineAssets()->remove(HashString("ants/ants.pack"));
+		engineAssets()->unload(HashString("ants/ants.pack"));
 		engineFinalize();
 		return 0;
 	}

sources/main.cpp

@@ -1,13 +1,13 @@
-#include "common.h"
+#include <vector>
 
 #include <cage-core/color.h>
 #include <cage-core/hashString.h>
 
-#include <vector>
+#include "common.h"
 
 namespace
 {
-	constexpr const uint32 modelNames[] = {
+	constexpr uint32 modelNames[] = {
 		HashString("ants/planets/farcodev/0.object"),
 		HashString("ants/planets/farcodev/1.object"),
 		HashString("ants/planets/farcodev/2.object"),
@@ -48,12 +48,9 @@ namespace
 				RenderComponent &r = e->value<RenderComponent>();
 				r.object = modelNames[randomRange(0u, (uint32)(sizeof(modelNames) / sizeof(modelNames[0])))];
 				r.color = playerColors[owner.owner];
-				PhysicsComponent &physics = e->value<PhysicsComponent>();
-				physics.rotation = interpolate(Quat(), randomDirectionQuat(), 0.0003);
-				LifeComponent &life = e->value<LifeComponent>();
-				life.life = randomRange(1000000, 2000000);
-				PlanetComponent &planet = e->value<PlanetComponent>();
-				planet.batch = randomRange(3 * batchScale, 5 * batchScale);
+				e->value<PhysicsComponent>().rotation = interpolate(Quat(), randomDirectionQuat(), 0.0003);
+				e->value<LifeComponent>().life = randomRange(1000000, 2000000);
+				e->value<PlanetComponent>().batch = randomRange(3 * batchScale, 5 * batchScale);
 			}
 		},
 		-50);
@@ -66,18 +63,13 @@ namespace
 		t.scale = 0.3;
 		t.position = planetTransform.position + randomDirection3() * (t.scale + planetTransform.scale + 1e-5);
 		t.orientation = randomDirectionQuat();
-		OwnerComponent &planetOwner = (planet)->value<OwnerComponent>();
-		OwnerComponent &owner = e->value<OwnerComponent>();
-		owner.owner = planetOwner.owner;
-		RenderComponent &planetRender = planet->value<RenderComponent>();
+		e->value<OwnerComponent>().owner = planet->value<OwnerComponent>().owner;
 		RenderComponent &r = e->value<RenderComponent>();
-		r.color = planetRender.color;
+		r.color = planet->value<RenderComponent>().color;
 		r.object = HashString("ants/ships/1/1.object");
-		PhysicsComponent &physics = e->value<PhysicsComponent>();
-		LifeComponent &life = e->value<LifeComponent>();
-		life.life = randomRange(200, 300);
-		ShipComponent &ship = e->value<ShipComponent>();
-		ship.longtermTarget = target;
+		e->value<PhysicsComponent>();
+		e->value<LifeComponent>().life = randomRange(200, 300);
+		e->value<ShipComponent>().longtermTarget = target;
 	}
 
 	uint32 planetIndex = 0;
@@ -96,8 +88,7 @@ namespace
 					continue;
 				if (shipsCount + p.batch > shipsLimit)
 					continue;
-				OwnerComponent &owner = e->value<OwnerComponent>();
-				uint32 target = pickTargetPlanet(owner.owner);
+				uint32 target = pickTargetPlanet(e->value<OwnerComponent>().owner);
 				for (uint32 s = 0; s < p.batch; s++)
 					createShip(e, target);
 				p.batch = randomRange(3 * batchScale, 5 * batchScale);

sources/planets.cpp

@@ -1,4 +1,7 @@
-#include "common.h"
+#include <algorithm>
+#include <atomic>
+#include <random>
+#include <vector>
 
 #include <cage-core/concurrent.h>
 #include <cage-core/geometry.h>
@@ -9,10 +12,7 @@
 #include <cage-core/timer.h>
 #include <cage-core/variableSmoothingBuffer.h>
 
-#include <algorithm>
-#include <atomic>
-#include <random>
-#include <vector>
+#include "common.h"
 
 uint32 pickTargetPlanet(uint32 shipOwner)
 {
@@ -22,7 +22,7 @@ uint32 pickTargetPlanet(uint32 shipOwner)
 	for (Entity *e : planets)
 	{
 		if (e->value<OwnerComponent>().owner != shipOwner)
-			return e->name();
+			return e->id();
 	}
 	return 0;
 }
@@ -73,7 +73,7 @@ namespace
 			// find all nearby objects
 			spatialQuery->intersection(Sphere(t.position, t.scale + shipDetectRadius));
 			shipsInteracted += numeric_cast<uint32>(spatialQuery->result().size());
-			const uint32 myName = e->name();
+			const uint32 myName = e->id();
 			Vec3 avgPos;
 			Vec3 avgDir;
 			uint32 avgCnt = 0;
@@ -129,20 +129,20 @@ namespace
 
 			// choose a target to follow
 			uint32 targetName = 0;
-			if (engineEntities()->has(s.currentTarget))
+			if (engineEntities()->exists(s.currentTarget))
 				targetName = s.currentTarget;
 			else if (closestTargetName)
 				targetName = s.currentTarget = closestTargetName;
 			else
 			{
 				// use long-term goal
-				if (!engineEntities()->has(s.longtermTarget))
+				if (!engineEntities()->exists(s.longtermTarget))
 					s.longtermTarget = pickTargetPlanet(owner.owner);
 				targetName = s.longtermTarget;
 			}
 
 			// accelerate towards target
-			if (engineEntities()->has(targetName))
+			if (engineEntities()->exists(targetName))
 			{
 				Entity *target = engineEntities()->get(targetName);
 				const TransformComponent &targetTransform = target->value<TransformComponent>();
@@ -153,7 +153,7 @@ namespace
 			}
 
 			// fire at closest enemy
-			if (engineEntities()->has(closestTargetName))
+			if (engineEntities()->exists(closestTargetName))
 			{
 				Entity *target = engineEntities()->get(closestTargetName);
 				const TransformComponent &tt = target->value<TransformComponent>();
@@ -202,8 +202,8 @@ namespace
 				entitiesVisitor(
 					[&](Entity *e, const PhysicsComponent &, const TransformComponent &t)
 					{
-						if (e->name())
-							spatialSearchData->update(e->name(), Sphere(t.position, t.scale));
+						if (e->id())
+							spatialSearchData->update(e->id(), Sphere(t.position, t.scale));
 					},
 					engineEntities(), false);
 				spatialSearchData->rebuild();

sources/ships.cpp

@@ -1,8 +1,8 @@
-#include "common.h"
-
 #include <cage-core/color.h>
 #include <cage-core/hashString.h>
 
+#include "common.h"
+
 namespace
 {
 	Vec3 colorVariation(const Vec3 &c)
@@ -36,10 +36,8 @@ namespace
 			TextureAnimationComponent &at = e->value<TextureAnimationComponent>();
 			at.startTime = engineControlTime();
 			at.speed = randomRange(0.7, 1.5);
-			PhysicsComponent &p = e->value<PhysicsComponent>();
-			p.velocity = randomDirection3() * t.scale * 0.07 + sp.velocity;
-			TimeoutComponent &ttl = e->value<TimeoutComponent>();
-			ttl.ttl = numeric_cast<sint32>(Real(30) / at.speed);
+			e->value<PhysicsComponent>().velocity = randomDirection3() * t.scale * 0.07 + sp.velocity;
+			e->value<TimeoutComponent>().ttl = numeric_cast<sint32>(Real(30) / at.speed);
 		}
 	}