expvintl/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spread out state, networking statistics fix

Browse Source
This commit is contained in:
Sardelka
2022-06-17 18:11:39 +08:00
parent 671b4f9f6f
commit 09a97c43fd
7 changed files with 84 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RageCoop.Client/Main.cs
View File

@ -139,10 +139,9 @@ namespace RageCoop.Client
{
_lastDebugData = time;
_debugBytesReceived = Networking.BytesReceived;
Networking.BytesReceived = 0;
_debugBytesSend = Networking.BytesSend;
Networking.BytesSend = 0;
_debugBytesReceived = Networking.Client.Statistics.ReceivedBytes;
_debugBytesSend = Networking.Client.Statistics.SentBytes;
Networking.Client.Statistics.Reset();
}
new LemonUI.Elements.ScaledText(new PointF(Screen.PrimaryScreen.Bounds.Width / 2, 0), $"L: {Networking.Latency * 1000:N0}ms", 0.5f) { Alignment = GTA.UI.Alignment.Center }.Draw();

5
RageCoop.Client/Menus/Sub/SettingsMenu.cs
View File

@ -118,11 +118,6 @@ namespace RageCoop.Client.Menus
{
Networking.ShowNetworkInfo = _showNetworkInfoItem.Checked;
if (!Networking.ShowNetworkInfo)
{
Networking.BytesReceived = 0;
Networking.BytesSend = 0;
}
}
}
}

2
RageCoop.Client/Networking/Networking.cs
View File

