chore: migrated networking code to engine
This commit is contained in:
parent
dc3661c710
commit
7a499bbcbc
2
Engine
2
Engine
@ -1 +1 @@
|
|||||||
Subproject commit b8217f2106dd056c0a1d9eb591e2513e466b2389
|
Subproject commit 1644a751bb81ab0f0d467321d1dd5cd2e326227a
|
@ -39,7 +39,7 @@ monoGameWindow.Graphics.PreferredBackBufferWidth = clientConfiguration.windowWid
|
|||||||
monoGameWindow.Graphics.PreferredBackBufferHeight = clientConfiguration.windowHeight;
|
monoGameWindow.Graphics.PreferredBackBufferHeight = clientConfiguration.windowHeight;
|
||||||
monoGameWindow.Graphics.GraphicsProfile = GraphicsProfile.HiDef;
|
monoGameWindow.Graphics.GraphicsProfile = GraphicsProfile.HiDef;
|
||||||
|
|
||||||
universe.FindBehaviour<Syntriax.Engine.Network.INetworkCommunicatorClient>()?
|
universe.FindBehaviour<Syntriax.Engine.Systems.Network.INetworkCommunicatorClient>()?
|
||||||
.OnConnectionEstablished.AddOneTimeListener(
|
.OnConnectionEstablished.AddOneTimeListener(
|
||||||
(sender, connection) => monoGameWindow.Window.Title = $"Client {connection.Id}"
|
(sender, connection) => monoGameWindow.Window.Title = $"Client {connection.Id}"
|
||||||
);
|
);
|
||||||
|
@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Http;
|
|||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
using Syntriax.Engine.Core;
|
||||||
using Syntriax.Engine.Network;
|
using Syntriax.Engine.Systems.Network;
|
||||||
|
|
||||||
namespace Server;
|
namespace Server;
|
||||||
|
|
||||||
|
15
Pong.sln
15
Pong.sln
@ -29,6 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine.Serializers", "Engin
|
|||||||
EndProject
|
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.Serializers.Yaml", "Engine\Engine.Serializers\Engine.Serializers.Yaml\Engine.Serializers.Yaml.csproj", "{79F870AB-249E-4CA0-9DF0-F265514581DF}"
|
||||||
EndProject
|
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
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -147,6 +149,18 @@ Global
|
|||||||
{79F870AB-249E-4CA0-9DF0-F265514581DF}.Release|x64.Build.0 = Release|Any CPU
|
{79F870AB-249E-4CA0-9DF0-F265514581DF}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{79F870AB-249E-4CA0-9DF0-F265514581DF}.Release|x86.ActiveCfg = Release|Any CPU
|
{79F870AB-249E-4CA0-9DF0-F265514581DF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{79F870AB-249E-4CA0-9DF0-F265514581DF}.Release|x86.Build.0 = Release|Any CPU
|
{79F870AB-249E-4CA0-9DF0-F265514581DF}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@ -162,5 +176,6 @@ Global
|
|||||||
{A15263DB-DF65-4A07-8CA1-33A2919501A0} = {FECFFD54-338F-4060-9161-1E5770D1DC33}
|
{A15263DB-DF65-4A07-8CA1-33A2919501A0} = {FECFFD54-338F-4060-9161-1E5770D1DC33}
|
||||||
{F1257AE1-A8BC-DE44-CB86-406F1335A1D0} = {F7F62670-237A-4C93-A30E-CE661C6FC401}
|
{F1257AE1-A8BC-DE44-CB86-406F1335A1D0} = {F7F62670-237A-4C93-A30E-CE661C6FC401}
|
||||||
{79F870AB-249E-4CA0-9DF0-F265514581DF} = {F1257AE1-A8BC-DE44-CB86-406F1335A1D0}
|
{79F870AB-249E-4CA0-9DF0-F265514581DF} = {F1257AE1-A8BC-DE44-CB86-406F1335A1D0}
|
||||||
|
{7AA22306-772F-45F4-8F30-97EBD1FC124D} = {9059393F-4073-9273-0EEC-2B1BA61B620B}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Content;
|
|||||||
|
|
||||||
using Syntriax.Engine.Core;
|
using Syntriax.Engine.Core;
|
||||||
using Syntriax.Engine.Integration.MonoGame;
|
using Syntriax.Engine.Integration.MonoGame;
|
||||||
using Syntriax.Engine.Network;
|
using Syntriax.Engine.Systems.Network;
|
||||||
using Syntriax.Engine.Physics2D;
|
using Syntriax.Engine.Physics2D;
|
||||||
using Syntriax.Engine.Systems.Tween;
|
using Syntriax.Engine.Systems.Tween;
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ using System;
|
|||||||
using Microsoft.Xna.Framework.Input;
|
using Microsoft.Xna.Framework.Input;
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
using Syntriax.Engine.Core;
|
||||||
using Syntriax.Engine.Network;
|
using Syntriax.Engine.Systems.Network;
|
||||||
using Syntriax.Engine.Physics2D;
|
using Syntriax.Engine.Physics2D;
|
||||||
using Syntriax.Engine.Systems.Input;
|
using Syntriax.Engine.Systems.Input;
|
||||||
using Syntriax.Engine.Systems.Tween;
|
using Syntriax.Engine.Systems.Tween;
|
||||||
|
@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Input;
|
|||||||
using Syntriax.Engine.Core;
|
using Syntriax.Engine.Core;
|
||||||
using Syntriax.Engine.Core.Debug;
|
using Syntriax.Engine.Core.Debug;
|
||||||
using Syntriax.Engine.Integration.MonoGame;
|
using Syntriax.Engine.Integration.MonoGame;
|
||||||
using Syntriax.Engine.Network;
|
using Syntriax.Engine.Systems.Network;
|
||||||
using Syntriax.Engine.Systems.Input;
|
using Syntriax.Engine.Systems.Input;
|
||||||
using Syntriax.Engine.Systems.Time;
|
using Syntriax.Engine.Systems.Time;
|
||||||
using Syntriax.Engine.Systems.Tween;
|
using Syntriax.Engine.Systems.Tween;
|
||||||
|
@ -6,7 +6,7 @@ using Microsoft.Xna.Framework.Content;
|
|||||||
using Syntriax.Engine.Core;
|
using Syntriax.Engine.Core;
|
||||||
using Syntriax.Engine.Core.Debug;
|
using Syntriax.Engine.Core.Debug;
|
||||||
using Syntriax.Engine.Integration.MonoGame;
|
using Syntriax.Engine.Integration.MonoGame;
|
||||||
using Syntriax.Engine.Network;
|
using Syntriax.Engine.Systems.Network;
|
||||||
|
|
||||||
namespace Pong.Behaviours;
|
namespace Pong.Behaviours;
|
||||||
|
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface IConnection
|
|
||||||
{
|
|
||||||
string Id { get; }
|
|
||||||
|
|
||||||
float Ping { get; }
|
|
||||||
float RoundTrip { get; }
|
|
||||||
|
|
||||||
int PingMs { get; }
|
|
||||||
int RoundTripMs { get; }
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface IEntityNetworkPacket : INetworkPacket
|
|
||||||
{
|
|
||||||
string EntityId { get; }
|
|
||||||
}
|
|
@ -1,37 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface INetworkCommunicator
|
|
||||||
{
|
|
||||||
Event<INetworkCommunicator, IConnection> OnConnectionEstablished { get; }
|
|
||||||
Event<INetworkCommunicator, IConnection> OnConnectionAbolished { get; }
|
|
||||||
|
|
||||||
IReadOnlyDictionary<string, IConnection> Connections { get; }
|
|
||||||
|
|
||||||
INetworkCommunicator Stop();
|
|
||||||
|
|
||||||
INetworkCommunicator SubscribeToPackets<T>(Event<IConnection, T>.EventHandler callback);
|
|
||||||
INetworkCommunicator UnsubscribeFromPackets<T>(Event<IConnection, T>.EventHandler callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface INetworkCommunicatorClient : INetworkCommunicator
|
|
||||||
{
|
|
||||||
INetworkCommunicatorClient Connect(string address, int port, string? password = null);
|
|
||||||
|
|
||||||
INetworkCommunicatorClient SendToServer<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface INetworkCommunicatorServer : INetworkCommunicator
|
|
||||||
{
|
|
||||||
string Password { get; }
|
|
||||||
int MaxConnectionCount { get; }
|
|
||||||
int Port { get; }
|
|
||||||
|
|
||||||
INetworkCommunicatorServer Start(int port, int maxConnectionCount, string? password = null);
|
|
||||||
|
|
||||||
INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
|
|
||||||
INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
|
|
||||||
}
|
|
@ -1,5 +0,0 @@
|
|||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface INetworkEntity : IEntity;
|
|
@ -1,11 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface INetworkManager
|
|
||||||
{
|
|
||||||
IReadOnlyDictionary<string, INetworkEntity> NetworkEntities { get; }
|
|
||||||
IBehaviourCollector<INetworkEntity> NetworkEntityCollector { get; }
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface INetworkPacket;
|
|
@ -1,6 +0,0 @@
|
|||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface IPacketListenerClient<T> : INetworkEntity
|
|
||||||
{
|
|
||||||
void OnClientPacketArrived(IConnection sender, T packet);
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public interface IPacketListenerServer<T> : INetworkEntity
|
|
||||||
{
|
|
||||||
void OnServerPacketArrived(IConnection sender, T packet);
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public enum PacketDelivery
|
|
||||||
{
|
|
||||||
ReliableInOrder,
|
|
||||||
ReliableOutOfOrder,
|
|
||||||
UnreliableInOrder,
|
|
||||||
UnreliableOutOfOrder,
|
|
||||||
};
|
|
@ -1,89 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net.Sockets;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using LiteNetLib;
|
|
||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
using Syntriax.Engine.Core.Debug;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public class LiteNetLibClient : LiteNetLibCommunicatorBase, INetworkCommunicatorClient
|
|
||||||
{
|
|
||||||
private readonly NetDataWriter netDataWriter = new();
|
|
||||||
|
|
||||||
private CancellationTokenSource? cancellationTokenSource = null;
|
|
||||||
|
|
||||||
protected override IConnection GetConnection(NetPeer peer) => new LiteNetLibServerConnection(peer);
|
|
||||||
|
|
||||||
public INetworkCommunicatorClient Connect(string address, int port, string? password = null)
|
|
||||||
{
|
|
||||||
if (!UniverseObject.IsInUniverse)
|
|
||||||
throw new($"{nameof(LiteNetLibClient)} must be in an universe to connect");
|
|
||||||
|
|
||||||
password ??= string.Empty;
|
|
||||||
|
|
||||||
// Okay, for some reason sometimes LiteNetLib goes dumb when the server hostname has IPv6 address as well as IPv4
|
|
||||||
// but the client doesn't support IPv6, it still tries to use the v6 unless we explicitly tell the ip to connect to,
|
|
||||||
// which fails to connect... So for the time being I am preferring IPv4 below over IPv6 for clients.
|
|
||||||
// TODO: I think this is something that happens on Linux only? I need to check on Windows as well just to be sure.
|
|
||||||
System.Net.IPAddress[] addresses = System.Net.Dns.GetHostAddresses(address);
|
|
||||||
string connectionAddress = addresses.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork, addresses[0]).ToString();
|
|
||||||
|
|
||||||
logger?.Log(this, $"Connecting to server at '{address}:{port}' with password '{password}'");
|
|
||||||
logger?.Log(this, $"Resolved address for {address}: {connectionAddress}");
|
|
||||||
|
|
||||||
Manager.Start();
|
|
||||||
Manager.Connect(connectionAddress, port, password);
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public INetworkCommunicatorClient SendToServer<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
|
|
||||||
{
|
|
||||||
netDataWriter.Reset();
|
|
||||||
netPacketProcessor.Write(netDataWriter, packet);
|
|
||||||
|
|
||||||
switch (packetDelivery)
|
|
||||||
{
|
|
||||||
case PacketDelivery.ReliableInOrder: Manager.FirstPeer.Send(netDataWriter, DeliveryMethod.ReliableOrdered); break;
|
|
||||||
case PacketDelivery.UnreliableInOrder: Manager.FirstPeer.Send(netDataWriter, DeliveryMethod.Sequenced); break;
|
|
||||||
case PacketDelivery.ReliableOutOfOrder: Manager.FirstPeer.Send(netDataWriter, DeliveryMethod.ReliableUnordered); break;
|
|
||||||
case PacketDelivery.UnreliableOutOfOrder: Manager.FirstPeer.Send(netDataWriter, DeliveryMethod.Unreliable); break;
|
|
||||||
default: Manager.FirstPeer.Send(netDataWriter, DeliveryMethod.ReliableOrdered); break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnEnteredUniverse(IUniverse universe)
|
|
||||||
{
|
|
||||||
base.OnEnteredUniverse(universe);
|
|
||||||
|
|
||||||
cancellationTokenSource = new CancellationTokenSource();
|
|
||||||
PollEvents(cancellationTokenSource.Token);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnExitedUniverse(IUniverse universe)
|
|
||||||
{
|
|
||||||
base.OnExitedUniverse(universe);
|
|
||||||
cancellationTokenSource?.Cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Client needs to send everything as soon as possible so
|
|
||||||
/// the events are polled a separate thread running constantly
|
|
||||||
/// </summary>
|
|
||||||
private async void PollEvents(CancellationToken cancellationToken) => await Task.Run(() =>
|
|
||||||
{
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
Manager.PollEvents();
|
|
||||||
Thread.Sleep(1);
|
|
||||||
}
|
|
||||||
}, cancellationToken);
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
using LiteNetLib;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public record class LiteNetLibClientConnection(NetPeer NetPeer) : IConnection
|
|
||||||
{
|
|
||||||
public string Id { get; } = NetPeer.Id.ToString();
|
|
||||||
|
|
||||||
public float Ping => NetPeer.Ping * .001f;
|
|
||||||
public float RoundTrip => NetPeer.RoundTripTime * .001f;
|
|
||||||
|
|
||||||
public int PingMs => NetPeer.Ping;
|
|
||||||
public int RoundTripMs => NetPeer.RoundTripTime;
|
|
||||||
|
|
||||||
public override string ToString() => $"Connection({Id})";
|
|
||||||
}
|
|
@ -1,189 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
using LiteNetLib;
|
|
||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
using Syntriax.Engine.Core.Debug;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public abstract class LiteNetLibCommunicatorBase : Behaviour, INetworkCommunicator
|
|
||||||
{
|
|
||||||
protected readonly NetPacketProcessor netPacketProcessor = new();
|
|
||||||
|
|
||||||
private readonly Dictionary<Type, Event<IConnection, object>> listeners = [];
|
|
||||||
private readonly Dictionary<string, IConnection> _connections = [];
|
|
||||||
|
|
||||||
private readonly Dictionary<int, IConnection> localPeerIdToConnectionDictionary = [];
|
|
||||||
|
|
||||||
protected ILogger? logger = null;
|
|
||||||
|
|
||||||
public IReadOnlyDictionary<string, IConnection> Connections => _connections;
|
|
||||||
public EventBasedNetListener Listener { get; private set; } = null!;
|
|
||||||
public NetManager Manager { get; private set; } = null!;
|
|
||||||
|
|
||||||
public Event<INetworkCommunicator, IConnection> OnConnectionEstablished { get; } = new();
|
|
||||||
public Event<INetworkCommunicator, IConnection> OnConnectionAbolished { get; } = new();
|
|
||||||
|
|
||||||
public INetworkCommunicator Stop()
|
|
||||||
{
|
|
||||||
Manager.Stop();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnEnteredUniverse(IUniverse universe)
|
|
||||||
{
|
|
||||||
base.OnEnteredUniverse(universe);
|
|
||||||
logger = universe.FindBehaviour<ILogger>();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnExitedUniverse(IUniverse universe)
|
|
||||||
{
|
|
||||||
base.OnExitedUniverse(universe);
|
|
||||||
logger = null;
|
|
||||||
Stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void OnPacketArrived<T>(T packet, NetPeer peer) where T : INetworkPacket
|
|
||||||
{
|
|
||||||
if (!listeners.TryGetValue(typeof(T), out Event<IConnection, object>? @event))
|
|
||||||
return;
|
|
||||||
|
|
||||||
@event.Invoke(localPeerIdToConnectionDictionary[peer.Id], packet);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void NetworkReceiveEvent(NetPeer peer, NetPacketReader reader, byte channel, DeliveryMethod deliveryMethod)
|
|
||||||
{
|
|
||||||
try { netPacketProcessor.ReadAllPackets(reader, peer); }
|
|
||||||
catch (Exception exception) { logger?.LogException(this, exception, force: true); }
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract IConnection GetConnection(NetPeer peer);
|
|
||||||
private void ConnectionEstablished(NetPeer peer)
|
|
||||||
{
|
|
||||||
IConnection connection = GetConnection(peer);
|
|
||||||
|
|
||||||
localPeerIdToConnectionDictionary.Add(peer.Id, connection);
|
|
||||||
_connections.Add(connection.Id, connection);
|
|
||||||
|
|
||||||
logger?.Log(this, $"Connection established with ip '{peer.Address}' and id '{connection.Id}'");
|
|
||||||
OnConnectionEstablished.Invoke(this, connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void ConnectionAbolished(NetPeer peer, DisconnectInfo disconnectInfo)
|
|
||||||
{
|
|
||||||
if (!localPeerIdToConnectionDictionary.TryGetValue(peer.Id, out var connection))
|
|
||||||
return;
|
|
||||||
|
|
||||||
localPeerIdToConnectionDictionary.Remove(peer.Id);
|
|
||||||
_connections.Remove(connection.Id);
|
|
||||||
|
|
||||||
logger?.Log(this, $"Connection abolished with ip '{peer.Address}' and id '{connection.Id}'");
|
|
||||||
OnConnectionAbolished.Invoke(this, connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetupPackets()
|
|
||||||
{
|
|
||||||
// Find network packets implementing INetworkPacket
|
|
||||||
IEnumerable<Type> packetTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes())
|
|
||||||
.Where(t => typeof(INetworkPacket).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.IsGenericType);
|
|
||||||
|
|
||||||
MethodInfo subscribeReusableMethod = typeof(NetPacketProcessor)
|
|
||||||
.GetMethods()
|
|
||||||
.FirstOrDefault(m => m.Name == nameof(NetPacketProcessor.SubscribeReusable) &&
|
|
||||||
m.GetParameters().Length == 1 &&
|
|
||||||
m.GetParameters()[0].ParameterType.GetGenericTypeDefinition() == typeof(Action<,>)
|
|
||||||
)!;
|
|
||||||
|
|
||||||
MethodInfo registerNestedTypeMethod = typeof(NetPacketProcessor)
|
|
||||||
.GetMethods()
|
|
||||||
.FirstOrDefault(m => m.Name == nameof(NetPacketProcessor.RegisterNestedType) &&
|
|
||||||
m.GetParameters().Length == 0
|
|
||||||
)!;
|
|
||||||
|
|
||||||
MethodInfo onPacketArrivedMethod = typeof(LiteNetLibCommunicatorBase)
|
|
||||||
.GetMethod(nameof(OnPacketArrived), BindingFlags.NonPublic | BindingFlags.Instance)!;
|
|
||||||
|
|
||||||
// Register all network packets by calling the methods bellow where T is our found network packet type
|
|
||||||
// NetPacketProcessor.SubscribeReusable<T, NetPeer>(Action<T, NetPeer> onReceive)
|
|
||||||
// NetPacketProcessor.RegisterNestedType<T>()
|
|
||||||
foreach (Type packetType in packetTypes)
|
|
||||||
{
|
|
||||||
if (!packetType.IsClass)
|
|
||||||
{
|
|
||||||
MethodInfo genericRegisterNestedTypeMethod = registerNestedTypeMethod.MakeGenericMethod(packetType);
|
|
||||||
genericRegisterNestedTypeMethod.Invoke(netPacketProcessor, []);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(packetType);
|
|
||||||
|
|
||||||
Type delegateType = typeof(Action<,>).MakeGenericType(packetType, typeof(NetPeer));
|
|
||||||
Delegate delegateHandler = Delegate.CreateDelegate(delegateType, this, genericOnPacketArrivedMethod);
|
|
||||||
|
|
||||||
var genericSubscribeReusableMethod = subscribeReusableMethod.MakeGenericMethod(packetType, typeof(NetPeer));
|
|
||||||
genericSubscribeReusableMethod.Invoke(netPacketProcessor, [delegateHandler]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public LiteNetLibCommunicatorBase()
|
|
||||||
{
|
|
||||||
Listener = new EventBasedNetListener();
|
|
||||||
Manager = new NetManager(Listener);
|
|
||||||
|
|
||||||
Listener.NetworkReceiveEvent += NetworkReceiveEvent;
|
|
||||||
Listener.PeerConnectedEvent += ConnectionEstablished;
|
|
||||||
Listener.PeerDisconnectedEvent += ConnectionAbolished;
|
|
||||||
|
|
||||||
SetupEnginePackets();
|
|
||||||
SetupPackets();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetupEnginePackets()
|
|
||||||
{
|
|
||||||
// I know, ugly af. I need to find a better way
|
|
||||||
netPacketProcessor.RegisterNestedType(AABBNetPacker.Write, AABBNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(CircleNetPacker.Write, CircleNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(ColorHSVNetPacker.Write, ColorHSVNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(ColorRGBANetPacker.Write, ColorRGBANetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(ColorRGBNetPacker.Write, ColorRGBNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(Line2DEquationNetPacker.Write, Line2DEquationNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(Line2DNetPacker.Write, Line2DNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(Projection1DNetPacker.Write, Projection1DNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(QuaternionNetPacker.Write, QuaternionNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(Shape2DNetPacker.Write, Shape2DNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(TriangleNetPacker.Write, TriangleNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(Vector2DNetPacker.Write, Vector2DNetPacker.Read);
|
|
||||||
netPacketProcessor.RegisterNestedType(Vector3DNetPacker.Write, Vector3DNetPacker.Read);
|
|
||||||
}
|
|
||||||
|
|
||||||
public INetworkCommunicator SubscribeToPackets<T>(Event<IConnection, T>.EventHandler callback)
|
|
||||||
{
|
|
||||||
Type type = typeof(T);
|
|
||||||
if (!listeners.TryGetValue(type, out Event<IConnection, object>? @event))
|
|
||||||
{
|
|
||||||
@event = new();
|
|
||||||
listeners.Add(type, @event);
|
|
||||||
}
|
|
||||||
|
|
||||||
@event.AddListener(EventDelegateWrapper(callback));
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public INetworkCommunicator UnsubscribeFromPackets<T>(Event<IConnection, T>.EventHandler callback)
|
|
||||||
{
|
|
||||||
Type type = typeof(T);
|
|
||||||
if (!listeners.TryGetValue(type, out Event<IConnection, object>? @event))
|
|
||||||
return this;
|
|
||||||
|
|
||||||
@event.RemoveListener(EventDelegateWrapper(callback));
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Event<IConnection, object>.EventHandler EventDelegateWrapper<T>(Event<IConnection, T>.EventHandler callback) => (sender, @object) => callback.Invoke(sender, (T)@object);
|
|
||||||
}
|
|
@ -1,104 +0,0 @@
|
|||||||
using System.Linq;
|
|
||||||
|
|
||||||
using LiteNetLib;
|
|
||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
using Syntriax.Engine.Core.Debug;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicatorServer
|
|
||||||
{
|
|
||||||
public string Password { get; private set; } = string.Empty;
|
|
||||||
public int MaxConnectionCount { get; private set; } = 2;
|
|
||||||
public int Port { get; private set; } = 8888;
|
|
||||||
|
|
||||||
private readonly NetDataWriter netDataWriter = new();
|
|
||||||
|
|
||||||
public LiteNetLibServer() : this(8888, 2) { }
|
|
||||||
public LiteNetLibServer(int port, int maxConnectionCount) : base()
|
|
||||||
{
|
|
||||||
MaxConnectionCount = maxConnectionCount;
|
|
||||||
Port = port;
|
|
||||||
|
|
||||||
Listener.ConnectionRequestEvent += OnConnectionRequest;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override IConnection GetConnection(NetPeer peer) => new LiteNetLibClientConnection(peer);
|
|
||||||
|
|
||||||
private void OnConnectionRequest(ConnectionRequest request)
|
|
||||||
{
|
|
||||||
logger?.Log(this, $"Connection request from ip {request.RemoteEndPoint}");
|
|
||||||
logger?.Log(this, $"Current connection count: {Connections.Count}");
|
|
||||||
if (Manager.ConnectedPeersCount < MaxConnectionCount)
|
|
||||||
request.AcceptIfKey(Password);
|
|
||||||
else
|
|
||||||
request.Reject();
|
|
||||||
}
|
|
||||||
|
|
||||||
public INetworkCommunicatorServer Start(int port, int maxConnectionCount, string? password = null)
|
|
||||||
{
|
|
||||||
if (!UniverseObject.IsInUniverse)
|
|
||||||
throw new($"{nameof(LiteNetLibServer)} must be in an universe to start");
|
|
||||||
|
|
||||||
Password = password ?? string.Empty;
|
|
||||||
MaxConnectionCount = maxConnectionCount;
|
|
||||||
Port = port;
|
|
||||||
|
|
||||||
logger?.Log(this, $"Starting server on port '{port}' with password '{Password}' and max connection count '{maxConnectionCount}'");
|
|
||||||
logger?.Log(this, $"Server status: {(Manager.Start(port) ? "Active" : "Failed")}");
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery) where T : class, new()
|
|
||||||
{
|
|
||||||
netDataWriter.Reset();
|
|
||||||
netPacketProcessor.Write(netDataWriter, packet);
|
|
||||||
|
|
||||||
if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.CompareTo(connection.Id) == 0) is not NetPeer netPeer)
|
|
||||||
throw new($"Peer {connection} couldn't be found.");
|
|
||||||
|
|
||||||
switch (packetDelivery)
|
|
||||||
{
|
|
||||||
case PacketDelivery.ReliableInOrder: netPeer.Send(netDataWriter, DeliveryMethod.ReliableOrdered); break;
|
|
||||||
case PacketDelivery.UnreliableInOrder: netPeer.Send(netDataWriter, DeliveryMethod.Sequenced); break;
|
|
||||||
case PacketDelivery.ReliableOutOfOrder: netPeer.Send(netDataWriter, DeliveryMethod.ReliableUnordered); break;
|
|
||||||
case PacketDelivery.UnreliableOutOfOrder: netPeer.Send(netDataWriter, DeliveryMethod.Unreliable); break;
|
|
||||||
default: netPeer.Send(netDataWriter, DeliveryMethod.ReliableOrdered); break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
|
|
||||||
{
|
|
||||||
netDataWriter.Reset();
|
|
||||||
netPacketProcessor.Write(netDataWriter, packet);
|
|
||||||
|
|
||||||
switch (packetDelivery)
|
|
||||||
{
|
|
||||||
case PacketDelivery.ReliableInOrder: Manager.SendToAll(netDataWriter, DeliveryMethod.ReliableOrdered); break;
|
|
||||||
case PacketDelivery.UnreliableInOrder: Manager.SendToAll(netDataWriter, DeliveryMethod.Sequenced); break;
|
|
||||||
case PacketDelivery.ReliableOutOfOrder: Manager.SendToAll(netDataWriter, DeliveryMethod.ReliableUnordered); break;
|
|
||||||
case PacketDelivery.UnreliableOutOfOrder: Manager.SendToAll(netDataWriter, DeliveryMethod.Unreliable); break;
|
|
||||||
default: Manager.SendToAll(netDataWriter, DeliveryMethod.ReliableOrdered); break;
|
|
||||||
}
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents();
|
|
||||||
|
|
||||||
protected override void OnEnteredUniverse(IUniverse universe)
|
|
||||||
{
|
|
||||||
base.OnEnteredUniverse(universe);
|
|
||||||
universe.OnPostUpdate.AddListener(PollEvents);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnExitedUniverse(IUniverse universe)
|
|
||||||
{
|
|
||||||
base.OnExitedUniverse(universe);
|
|
||||||
universe.OnPostUpdate.RemoveListener(PollEvents);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,16 +0,0 @@
|
|||||||
using LiteNetLib;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
public record class LiteNetLibServerConnection(NetPeer NetPeer) : IConnection
|
|
||||||
{
|
|
||||||
public string Id => NetPeer.RemoteId.ToString();
|
|
||||||
|
|
||||||
public float Ping => NetPeer.Ping * .001f;
|
|
||||||
public float RoundTrip => NetPeer.RoundTripTime * .001f;
|
|
||||||
|
|
||||||
public int PingMs => NetPeer.Ping;
|
|
||||||
public int RoundTripMs => NetPeer.RoundTripTime;
|
|
||||||
|
|
||||||
public override string ToString() => $"Connection({Id})";
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class AABBNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, AABB data)
|
|
||||||
{
|
|
||||||
Vector2DNetPacker.Write(writer, data.LowerBoundary);
|
|
||||||
Vector2DNetPacker.Write(writer, data.UpperBoundary);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static AABB Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
Vector2D lowerBoundary = Vector2DNetPacker.Read(reader);
|
|
||||||
Vector2D upperBoundary = Vector2DNetPacker.Read(reader);
|
|
||||||
|
|
||||||
return new AABB(lowerBoundary, upperBoundary);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class CircleNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Circle data)
|
|
||||||
{
|
|
||||||
Vector2DNetPacker.Write(writer, data.Center);
|
|
||||||
writer.Put(data.Radius);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Circle Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
Vector2D center = Vector2DNetPacker.Read(reader);
|
|
||||||
float radius = reader.GetFloat();
|
|
||||||
|
|
||||||
return new Circle(center, radius);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class ColorHSVNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, ColorHSV data)
|
|
||||||
{
|
|
||||||
writer.Put(data.Hue);
|
|
||||||
writer.Put(data.Saturation);
|
|
||||||
writer.Put(data.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static ColorHSV Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
float hue = reader.GetFloat();
|
|
||||||
float saturation = reader.GetFloat();
|
|
||||||
float value = reader.GetFloat();
|
|
||||||
|
|
||||||
return new ColorHSV(hue, saturation, value);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,26 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class ColorRGBANetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, ColorRGBA data)
|
|
||||||
{
|
|
||||||
writer.Put(data.R);
|
|
||||||
writer.Put(data.G);
|
|
||||||
writer.Put(data.B);
|
|
||||||
writer.Put(data.A);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static ColorRGBA Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
byte red = reader.GetByte();
|
|
||||||
byte green = reader.GetByte();
|
|
||||||
byte blue = reader.GetByte();
|
|
||||||
byte alpha = reader.GetByte();
|
|
||||||
|
|
||||||
return new ColorRGBA(red, green, blue, alpha);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class ColorRGBNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, ColorRGB data)
|
|
||||||
{
|
|
||||||
writer.Put(data.R);
|
|
||||||
writer.Put(data.G);
|
|
||||||
writer.Put(data.B);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static ColorRGB Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
byte red = reader.GetByte();
|
|
||||||
byte green = reader.GetByte();
|
|
||||||
byte blue = reader.GetByte();
|
|
||||||
|
|
||||||
return new ColorRGB(red, green, blue);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class Line2DEquationNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Line2DEquation data)
|
|
||||||
{
|
|
||||||
writer.Put(data.Slope);
|
|
||||||
writer.Put(data.OffsetY);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Line2DEquation Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
float slope = reader.GetFloat();
|
|
||||||
float offsetY = reader.GetFloat();
|
|
||||||
|
|
||||||
return new Line2DEquation(slope, offsetY);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class Line2DNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Line2D data)
|
|
||||||
{
|
|
||||||
Vector2DNetPacker.Write(writer, data.From);
|
|
||||||
Vector2DNetPacker.Write(writer, data.To);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Line2D Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
Vector2D from = Vector2DNetPacker.Read(reader);
|
|
||||||
Vector2D to = Vector2DNetPacker.Read(reader);
|
|
||||||
|
|
||||||
return new Line2D(from, to);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class Projection1DNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Projection1D data)
|
|
||||||
{
|
|
||||||
writer.Put(data.Min);
|
|
||||||
writer.Put(data.Max);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Projection1D Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
float min = reader.GetFloat();
|
|
||||||
float max = reader.GetFloat();
|
|
||||||
|
|
||||||
return new Projection1D(min, max);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,26 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class QuaternionNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Quaternion data)
|
|
||||||
{
|
|
||||||
writer.Put(data.X);
|
|
||||||
writer.Put(data.Y);
|
|
||||||
writer.Put(data.Z);
|
|
||||||
writer.Put(data.W);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Quaternion Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
float x = reader.GetFloat();
|
|
||||||
float y = reader.GetFloat();
|
|
||||||
float z = reader.GetFloat();
|
|
||||||
float w = reader.GetFloat();
|
|
||||||
|
|
||||||
return new Quaternion(x, y, z, w);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,28 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class Shape2DNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Shape2D data)
|
|
||||||
{
|
|
||||||
writer.Put(data.Vertices.Count);
|
|
||||||
foreach (Vector2D vertex in data.Vertices)
|
|
||||||
Vector2DNetPacker.Write(writer, vertex);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Shape2D Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
int verticesCount = reader.GetInt();
|
|
||||||
List<Vector2D> vertices = new(verticesCount);
|
|
||||||
|
|
||||||
for (int i = 0; i < verticesCount; i++)
|
|
||||||
vertices.Add(Vector2DNetPacker.Read(reader));
|
|
||||||
|
|
||||||
return new Shape2D(vertices);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class TriangleNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Triangle data)
|
|
||||||
{
|
|
||||||
Vector2DNetPacker.Write(writer, data.A);
|
|
||||||
Vector2DNetPacker.Write(writer, data.B);
|
|
||||||
Vector2DNetPacker.Write(writer, data.C);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Triangle Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
Vector2D a = Vector2DNetPacker.Read(reader);
|
|
||||||
Vector2D b = Vector2DNetPacker.Read(reader);
|
|
||||||
Vector2D c = Vector2DNetPacker.Read(reader);
|
|
||||||
|
|
||||||
return new Triangle(a, b, c);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class Vector2DNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Vector2D data)
|
|
||||||
{
|
|
||||||
writer.Put(data.X);
|
|
||||||
writer.Put(data.Y);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Vector2D Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
float x = reader.GetFloat();
|
|
||||||
float y = reader.GetFloat();
|
|
||||||
|
|
||||||
return new Vector2D(x, y);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
using LiteNetLib.Utils;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
internal static class Vector3DNetPacker
|
|
||||||
{
|
|
||||||
internal static void Write(NetDataWriter writer, Vector3D data)
|
|
||||||
{
|
|
||||||
writer.Put(data.X);
|
|
||||||
writer.Put(data.Y);
|
|
||||||
writer.Put(data.Z);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static Vector3D Read(NetDataReader reader)
|
|
||||||
{
|
|
||||||
float x = reader.GetFloat();
|
|
||||||
float y = reader.GetFloat();
|
|
||||||
float z = reader.GetFloat();
|
|
||||||
|
|
||||||
return new Vector3D(x, y, z);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,333 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
|
||||||
|
|
||||||
namespace Syntriax.Engine.Network;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Intermediary manager that looks up in it's hierarchy for a <see cref="INetworkCommunicator"/> to route/broadcast it's received packets to their destinations.
|
|
||||||
/// </summary>
|
|
||||||
public class NetworkManager : Behaviour, INetworkManager
|
|
||||||
{
|
|
||||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientPacketArrivalMethods = [];
|
|
||||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverPacketArrivalMethods = [];
|
|
||||||
|
|
||||||
private readonly Dictionary<Type, Dictionary<string, object>> clientPacketRouters = [];
|
|
||||||
private readonly Dictionary<Type, Dictionary<string, object>> serverPacketRouters = [];
|
|
||||||
|
|
||||||
private readonly List<(Type packetType, Delegate @delegate)> packetRetrievalDelegates = [];
|
|
||||||
|
|
||||||
private readonly Dictionary<Type, MethodInfo> clearRoutesMethods = [];
|
|
||||||
private readonly Dictionary<Type, MethodInfo> registerPacketListenersMethods = [];
|
|
||||||
|
|
||||||
private readonly Dictionary<string, INetworkEntity> _networkEntities = [];
|
|
||||||
public IReadOnlyDictionary<string, INetworkEntity> NetworkEntities => _networkEntities;
|
|
||||||
|
|
||||||
private readonly BehaviourCollector<INetworkEntity> _networkEntityCollector = new();
|
|
||||||
public IBehaviourCollector<INetworkEntity> NetworkEntityCollector => _networkEntityCollector;
|
|
||||||
|
|
||||||
private INetworkCommunicator _networkCommunicator = null!;
|
|
||||||
public INetworkCommunicator NetworkCommunicator
|
|
||||||
{
|
|
||||||
get => _networkCommunicator;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (_networkCommunicator == value)
|
|
||||||
return;
|
|
||||||
|
|
||||||
var previousCommunicator = _networkCommunicator;
|
|
||||||
_networkCommunicator = value;
|
|
||||||
|
|
||||||
if (previousCommunicator is not null) UnsubscribeCommunicatorMethods(previousCommunicator);
|
|
||||||
if (_networkCommunicator is not null) SubscribeCommunicatorMethods(_networkCommunicator);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Communicator Subscriptions
|
|
||||||
private void SubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
|
|
||||||
{
|
|
||||||
MethodInfo subscribeToPacketsMethod = typeof(INetworkCommunicator)
|
|
||||||
.GetMethod(nameof(INetworkCommunicator.SubscribeToPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
|
|
||||||
|
|
||||||
foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
|
|
||||||
{
|
|
||||||
MethodInfo genericSubscribeMethod = subscribeToPacketsMethod.MakeGenericMethod(packetType);
|
|
||||||
genericSubscribeMethod.Invoke(networkCommunicator, [@delegate]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UnsubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
|
|
||||||
{
|
|
||||||
MethodInfo unsubscribeFromPacketsMethod = typeof(INetworkCommunicator)
|
|
||||||
.GetMethod(nameof(INetworkCommunicator.UnsubscribeFromPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
|
|
||||||
|
|
||||||
foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
|
|
||||||
{
|
|
||||||
MethodInfo genericUnsubscribeMethod = unsubscribeFromPacketsMethod.MakeGenericMethod(packetType);
|
|
||||||
genericUnsubscribeMethod.Invoke(networkCommunicator, [@delegate]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Packet Routing
|
|
||||||
private void OnPacketReceived<T>(IConnection sender, T entityDataPacket)
|
|
||||||
{
|
|
||||||
if (entityDataPacket is IEntityNetworkPacket entityPacket)
|
|
||||||
RoutePacket(sender, entityDataPacket, entityPacket);
|
|
||||||
else
|
|
||||||
BroadcastPacket(sender, entityDataPacket);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void RoutePacket<T>(IConnection sender, T entityDataPacket, IEntityNetworkPacket entityPacket)
|
|
||||||
{
|
|
||||||
if (NetworkCommunicator is INetworkCommunicatorClient)
|
|
||||||
RoutePacket(clientPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
|
|
||||||
if (NetworkCommunicator is INetworkCommunicatorServer)
|
|
||||||
RoutePacket(serverPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void BroadcastPacket<T>(IConnection sender, T entityDataPacket)
|
|
||||||
{
|
|
||||||
if (NetworkCommunicator is INetworkCommunicatorClient)
|
|
||||||
BroadcastPacket(clientPacketRouters, sender, entityDataPacket);
|
|
||||||
if (NetworkCommunicator is INetworkCommunicatorServer)
|
|
||||||
BroadcastPacket(serverPacketRouters, sender, entityDataPacket);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private static void BroadcastPacket<T>(
|
|
||||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
|
||||||
IConnection sender,
|
|
||||||
T entityDataPacket)
|
|
||||||
{
|
|
||||||
if (!packetRouters.TryGetValue(entityDataPacket!.GetType(), out Dictionary<string, object>? routers))
|
|
||||||
return;
|
|
||||||
|
|
||||||
foreach ((string behaviourId, object routerEventReference) in routers)
|
|
||||||
{
|
|
||||||
Event<IConnection, T> routerEvent = (Event<IConnection, T>)routerEventReference;
|
|
||||||
routerEvent.Invoke(sender, entityDataPacket!);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void RoutePacket<T>(
|
|
||||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
|
||||||
string entityId,
|
|
||||||
IConnection sender,
|
|
||||||
T entityDataPacket)
|
|
||||||
{
|
|
||||||
if (!packetRouters.TryGetValue(entityDataPacket!.GetType(), out Dictionary<string, object>? routers))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!routers.TryGetValue(entityId, out object? routerEventReference))
|
|
||||||
return;
|
|
||||||
|
|
||||||
Event<IConnection, T> routerEvent = (Event<IConnection, T>)routerEventReference;
|
|
||||||
routerEvent.Invoke(sender, entityDataPacket!);
|
|
||||||
}
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Packet Routers
|
|
||||||
private void RegisterPacketRoutersFor(
|
|
||||||
INetworkEntity behaviour,
|
|
||||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
|
||||||
Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods,
|
|
||||||
NetworkType networkType)
|
|
||||||
{
|
|
||||||
if (!packetArrivalMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? arrivalMethods))
|
|
||||||
return;
|
|
||||||
|
|
||||||
foreach ((Type packetType, List<MethodInfo> methods) in arrivalMethods)
|
|
||||||
foreach (MethodInfo receiveMethod in methods)
|
|
||||||
{
|
|
||||||
if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
|
|
||||||
{
|
|
||||||
routers = [];
|
|
||||||
packetRouters.Add(packetType, routers);
|
|
||||||
}
|
|
||||||
|
|
||||||
object packetListenerEvent = CreateEventAndRegister(packetType, behaviour, networkType);
|
|
||||||
routers.Add(behaviour.Id, packetListenerEvent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object CreateEventAndRegister(Type packetType, INetworkEntity behaviour, NetworkType networkType)
|
|
||||||
{
|
|
||||||
Type genericEventType = typeof(Event<,>).MakeGenericType(typeof(IConnection), packetType);
|
|
||||||
object packetListenerEvent = Activator.CreateInstance(genericEventType)!;
|
|
||||||
|
|
||||||
if (!registerPacketListenersMethods.TryGetValue(packetType, out MethodInfo? registerPacketListenerMethod))
|
|
||||||
throw new($"{nameof(RegisterPacketListenerEvent)} for {packetType.Name} has not been cached.");
|
|
||||||
|
|
||||||
registerPacketListenerMethod.Invoke(this, [behaviour, packetListenerEvent, networkType]);
|
|
||||||
return packetListenerEvent;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void RegisterPacketListenerEvent<T>(
|
|
||||||
INetworkEntity behaviour,
|
|
||||||
Event<IConnection, T> packetListenerEvent,
|
|
||||||
NetworkType networkType)
|
|
||||||
{
|
|
||||||
switch (networkType)
|
|
||||||
{
|
|
||||||
case NetworkType.Client: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerClient<T>)behaviour).OnClientPacketArrived(sender, packet)); break;
|
|
||||||
case NetworkType.Server: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerServer<T>)behaviour).OnServerPacketArrived(sender, packet)); break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UnregisterPacketRoutersFor(
|
|
||||||
INetworkEntity behaviour,
|
|
||||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
|
||||||
Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods)
|
|
||||||
{
|
|
||||||
if (!packetArrivalMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? arrivalMethods))
|
|
||||||
return;
|
|
||||||
|
|
||||||
foreach ((Type packetType, List<MethodInfo> methods) in arrivalMethods)
|
|
||||||
{
|
|
||||||
if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!routers.TryGetValue(behaviour.Id, out object? routerEventReference))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!clearRoutesMethods.TryGetValue(packetType, out MethodInfo? clearRouterMethod))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
clearRouterMethod.Invoke(this, [routerEventReference]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ClearRouter<T>(object routerEventReference)
|
|
||||||
{
|
|
||||||
Event<IConnection, T> routerEvent = (Event<IConnection, T>)routerEventReference;
|
|
||||||
routerEvent.Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Engine Callbacks
|
|
||||||
private void OnCollected(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourCollectedArguments args)
|
|
||||||
{
|
|
||||||
INetworkEntity collectedBehaviour = args.BehaviourCollected;
|
|
||||||
|
|
||||||
if (!_networkEntities.TryAdd(collectedBehaviour.Id, collectedBehaviour))
|
|
||||||
throw new($"Unable to add {collectedBehaviour.Id} to {nameof(NetworkManager)}");
|
|
||||||
|
|
||||||
RegisterPacketRoutersFor(collectedBehaviour, clientPacketRouters, clientPacketArrivalMethods, NetworkType.Client);
|
|
||||||
RegisterPacketRoutersFor(collectedBehaviour, serverPacketRouters, serverPacketArrivalMethods, NetworkType.Server);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnRemoved(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourRemovedArguments args)
|
|
||||||
{
|
|
||||||
INetworkEntity removedBehaviour = args.BehaviourRemoved;
|
|
||||||
if (!_networkEntities.Remove(args.BehaviourRemoved.Id))
|
|
||||||
return;
|
|
||||||
|
|
||||||
UnregisterPacketRoutersFor(removedBehaviour, clientPacketRouters, clientPacketArrivalMethods);
|
|
||||||
UnregisterPacketRoutersFor(removedBehaviour, serverPacketRouters, serverPacketArrivalMethods);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnExitedUniverse(IUniverse universe) => _networkEntityCollector.Unassign();
|
|
||||||
protected override void OnEnteredUniverse(IUniverse universe)
|
|
||||||
{
|
|
||||||
_networkEntityCollector.Assign(universe);
|
|
||||||
NetworkCommunicator = BehaviourController.GetRequiredBehaviourInParent<INetworkCommunicator>();
|
|
||||||
}
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Initialization
|
|
||||||
public NetworkManager()
|
|
||||||
{
|
|
||||||
CachePacketRetrievalDelegates();
|
|
||||||
CacheRegistrationMethods();
|
|
||||||
CachePacketArrivalMethods();
|
|
||||||
|
|
||||||
_networkEntityCollector.OnCollected.AddListener(OnCollected);
|
|
||||||
_networkEntityCollector.OnRemoved.AddListener(OnRemoved);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CachePacketRetrievalDelegates()
|
|
||||||
{
|
|
||||||
IEnumerable<Type> packetTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes())
|
|
||||||
.Where(t => typeof(INetworkPacket).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.IsGenericType);
|
|
||||||
|
|
||||||
MethodInfo onPacketArrivedMethod = GetType()
|
|
||||||
.GetMethod(nameof(OnPacketReceived), BindingFlags.NonPublic | BindingFlags.Instance)!;
|
|
||||||
|
|
||||||
foreach (Type packetType in packetTypes)
|
|
||||||
{
|
|
||||||
MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(packetType);
|
|
||||||
|
|
||||||
Type genericDelegateType = typeof(Event<,>.EventHandler).MakeGenericType(typeof(IConnection), packetType);
|
|
||||||
Delegate genericPacketReceivedDelegate = Delegate.CreateDelegate(genericDelegateType, this, genericOnPacketArrivedMethod);
|
|
||||||
|
|
||||||
packetRetrievalDelegates.Add((packetType, genericPacketReceivedDelegate));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CacheRegistrationMethods()
|
|
||||||
{
|
|
||||||
CacheRegistrationMethods(registerPacketListenersMethods, nameof(RegisterPacketListenerEvent));
|
|
||||||
CacheRegistrationMethods(clearRoutesMethods, nameof(ClearRouter));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CacheRegistrationMethods(Dictionary<Type, MethodInfo> registrationMethods, string methodName)
|
|
||||||
{
|
|
||||||
MethodInfo registerPacketMethod = typeof(NetworkManager).GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Static)!;
|
|
||||||
foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
|
|
||||||
{
|
|
||||||
MethodInfo genericMethod = registerPacketMethod.MakeGenericMethod(packetType);
|
|
||||||
registrationMethods.Add(packetType, genericMethod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CachePacketArrivalMethods()
|
|
||||||
{
|
|
||||||
CachePacketArrivalMethods(clientPacketArrivalMethods, typeof(IPacketListenerClient<>), nameof(IPacketListenerClient<INetworkEntity>.OnClientPacketArrived));
|
|
||||||
CachePacketArrivalMethods(serverPacketArrivalMethods, typeof(IPacketListenerServer<>), nameof(IPacketListenerServer<INetworkEntity>.OnServerPacketArrived));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void CachePacketArrivalMethods(Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods, Type listenerType, string packetArrivalMethodName)
|
|
||||||
{
|
|
||||||
foreach (Type listenerClass in GetGenericsWith(listenerType))
|
|
||||||
{
|
|
||||||
Dictionary<Type, List<MethodInfo>> packetRouters = [];
|
|
||||||
packetArrivalMethods.Add(listenerClass, packetRouters);
|
|
||||||
|
|
||||||
foreach (Type packetListener in GetGenericInterfacesWith(listenerType, listenerClass))
|
|
||||||
{
|
|
||||||
Type packetType = packetListener.GetGenericArguments().First();
|
|
||||||
|
|
||||||
List<MethodInfo> arrivalMethods = packetListener
|
|
||||||
.GetMethods()
|
|
||||||
.Where(m => m.Name == packetArrivalMethodName)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
packetRouters.Add(packetType, arrivalMethods);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static IEnumerable<Type> GetGenericsWith(Type type)
|
|
||||||
=> AppDomain.CurrentDomain
|
|
||||||
.GetAssemblies()
|
|
||||||
.SelectMany(a =>
|
|
||||||
a.GetTypes().Where(
|
|
||||||
t => t.GetInterfaces().Any(
|
|
||||||
i => i.IsGenericType && i.GetGenericTypeDefinition() == type
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
private static IEnumerable<Type> GetGenericInterfacesWith(Type interfaceType, Type type)
|
|
||||||
=> type.GetInterfaces().Where(
|
|
||||||
i => i.IsGenericType && i.GetGenericTypeDefinition() == interfaceType
|
|
||||||
);
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private enum NetworkType { Client, Server }
|
|
||||||
}
|
|
@ -7,7 +7,7 @@ using Pong.Behaviours;
|
|||||||
using Syntriax.Engine.Core;
|
using Syntriax.Engine.Core;
|
||||||
using Syntriax.Engine.Core.Factory;
|
using Syntriax.Engine.Core.Factory;
|
||||||
using Syntriax.Engine.Integration.MonoGame;
|
using Syntriax.Engine.Integration.MonoGame;
|
||||||
using Syntriax.Engine.Network;
|
using Syntriax.Engine.Systems.Network;
|
||||||
using Syntriax.Engine.Physics2D;
|
using Syntriax.Engine.Physics2D;
|
||||||
using Syntriax.Engine.Systems.Tween;
|
using Syntriax.Engine.Systems.Tween;
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="LiteNetLib" Version="1.3.1" />
|
|
||||||
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105">
|
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105">
|
||||||
<PrivateAssets>All</PrivateAssets>
|
<PrivateAssets>All</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
@ -12,5 +11,6 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="../Engine/Engine/Engine.csproj" />
|
<ProjectReference Include="../Engine/Engine/Engine.csproj" />
|
||||||
<ProjectReference Include="../Engine/Engine.Integration/Engine.Integration.MonoGame/Engine.Integration.MonoGame.csproj" />
|
<ProjectReference Include="../Engine/Engine.Integration/Engine.Integration.MonoGame/Engine.Integration.MonoGame.csproj" />
|
||||||
|
<ProjectReference Include="../Engine/Engine.Integration/Engine.Integration.LiteNetLib/Engine.Integration.LiteNetLib.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user