diff --git a/Engine b/Engine
index 1644a75..65dcb0c 160000
--- a/Engine
+++ b/Engine
@@ -1 +1 @@
-Subproject commit 1644a751bb81ab0f0d467321d1dd5cd2e326227a
+Subproject commit 65dcb0c5647484b02767ac9fbcdb397a820d59f6
diff --git a/Platforms/Desktop/Desktop.csproj b/Platforms/Desktop/Desktop.csproj
index e20318e..6606edc 100644
--- a/Platforms/Desktop/Desktop.csproj
+++ b/Platforms/Desktop/Desktop.csproj
@@ -41,7 +41,7 @@
-
+
diff --git a/Platforms/Desktop/Program.cs b/Platforms/Desktop/Program.cs
index b19865d..68b447b 100644
--- a/Platforms/Desktop/Program.cs
+++ b/Platforms/Desktop/Program.cs
@@ -3,11 +3,11 @@ using System.IO;
using Microsoft.Xna.Framework.Graphics;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Core.Debug;
-using Syntriax.Engine.Core.Serialization;
-using Syntriax.Engine.Integration.MonoGame;
-using Syntriax.Engine.Serializers.Yaml;
+using Engine.Core;
+using Engine.Core.Debug;
+using Engine.Core.Serialization;
+using Engine.Integration.MonoGame;
+using Engine.Serializers.Yaml;
Universe universe = new();
@@ -39,7 +39,7 @@ monoGameWindow.Graphics.PreferredBackBufferWidth = clientConfiguration.windowWid
monoGameWindow.Graphics.PreferredBackBufferHeight = clientConfiguration.windowHeight;
monoGameWindow.Graphics.GraphicsProfile = GraphicsProfile.HiDef;
-universe.FindBehaviour()?
+universe.FindBehaviour()?
.OnConnectionEstablished.AddOneTimeListener(
(sender, connection) => monoGameWindow.Window.Title = $"Client {connection.Id}"
);
diff --git a/Platforms/Server/PongEndpoints.cs b/Platforms/Server/PongEndpoints.cs
index 0999964..3e822fa 100644
--- a/Platforms/Server/PongEndpoints.cs
+++ b/Platforms/Server/PongEndpoints.cs
@@ -5,8 +5,8 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Systems.Network;
+using Engine.Core;
+using Engine.Systems.Network;
namespace Server;
diff --git a/Platforms/Server/Program.cs b/Platforms/Server/Program.cs
index 2d9b521..6ba5cca 100644
--- a/Platforms/Server/Program.cs
+++ b/Platforms/Server/Program.cs
@@ -1,8 +1,8 @@
using System;
using System.Threading;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Core.Debug;
+using Engine.Core;
+using Engine.Core.Debug;
Universe universe = new();
diff --git a/Platforms/Server/Server.csproj b/Platforms/Server/Server.csproj
index 8918732..1a41871 100644
--- a/Platforms/Server/Server.csproj
+++ b/Platforms/Server/Server.csproj
@@ -5,6 +5,8 @@
net9.0
disable
enable
+ Pong.Platforms.Server
+ Server
diff --git a/Pong.sln b/Pong.sln
index 6c8d383..ed57f5b 100644
--- a/Pong.sln
+++ b/Pong.sln
@@ -25,9 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Integration.MonoGame
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Platforms\Server\Server.csproj", "{A15263DB-DF65-4A07-8CA1-33A2919501A0}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine.Serializers", "Engine.Serializers", "{F1257AE1-A8BC-DE44-CB86-406F1335A1D0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Serializers.Yaml", "Engine\Engine.Serializers\Engine.Serializers.Yaml\Engine.Serializers.Yaml.csproj", "{79F870AB-249E-4CA0-9DF0-F265514581DF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Integration.Yaml", "Engine\Engine.Integration\Engine.Integration.Yaml\Engine.Integration.Yaml.csproj", "{79F870AB-249E-4CA0-9DF0-F265514581DF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Integration.LiteNetLib", "Engine\Engine.Integration\Engine.Integration.LiteNetLib\Engine.Integration.LiteNetLib.csproj", "{7AA22306-772F-45F4-8F30-97EBD1FC124D}"
EndProject
@@ -174,8 +172,6 @@ Global
{9059393F-4073-9273-0EEC-2B1BA61B620B} = {F7F62670-237A-4C93-A30E-CE661C6FC401}
{7CC31BC4-38EE-40F4-BBBA-9FC2F4CF6283} = {9059393F-4073-9273-0EEC-2B1BA61B620B}
{A15263DB-DF65-4A07-8CA1-33A2919501A0} = {FECFFD54-338F-4060-9161-1E5770D1DC33}
- {F1257AE1-A8BC-DE44-CB86-406F1335A1D0} = {F7F62670-237A-4C93-A30E-CE661C6FC401}
- {79F870AB-249E-4CA0-9DF0-F265514581DF} = {F1257AE1-A8BC-DE44-CB86-406F1335A1D0}
{7AA22306-772F-45F4-8F30-97EBD1FC124D} = {9059393F-4073-9273-0EEC-2B1BA61B620B}
EndGlobalSection
EndGlobal
diff --git a/Shared/Behaviours/Ball.cs b/Shared/Behaviours/Ball.cs
index feae8f8..0c5b126 100644
--- a/Shared/Behaviours/Ball.cs
+++ b/Shared/Behaviours/Ball.cs
@@ -1,11 +1,11 @@
using Microsoft.Xna.Framework.Audio;
using Microsoft.Xna.Framework.Content;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Integration.MonoGame;
-using Syntriax.Engine.Systems.Network;
-using Syntriax.Engine.Physics2D;
-using Syntriax.Engine.Systems.Tween;
+using Engine.Core;
+using Engine.Integration.MonoGame;
+using Engine.Systems.Network;
+using Engine.Physics2D;
+using Engine.Systems.Tween;
namespace Pong.Behaviours;
diff --git a/Shared/Behaviours/CameraController.cs b/Shared/Behaviours/CameraController.cs
index 60744ba..f0e8c03 100644
--- a/Shared/Behaviours/CameraController.cs
+++ b/Shared/Behaviours/CameraController.cs
@@ -1,8 +1,8 @@
using Microsoft.Xna.Framework.Input;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Integration.MonoGame;
-using Syntriax.Engine.Systems.Input;
+using Engine.Core;
+using Engine.Integration.MonoGame;
+using Engine.Systems.Input;
namespace Pong.Behaviours;
diff --git a/Shared/Behaviours/DrawableColliderCircle.cs b/Shared/Behaviours/DrawableColliderCircle.cs
index 6e945ee..32d57f6 100644
--- a/Shared/Behaviours/DrawableColliderCircle.cs
+++ b/Shared/Behaviours/DrawableColliderCircle.cs
@@ -1,9 +1,9 @@
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Integration.MonoGame;
+using Engine.Core;
+using Engine.Integration.MonoGame;
namespace Pong.Behaviours;
-public class DrawableColliderCircle : Syntriax.Engine.Physics2D.Collider2DCircle, IDrawableTriangle
+public class DrawableColliderCircle : Engine.Physics2D.Collider2DCircle, IDrawableTriangle
{
private const float CIRCLE_SEGMENT_COUNT = 32f;
diff --git a/Shared/Behaviours/DrawableColliderShape.cs b/Shared/Behaviours/DrawableColliderShape.cs
index abe3a22..bfb79ed 100644
--- a/Shared/Behaviours/DrawableColliderShape.cs
+++ b/Shared/Behaviours/DrawableColliderShape.cs
@@ -1,11 +1,11 @@
using System.Collections.Generic;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Integration.MonoGame;
+using Engine.Core;
+using Engine.Integration.MonoGame;
namespace Pong.Behaviours;
-public class DrawableColliderShape : Syntriax.Engine.Physics2D.Collider2DShape, IDrawableTriangle
+public class DrawableColliderShape : Engine.Physics2D.Collider2DShape, IDrawableTriangle
{
private readonly IList triangles = [];
diff --git a/Shared/Behaviours/Label.cs b/Shared/Behaviours/Label.cs
index 30b6b34..9e82214 100644
--- a/Shared/Behaviours/Label.cs
+++ b/Shared/Behaviours/Label.cs
@@ -1,8 +1,8 @@
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Integration.MonoGame;
+using Engine.Core;
+using Engine.Integration.MonoGame;
namespace Pong.Behaviours;
diff --git a/Shared/Behaviours/Paddle.cs b/Shared/Behaviours/Paddle.cs
index cec6a69..ebb6e6f 100644
--- a/Shared/Behaviours/Paddle.cs
+++ b/Shared/Behaviours/Paddle.cs
@@ -2,11 +2,11 @@ using System;
using Microsoft.Xna.Framework.Input;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Systems.Network;
-using Syntriax.Engine.Physics2D;
-using Syntriax.Engine.Systems.Input;
-using Syntriax.Engine.Systems.Tween;
+using Engine.Core;
+using Engine.Systems.Network;
+using Engine.Physics2D;
+using Engine.Systems.Input;
+using Engine.Systems.Tween;
namespace Pong.Behaviours;
diff --git a/Shared/Behaviours/PongGameStarter.cs b/Shared/Behaviours/PongGameStarter.cs
index 35703f9..60a99ea 100644
--- a/Shared/Behaviours/PongGameStarter.cs
+++ b/Shared/Behaviours/PongGameStarter.cs
@@ -2,13 +2,13 @@ using Microsoft.Xna.Framework.Audio;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Input;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Core.Debug;
-using Syntriax.Engine.Integration.MonoGame;
-using Syntriax.Engine.Systems.Network;
-using Syntriax.Engine.Systems.Input;
-using Syntriax.Engine.Systems.Time;
-using Syntriax.Engine.Systems.Tween;
+using Engine.Core;
+using Engine.Core.Debug;
+using Engine.Integration.MonoGame;
+using Engine.Systems.Network;
+using Engine.Systems.Input;
+using Engine.Systems.Time;
+using Engine.Systems.Tween;
namespace Pong.Behaviours;
diff --git a/Shared/Behaviours/PongManager.cs b/Shared/Behaviours/PongManager.cs
index fd8438a..75ad33c 100644
--- a/Shared/Behaviours/PongManager.cs
+++ b/Shared/Behaviours/PongManager.cs
@@ -3,10 +3,10 @@ using System;
using Microsoft.Xna.Framework.Audio;
using Microsoft.Xna.Framework.Content;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Core.Debug;
-using Syntriax.Engine.Integration.MonoGame;
-using Syntriax.Engine.Systems.Network;
+using Engine.Core;
+using Engine.Core.Debug;
+using Engine.Integration.MonoGame;
+using Engine.Systems.Network;
namespace Pong.Behaviours;
@@ -113,10 +113,10 @@ public class PongManager : Behaviour, INetworkEntity, IFirstFrameUpdate, ILoadCo
private Vector2D GetBallLaunchDirection()
{
- const float AllowedRadians = 45f * Syntriax.Engine.Core.Math.DegreeToRadian;
+ const float AllowedRadians = 45f * Engine.Core.Math.DegreeToRadian;
float rotation = (float)random.NextDouble() * 2f * AllowedRadians - AllowedRadians;
bool isBackwards = (random.Next() % 2) == 1;
- return Vector2D.Right.Rotate(isBackwards ? rotation + Syntriax.Engine.Core.Math.Pi : rotation);
+ return Vector2D.Right.Rotate(isBackwards ? rotation + Engine.Core.Math.Pi : rotation);
}
void IPacketListenerClient.OnClientPacketArrived(IConnection sender, ScorePacket packet)
diff --git a/Shared/Behaviours/ScoreLabel.cs b/Shared/Behaviours/ScoreLabel.cs
index 25a1c5a..2bea099 100644
--- a/Shared/Behaviours/ScoreLabel.cs
+++ b/Shared/Behaviours/ScoreLabel.cs
@@ -1,4 +1,4 @@
-using Syntriax.Engine.Core;
+using Engine.Core;
namespace Pong.Behaviours;
diff --git a/Shared/Behaviours/ScoreWall.cs b/Shared/Behaviours/ScoreWall.cs
index 7d2ce93..eed629b 100644
--- a/Shared/Behaviours/ScoreWall.cs
+++ b/Shared/Behaviours/ScoreWall.cs
@@ -1,7 +1,7 @@
using System;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Physics2D;
+using Engine.Core;
+using Engine.Physics2D;
namespace Pong.Behaviours;
diff --git a/Shared/PongUniverse.cs b/Shared/PongUniverse.cs
index 8c1a350..7f0ab20 100644
--- a/Shared/PongUniverse.cs
+++ b/Shared/PongUniverse.cs
@@ -4,12 +4,12 @@ using Microsoft.Xna.Framework.Input;
using Pong.Behaviours;
-using Syntriax.Engine.Core;
-using Syntriax.Engine.Core.Factory;
-using Syntriax.Engine.Integration.MonoGame;
-using Syntriax.Engine.Systems.Network;
-using Syntriax.Engine.Physics2D;
-using Syntriax.Engine.Systems.Tween;
+using Engine.Core;
+using Engine.Core.Factory;
+using Engine.Integration.MonoGame;
+using Engine.Systems.Network;
+using Engine.Physics2D;
+using Engine.Systems.Tween;
namespace Pong;
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 62e18bc..1ca360c 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -2,6 +2,8 @@
net9.0
enable
+ Pong.Shared
+ Pong.Shared