Merge branch 'voice-chat' of https://github.com/RAGECOOP/RAGECOOP-V into voice-chat
This commit is contained in:
@ -370,7 +370,6 @@ namespace RageCoop.Client
|
|||||||
v.ThrottlePower=packet.ThrottlePower;
|
v.ThrottlePower=packet.ThrottlePower;
|
||||||
v.BrakePower=packet.BrakePower;
|
v.BrakePower=packet.BrakePower;
|
||||||
v.Velocity=packet.Velocity;
|
v.Velocity=packet.Velocity;
|
||||||
v.Acceleration=packet.Acceleration;
|
|
||||||
v.RotationVelocity=packet.RotationVelocity;
|
v.RotationVelocity=packet.RotationVelocity;
|
||||||
v.DeluxoWingRatio=packet.DeluxoWingRatio;
|
v.DeluxoWingRatio=packet.DeluxoWingRatio;
|
||||||
v.LastSynced=Main.Ticked;
|
v.LastSynced=Main.Ticked;
|
||||||
|
@ -101,7 +101,6 @@ namespace RageCoop.Client
|
|||||||
BrakePower = veh.BrakePower,
|
BrakePower = veh.BrakePower,
|
||||||
};
|
};
|
||||||
if (v.LastVelocity==default) {v.LastVelocity=packet.Velocity; }
|
if (v.LastVelocity==default) {v.LastVelocity=packet.Velocity; }
|
||||||
packet.Acceleration = (packet.Velocity-v.LastVelocity)*1000/v.LastSentStopWatch.ElapsedMilliseconds;
|
|
||||||
v.LastSentStopWatch.Restart();
|
v.LastSentStopWatch.Restart();
|
||||||
v.LastVelocity= packet.Velocity;
|
v.LastVelocity= packet.Velocity;
|
||||||
if (packet.Flags.HasVehFlag(VehicleDataFlags.IsDeluxoHovering)) { packet.DeluxoWingRatio=v.MainVehicle.GetDeluxoWingRatio(); }
|
if (packet.Flags.HasVehFlag(VehicleDataFlags.IsDeluxoHovering)) { packet.DeluxoWingRatio=v.MainVehicle.GetDeluxoWingRatio(); }
|
||||||
|
@ -57,7 +57,6 @@ namespace RageCoop.Client
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region -- CRITICAL STUFF --
|
#region -- CRITICAL STUFF --
|
||||||
internal Vector3 Acceleration { get; set; }
|
|
||||||
internal Vector3 RotationVelocity { get; set; }
|
internal Vector3 RotationVelocity { get; set; }
|
||||||
internal float SteeringAngle { get; set; }
|
internal float SteeringAngle { get; set; }
|
||||||
internal float ThrottlePower { get; set; }
|
internal float ThrottlePower { get; set; }
|
||||||
|
@ -26,7 +26,6 @@ namespace RageCoop.Core
|
|||||||
// public Vector3 Rotation { get; set; }
|
// public Vector3 Rotation { get; set; }
|
||||||
|
|
||||||
public Vector3 Velocity { get; set; }
|
public Vector3 Velocity { get; set; }
|
||||||
public Vector3 Acceleration { get; set; }
|
|
||||||
|
|
||||||
public Vector3 RotationVelocity { get; set; }
|
public Vector3 RotationVelocity { get; set; }
|
||||||
|
|
||||||
@ -75,7 +74,6 @@ namespace RageCoop.Core
|
|||||||
byteArray.AddVector3(Position);
|
byteArray.AddVector3(Position);
|
||||||
byteArray.AddQuaternion(Quaternion);
|
byteArray.AddQuaternion(Quaternion);
|
||||||
byteArray.AddVector3(Velocity);
|
byteArray.AddVector3(Velocity);
|
||||||
byteArray.AddVector3(Acceleration);
|
|
||||||
byteArray.AddVector3(RotationVelocity);
|
byteArray.AddVector3(RotationVelocity);
|
||||||
byteArray.AddFloat(ThrottlePower);
|
byteArray.AddFloat(ThrottlePower);
|
||||||
byteArray.AddFloat(BrakePower);
|
byteArray.AddFloat(BrakePower);
|
||||||
@ -189,8 +187,6 @@ namespace RageCoop.Core
|
|||||||
// Read velocity
|
// Read velocity
|
||||||
Velocity =reader.ReadVector3();
|
Velocity =reader.ReadVector3();
|
||||||
|
|
||||||
Acceleration=reader.ReadVector3();
|
|
||||||
|
|
||||||
// Read rotation velocity
|
// Read rotation velocity
|
||||||
RotationVelocity=reader.ReadVector3();
|
RotationVelocity=reader.ReadVector3();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user