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

Squared

Browse Source
This commit is contained in:
Sardelka
2022-07-30 21:37:15 +08:00
parent 60e7d91409
commit 91035d9a3f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,11 +141,11 @@ namespace RageCoop.Client
var v = Main.P.CurrentVehicle; var v = Main.P.CurrentVehicle;
if (v!= null && MainVehicle.IsTouching(v)) if (v!= null && MainVehicle.IsTouching(v))
{ {
DisplayVehicle(00.1f); DisplayVehicle(true);
} }
else else
{ {
DisplayVehicle(1); DisplayVehicle(false);
} }
#region FLAGS #region FLAGS
if (IsDead) if (IsDead)
@ -352,15 +352,18 @@ namespace RageCoop.Client
} }
LastUpdated=Main.Ticked; LastUpdated=Main.Ticked;
} }
void DisplayVehicle(float calibrationMultiplier=1) void DisplayVehicle(bool touching)
{ {
var current = MainVehicle.ReadPosition(); var current = MainVehicle.ReadPosition();
var predicted = Position+Velocity*(Networking.Latency+0.001f*LastSyncedStopWatch.ElapsedMilliseconds); var predicted = Position+Velocity*(Networking.Latency+0.001f*LastSyncedStopWatch.ElapsedMilliseconds);
var dist = current.DistanceTo(Position); var dist = current.DistanceTo(Position);
if (dist<8) if (dist<8)
{ {
MainVehicle.Velocity = Velocity; if (!touching)
MainVehicle.ApplyForce(calibrationMultiplier*dist*(predicted - current)); {
MainVehicle.Velocity = Velocity;
}
MainVehicle.ApplyForce((touching? 0.001f:1) *dist*dist*(predicted - current));
if (IsFlipped) if (IsFlipped)
{ {
MainVehicle.Quaternion=Quaternion.Slerp(MainVehicle.ReadQuaternion(), Quaternion, 0.5f); MainVehicle.Quaternion=Quaternion.Slerp(MainVehicle.ReadQuaternion(), Quaternion, 0.5f);
@ -371,7 +374,7 @@ namespace RageCoop.Client
Vector3 cali = GetCalibrationRotation(); Vector3 cali = GetCalibrationRotation();
if (cali.Length()<50) if (cali.Length()<50)
{ {
MainVehicle.RotationVelocity = calibrationMultiplier*(RotationVelocity+cali*0.2f); MainVehicle.RotationVelocity = (touching ? 0.001f : 1)*(RotationVelocity+cali*0.2f);
} }
else else
{ {