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

Better vehicle movement sync

Browse Source
This commit is contained in:
Sardelka
2022-07-17 19:19:23 +08:00
parent 5d1a182e47
commit ece899f2a1
2 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,6 +348,7 @@ namespace RageCoop.Client
v.RotationVelocity=packet.RotationVelocity;
v.DeluxoWingRatio=packet.DeluxoWingRatio;
v.LastSynced=Main.Ticked;
v.LastSyncedStopWatch.Restart();
if (packet.Flags.HasVehFlag(VehicleDataFlags.IsFullSync))
{
v.DamageModel=packet.DamageModel;

74
RageCoop.Client/Sync/Entities/SyncedVehicle.cs
View File

@ -8,6 +8,7 @@ using GTA;
using GTA.Native;
using GTA.Math;
using RageCoop.Core;
using System.Diagnostics;
namespace RageCoop.Client
{
@ -50,6 +51,7 @@ namespace RageCoop.Client
/// VehicleSeat,ID
/// </summary>
public Vehicle MainVehicle { get;internal set; }
public Stopwatch LastSyncedStopWatch=new Stopwatch();
#region LAST STATE
@ -116,8 +118,6 @@ namespace RageCoop.Client
// Check if all data avalible
if(!IsReady) { return; }
// Skip update if no new sync message has arrived.
if (!NeedUpdate) { return; }
#endregion
#region -- CHECK EXISTENCE --
if ((MainVehicle == null) || (!MainVehicle.Exists()) || (MainVehicle.Model.Hash != Model))
@ -127,6 +127,9 @@ namespace RageCoop.Client
return;
}
}
DisplayVehicle();
// Skip update if no new sync message has arrived.
if (!NeedUpdate) { return; }
#endregion
#region -- SYNC CRITICAL --
if (SteeringAngle != MainVehicle.SteeringAngle)
@ -136,34 +139,6 @@ namespace RageCoop.Client
MainVehicle.ThrottlePower=ThrottlePower;
MainVehicle.BrakePower=BrakePower;
if (MainVehicle.Position.DistanceTo(Position)<5)
{
MainVehicle.Velocity = Velocity+5*(Position+Velocity*SyncParameters.PositioinPredictionDefault - MainVehicle.Position);
if (IsFlipped)
{
MainVehicle.Quaternion=Quaternion.Slerp(MainVehicle.Quaternion, Quaternion, 0.5f);
MainVehicle.RotationVelocity=RotationVelocity;
}
else
{
Vector3 cali = GetCalibrationRotation();
if (cali.Length()<50)
{
MainVehicle.RotationVelocity = RotationVelocity+cali*0.2f;
}
else
{
MainVehicle.Quaternion=Quaternion;
MainVehicle.RotationVelocity=RotationVelocity;
}
}
}
else
{
MainVehicle.Position=Position;
MainVehicle.Velocity=Velocity;
MainVehicle.Quaternion=Quaternion;
}
#region FLAGS
if (IsDead)
{
@ -349,6 +324,45 @@ namespace RageCoop.Client
}
LastUpdated=Main.Ticked;
}
void DisplayVehicle()
{
var current = MainVehicle.Position;
var predicted = Position+Velocity*(Networking.Latency+0.001f*LastSyncedStopWatch.ElapsedMilliseconds);
if (current.DistanceTo(Main.PlayerPosition)>50)
{
MainVehicle.Position=predicted;
MainVehicle.Velocity=Velocity;
MainVehicle.Quaternion=Quaternion;
}
else if (current.DistanceTo(Position)<5)
{
MainVehicle.Velocity = Velocity+5*( predicted - current);
if (IsFlipped)
{
MainVehicle.Quaternion=Quaternion.Slerp(MainVehicle.Quaternion, Quaternion, 0.5f);
MainVehicle.RotationVelocity=RotationVelocity;
}
else
{
Vector3 cali = GetCalibrationRotation();
if (cali.Length()<50)
{
MainVehicle.RotationVelocity = RotationVelocity+cali*0.2f;
}
else
{
MainVehicle.Quaternion=Quaternion;
MainVehicle.RotationVelocity=RotationVelocity;
}
}
}
else
{
MainVehicle.Position=predicted;
MainVehicle.Velocity=Velocity;
MainVehicle.Quaternion=Quaternion;
}
}
private Vector3 GetCalibrationRotation()
{
var rot=Quaternion.LookRotation(Quaternion*Vector3.RelativeFront, Quaternion*Vector3.RelativeTop).ToEulerAngles();