refactor: added packet delivery type for networking
This commit is contained in:
parent
875f865bd3
commit
ac9cb72914
@ -21,7 +21,7 @@ public interface INetworkCommunicatorClient : INetworkCommunicator
|
|||||||
{
|
{
|
||||||
INetworkCommunicatorClient Connect(string address, int port, string? password = null);
|
INetworkCommunicatorClient Connect(string address, int port, string? password = null);
|
||||||
|
|
||||||
INetworkCommunicatorClient SendToServer<T>(T packet) where T : class, new();
|
INetworkCommunicatorClient SendToServer<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface INetworkCommunicatorServer : INetworkCommunicator
|
public interface INetworkCommunicatorServer : INetworkCommunicator
|
||||||
@ -32,6 +32,6 @@ public interface INetworkCommunicatorServer : INetworkCommunicator
|
|||||||
|
|
||||||
INetworkCommunicatorServer Start(int port, int maxConnectionCount, string? password = null);
|
INetworkCommunicatorServer Start(int port, int maxConnectionCount, string? password = null);
|
||||||
|
|
||||||
INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet) where T : class, new();
|
INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
|
||||||
INetworkCommunicatorServer SendToAll<T>(T packet) where T : class, new();
|
INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
|
||||||
}
|
}
|
||||||
|
9
Shared/Network/Abstract/PacketDelivery.cs
Normal file
9
Shared/Network/Abstract/PacketDelivery.cs
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
namespace Syntriax.Engine.Network;
|
||||||
|
|
||||||
|
public enum PacketDelivery
|
||||||
|
{
|
||||||
|
ReliableInOrder,
|
||||||
|
ReliableOutOfOrder,
|
||||||
|
UnreliableInOrder,
|
||||||
|
UnreliableOutOfOrder,
|
||||||
|
};
|
@ -1,6 +1,7 @@
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
using LiteNetLib;
|
||||||
using LiteNetLib.Utils;
|
using LiteNetLib.Utils;
|
||||||
|
|
||||||
using Syntriax.Engine.Core;
|
using Syntriax.Engine.Core;
|
||||||
@ -28,11 +29,19 @@ public class LiteNetLibClient : LiteNetLibCommunicatorBase, INetworkCommunicator
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public INetworkCommunicatorClient SendToServer<T>(T packet) where T : class, new()
|
public INetworkCommunicatorClient SendToServer<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||||
{
|
{
|
||||||
netDataWriter.Reset();
|
netDataWriter.Reset();
|
||||||
netPacketProcessor.Write(netDataWriter, packet);
|
netPacketProcessor.Write(netDataWriter, packet);
|
||||||
Manager.FirstPeer.Send(netDataWriter, LiteNetLib.DeliveryMethod.ReliableOrdered);
|
|
||||||
|
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;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet) where T : class, new()
|
public INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||||
{
|
{
|
||||||
netDataWriter.Reset();
|
netDataWriter.Reset();
|
||||||
netPacketProcessor.Write(netDataWriter, packet);
|
netPacketProcessor.Write(netDataWriter, packet);
|
||||||
@ -58,12 +58,19 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
|||||||
if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.CompareTo(connection.Id) == 0) is not NetPeer netPeer)
|
if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.CompareTo(connection.Id) == 0) is not NetPeer netPeer)
|
||||||
throw new($"Peer {connection} couldn't be found.");
|
throw new($"Peer {connection} couldn't be found.");
|
||||||
|
|
||||||
netPeer.Send(netDataWriter, DeliveryMethod.ReliableOrdered);
|
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;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public INetworkCommunicatorServer SendToAll<T>(T packet) where T : class, new()
|
public INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||||
{
|
{
|
||||||
netDataWriter.Reset();
|
netDataWriter.Reset();
|
||||||
netPacketProcessor.Write(netDataWriter, packet);
|
netPacketProcessor.Write(netDataWriter, packet);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user