@ -16,8 +16,6 @@ namespace RageCoop.Client
public static NetClient Client;
public static float Latency = 0;
public static bool ShowNetworkInfo = false;
public static int BytesReceived = 0;
public static int BytesSend = 0;
static Networking()
{

2
RageCoop.Client/Networking/Receive.cs
View File

@ -17,8 +17,6 @@ namespace RageCoop.Client
{
if(message == null) { return; }
BytesReceived += message.LengthBytes;
switch (message.MessageType)
{
case NetIncomingMessageType.StatusChanged:

8
RageCoop.Client/Networking/Send.cs
View File

@ -156,10 +156,6 @@ namespace RageCoop.Client
Client.FlushSendQueue();
#if DEBUG
if (ShowNetworkInfo)
{
BytesSend += outgoingMessage.LengthBytes;
}
#endif
}
public static void SendDownloadFinish(int id)
@ -172,10 +168,6 @@ namespace RageCoop.Client
Client.FlushSendQueue();
#if DEBUG
if (ShowNetworkInfo)
{
BytesSend += outgoingMessage.LengthBytes;
}
#endif
}
#endregion

65
RageCoop.Client/Sync/EntityPool.cs
View File

@ -277,6 +277,14 @@ namespace RageCoop.Client
return ID_Projectiles.ContainsKey(id);
}
#endregion
static int vehStateIndex;
static int pedStateIndex;
static int vehStatesPerFrame;
static int pedStatesPerFrame;
static int i;
public static Ped[] allPeds=new Ped[0];
public static Vehicle[] allVehicles=new Vehicle[0];
public static Projectile[] allProjectiles=new Projectile[0];
public static void DoSync()
{
@ -284,9 +292,12 @@ namespace RageCoop.Client
PerfCounter.Restart();
Debug.TimeStamps[TimeStamp.CheckProjectiles]=PerfCounter.ElapsedTicks;
#endif
var allPeds = World.GetAllPeds();
var allVehicles=World.GetAllVehicles();
var allProjectiles=World.GetAllProjectiles();
allPeds = World.GetAllPeds();
allVehicles=World.GetAllVehicles();
allProjectiles=World.GetAllProjectiles();
vehStatesPerFrame=allVehicles.Length*5/(int)Game.FPS+1;
pedStatesPerFrame=allPeds.Length*5/(int)Game.FPS+1;
if (Main.Settings.WorldVehicleSoftLimit>-1)
{
if (Main.Ticked%100==0) { if (allVehicles.Length>Main.Settings.WorldVehicleSoftLimit) { SetBudget(0); } else { SetBudget(1); } }
@ -347,6 +358,7 @@ namespace RageCoop.Client
}
i=-1;
lock (PedsLock)
{
@ -369,9 +381,15 @@ namespace RageCoop.Client
Debug.TimeStamps[TimeStamp.AddPeds]=PerfCounter.ElapsedTicks;
#endif
foreach (SyncedPed c in ID_Peds.Values.ToArray())
var ps = ID_Peds.Values.ToArray();
pedStateIndex+=pedStatesPerFrame;
if (pedStateIndex>=ps.Length)
{
pedStateIndex=0;
}
foreach (SyncedPed c in ps)
{
i++;
if ((c.MainPed!=null)&&(!c.MainPed.Exists()))
{
EntityPool.RemovePed(c.ID, "non-existent");
@ -387,15 +405,13 @@ namespace RageCoop.Client
// event check
SyncEvents.Check(c);
if (Main.Ticked%20==0)
Networking.SendPed(c);
// Send state
if ((i-pedStateIndex)<pedStatesPerFrame)
{
Networking.SendPed(c);
Networking.SendPedState(c);
}
else
{
Networking.SendPed(c);
}
#if BENCHMARK
Debug.TimeStamps[TimeStamp.SendPed]=PerfCounter2.ElapsedTicks-start;
@ -422,6 +438,9 @@ namespace RageCoop.Client
Debug.TimeStamps[TimeStamp.PedTotal]=PerfCounter.ElapsedTicks;
#endif
}
i=-1;
lock (VehiclesLock)
{
@ -440,8 +459,15 @@ namespace RageCoop.Client
Debug.TimeStamps[TimeStamp.AddVehicles]=PerfCounter.ElapsedTicks;
#endif
foreach (SyncedVehicle v in ID_Vehicles.Values.ToArray())
var vs = ID_Vehicles.Values.ToArray();
vehStateIndex+=vehStatesPerFrame;
if (vehStateIndex>=vs.Length)
{
vehStateIndex=0;
}
foreach (SyncedVehicle v in vs)
{
i++;
if ((v.MainVehicle!=null)&&(!v.MainVehicle.Exists()))
{
EntityPool.RemoveVehicle(v.ID,"non-existent");
@ -452,15 +478,14 @@ namespace RageCoop.Client
if (v.IsMine)
{
SyncEvents.Check(v);
if (Main.Ticked%20==0)
Networking.SendVehicle(v);
// Send state
if ((i-vehStateIndex)<vehStatesPerFrame)
{
Networking.SendVehicle(v);
Networking.SendVehicleState(v);
}
else
{
Networking.SendVehicle(v);
}
}
else // Incoming sync
@ -532,6 +557,10 @@ namespace RageCoop.Client
s+="\nHandle_Peds: "+Handle_Peds.Count;
s+="\nID_Vehicles: "+ID_Vehicles.Count;
s+="\nHandle_Vehicles: "+Handle_Vehicles.Count;
s+="\nID_Projectiles: "+ID_Projectiles.Count;
s+="\nHandle_Projectiles: "+Handle_Projectiles.Count;
s+="\npedStatesPerFrame:"+pedStatesPerFrame;
s+="\nvehStatesPerFrame:"+vehStatesPerFrame;
return s;
}
public static class ThreadSafe

34
RageCoop.Client/Sync/StateThreads.cs Normal file
View File

@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using GTA;
/*
namespace RageCoop.Client.Sync
{
internal class VehicleStateThread : Script
{
public VehicleStateThread()
{
Tick+=OnTick;
}
int current;
int toSendPerFrame;
int sent;
private void OnTick(object sender, EventArgs e)
{
toSendPerFrame=EntityPool.allVehicles.Length*5/(int)Game.FPS+1;
if (!Networking.IsOnServer) { return; }
for(; sent<toSendPerFrame; sent++)
{
if (current>=EntityPool.allVehicles.Length)
{
current=0;
}
Networking.SendVehicleState(EntityPool.allVehicles[current])
}
}
}
}
*/