GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added different tickrates for different things

Browse Source
This commit is contained in:
Albin Corén 2018-03-09 10:21:44 +01:00
parent 9c587636d5
commit ad41b78acc
2 changed files with 71 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MLAPI/Data/NetworkingConfiguration.cs
View File

@ -15,7 +15,9 @@ namespace MLAPI
internal HashSet<ushort> RegisteredPassthroughMessageTypes = new HashSet<ushort>(); internal HashSet<ushort> RegisteredPassthroughMessageTypes = new HashSet<ushort>();
public List<string> RegisteredScenes = new List<string>(); public List<string> RegisteredScenes = new List<string>();
public int MessageBufferSize = 65535; public int MessageBufferSize = 65535;
public int Tickrate = 64; public int ReceiveTickrate = 64;
public int SendTickrate = 64;
public int EventTickrate = 64;
public int MaxConnections = 100; public int MaxConnections = 100;
public int Port = 7777; public int Port = 7777;
public string Address = "127.0.0.1"; public string Address = "127.0.0.1";

124
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -73,7 +73,9 @@ namespace MLAPI
private ConnectionConfig Init(NetworkingConfiguration netConfig) private ConnectionConfig Init(NetworkingConfiguration netConfig)
{ {
NetworkConfig = netConfig; NetworkConfig = netConfig;
lastSendTickTime = 0;
lastEventTickTime = 0;
lastReceiveTickTime = 0;
pendingClients = new HashSet<int>(); pendingClients = new HashSet<int>();
connectedClients = new Dictionary<int, NetworkedClient>(); connectedClients = new Dictionary<int, NetworkedClient>();
messageBuffer = new byte[NetworkConfig.MessageBufferSize]; messageBuffer = new byte[NetworkConfig.MessageBufferSize];
@ -292,75 +294,85 @@ namespace MLAPI
private int channelId; private int channelId;
private int receivedSize; private int receivedSize;
private byte error; private byte error;
private float lastTickTime; private float lastReceiveTickTime;
private float lastSendTickTime;
private float lastEventTickTime;
private void Update() private void Update()
{ {
if(isListening && (Time.time - lastTickTime >= (1f / NetworkConfig.Tickrate))) if(isListening)
{ {
foreach (KeyValuePair<int, NetworkedClient> pair in connectedClients) if(Time.time - lastSendTickTime >= (1f / NetworkConfig.SendTickrate))
{ {
NetworkTransport.SendQueuedMessages(hostId, pair.Key, out error); foreach (KeyValuePair<int, NetworkedClient> pair in connectedClients)
}
NetworkEventType eventType = NetworkTransport.Receive(out hostId, out clientId, out channelId, messageBuffer, messageBuffer.Length, out receivedSize, out error);
NetworkError networkError = (NetworkError)error;
if (networkError == NetworkError.Timeout)
{
//Client timed out.
if (isServer)
{ {
OnClientDisconnect(clientId); NetworkTransport.SendQueuedMessages(hostId, pair.Key, out error);
}
lastSendTickTime = Time.time;
}
if(Time.time - lastReceiveTickTime >= (1f / NetworkConfig.ReceiveTickrate))
{
NetworkEventType eventType = NetworkTransport.Receive(out hostId, out clientId, out channelId, messageBuffer, messageBuffer.Length, out receivedSize, out error);
NetworkError networkError = (NetworkError)error;
if (networkError == NetworkError.Timeout)
{
//Client timed out.
if (isServer)
{
OnClientDisconnect(clientId);
return;
}
}
else if (networkError != NetworkError.Ok)
{
Debug.LogWarning("MLAPI: NetworkTransport receive error: " + networkError.ToString());
return; return;
} }
}
else if (networkError != NetworkError.Ok)
{
Debug.LogWarning("MLAPI: NetworkTransport receive error: " + networkError.ToString());
return;
}
switch (eventType) switch (eventType)
{ {
case NetworkEventType.ConnectEvent: case NetworkEventType.ConnectEvent:
if (isServer) if (isServer)
{
pendingClients.Add(clientId);
StartCoroutine(ApprovalTimeout(clientId));
}
else
{
int sizeOfStream = 32;
if (NetworkConfig.ConnectionApproval)
sizeOfStream += 2 + NetworkConfig.ConnectionData.Length;
using (MemoryStream writeStream = new MemoryStream(sizeOfStream))
{ {
using (BinaryWriter writer = new BinaryWriter(writeStream)) pendingClients.Add(clientId);
{ StartCoroutine(ApprovalTimeout(clientId));
writer.Write(NetworkConfig.GetConfig());
if (NetworkConfig.ConnectionApproval)
{
writer.Write((ushort)NetworkConfig.ConnectionData.Length);
writer.Write(NetworkConfig.ConnectionData);
}
}
Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", writeStream.GetBuffer());
} }
} else
break; {
case NetworkEventType.DataEvent: int sizeOfStream = 32;
HandleIncomingData(clientId, messageBuffer, channelId); if (NetworkConfig.ConnectionApproval)
break; sizeOfStream += 2 + NetworkConfig.ConnectionData.Length;
case NetworkEventType.DisconnectEvent:
if (isServer) using (MemoryStream writeStream = new MemoryStream(sizeOfStream))
OnClientDisconnect(clientId); {
break; using (BinaryWriter writer = new BinaryWriter(writeStream))
{
writer.Write(NetworkConfig.GetConfig());
if (NetworkConfig.ConnectionApproval)
{
writer.Write((ushort)NetworkConfig.ConnectionData.Length);
writer.Write(NetworkConfig.ConnectionData);
}
}
Send(clientId, "MLAPI_CONNECTION_REQUEST", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", writeStream.GetBuffer());
}
}
break;
case NetworkEventType.DataEvent:
HandleIncomingData(clientId, messageBuffer, channelId);
break;
case NetworkEventType.DisconnectEvent:
if (isServer)
OnClientDisconnect(clientId);
break;
}
lastReceiveTickTime = Time.time;
} }
if (isServer) if (isServer && (Time.time - lastEventTickTime >= (1f / NetworkConfig.EventTickrate)))
{ {
LagCompensationManager.AddFrames(); LagCompensationManager.AddFrames();
NetworkedObject.InvokeSyncvarUpdate(); NetworkedObject.InvokeSyncvafrUpdate();
lastEventTickTime = Time.time;
} }
lastTickTime = Time.time;
} }
} }