charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 19:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf(PredictedRigidbody): revert syncing 'sleeping' because it cut benchmark performance in half (!)

Browse Source
This commit is contained in:
mischa 2024-03-27 23:06:08 +08:00 committed by MrGadget
parent 0a0daa303e
commit bb16a272f3
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Assets/Mirror/Components/PredictedRigidbody/PredictedRigidbody.cs
View File

@ -19,7 +19,6 @@ namespace Mirror
public class PredictedRigidbody : NetworkBehaviour public class PredictedRigidbody : NetworkBehaviour
{ {
Transform tf; // this component is performance critical. cache .transform getter! Transform tf; // this component is performance critical. cache .transform getter!
Renderer rend;
// Prediction sometimes moves the Rigidbody to a ghost object. // Prediction sometimes moves the Rigidbody to a ghost object.
// .predictedRigidbody is always kept up to date to wherever the RB is. // .predictedRigidbody is always kept up to date to wherever the RB is.
@ -93,10 +92,6 @@ public class PredictedRigidbody : NetworkBehaviour
[Tooltip("Reduce sends while velocity==0. Client's objects may slightly move due to gravity/physics, so we still want to send corrections occasionally even if an object is idle on the server the whole time.")] [Tooltip("Reduce sends while velocity==0. Client's objects may slightly move due to gravity/physics, so we still want to send corrections occasionally even if an object is idle on the server the whole time.")]
public bool reduceSendsWhileIdle = true; public bool reduceSendsWhileIdle = true;
[Header("Debugging")]
[Tooltip("Useful to debug objects not coming to rest. This color codes the local objects which are already asleep on the server.")]
public bool showRemoteSleeping = false;
// Rigidbody & Collider are moved out into a separate object. // Rigidbody & Collider are moved out into a separate object.
// this way the visual object can smoothly follow. // this way the visual object can smoothly follow.
protected GameObject physicsCopy; protected GameObject physicsCopy;
@ -119,7 +114,6 @@ public class PredictedRigidbody : NetworkBehaviour
protected virtual void Awake() protected virtual void Awake()
{ {
tf = transform; tf = transform;
rend = GetComponent<Renderer>();
predictedRigidbody = GetComponent<Rigidbody>(); predictedRigidbody = GetComponent<Rigidbody>();
if (predictedRigidbody == null) throw new InvalidOperationException($"Prediction: {name} is missing a Rigidbody component."); if (predictedRigidbody == null) throw new InvalidOperationException($"Prediction: {name} is missing a Rigidbody component.");
predictedRigidbodyTransform = predictedRigidbody.transform; predictedRigidbodyTransform = predictedRigidbody.transform;
@ -138,9 +132,6 @@ protected virtual void Awake()
motionSmoothingVelocityThresholdSqr = motionSmoothingVelocityThreshold * motionSmoothingVelocityThreshold; motionSmoothingVelocityThresholdSqr = motionSmoothingVelocityThreshold * motionSmoothingVelocityThreshold;
motionSmoothingAngularVelocityThresholdSqr = motionSmoothingAngularVelocityThreshold * motionSmoothingAngularVelocityThreshold; motionSmoothingAngularVelocityThresholdSqr = motionSmoothingAngularVelocityThreshold * motionSmoothingAngularVelocityThreshold;
positionCorrectionThresholdSqr = positionCorrectionThreshold * positionCorrectionThreshold; positionCorrectionThresholdSqr = positionCorrectionThreshold * positionCorrectionThreshold;
// renderer
originalColor = rend.material.color;
} }
protected virtual void CopyRenderersAsGhost(GameObject destination, Material material) protected virtual void CopyRenderersAsGhost(GameObject destination, Material material)
@ -670,7 +661,7 @@ void ApplyState(double timestamp, Vector3 position, Quaternion rotation, Vector3
// process a received server state. // process a received server state.
// compares it against our history and applies corrections if needed. // compares it against our history and applies corrections if needed.
void OnReceivedState(double timestamp, RigidbodyState state, bool sleeping) void OnReceivedState(double timestamp, RigidbodyState state)//, bool sleeping)
{ {
// always update remote state ghost // always update remote state ghost
if (remoteCopy != null) if (remoteCopy != null)
@ -680,11 +671,13 @@ void OnReceivedState(double timestamp, RigidbodyState state, bool sleeping)
remoteCopyTransform.localScale = tf.lossyScale; // world scale! see CreateGhosts comment. remoteCopyTransform.localScale = tf.lossyScale; // world scale! see CreateGhosts comment.
} }
// DO NOT SYNC SLEEPING! this cuts benchmark performance in half(!!!)
// color code remote sleeping objects to debug objects coming to rest // color code remote sleeping objects to debug objects coming to rest
if (showRemoteSleeping) // if (showRemoteSleeping)
{ // {
rend.material.color = sleeping ? Color.gray : originalColor; // rend.material.color = sleeping ? Color.gray : originalColor;
} // }
// performance: get Rigidbody position & rotation only once, // performance: get Rigidbody position & rotation only once,
// and together via its transform // and together via its transform
@ -849,8 +842,9 @@ public override void OnSerialize(NetworkWriter writer, bool initialState)
position, position,
rotation, rotation,
predictedRigidbody.velocity, predictedRigidbody.velocity,
predictedRigidbody.angularVelocity, predictedRigidbody.angularVelocity);//,
predictedRigidbody.IsSleeping()); // DO NOT SYNC SLEEPING! this cuts benchmark performance in half(!!!)
// predictedRigidbody.IsSleeping());
writer.WritePredictedSyncData(data); writer.WritePredictedSyncData(data);
} }
@ -875,7 +869,8 @@ public override void OnDeserialize(NetworkReader reader, bool initialState)
Quaternion rotation = data.rotation; Quaternion rotation = data.rotation;
Vector3 velocity = data.velocity; Vector3 velocity = data.velocity;
Vector3 angularVelocity = data.angularVelocity; Vector3 angularVelocity = data.angularVelocity;
bool sleeping = data.sleeping != 0; // DO NOT SYNC SLEEPING! this cuts benchmark performance in half(!!!)
// bool sleeping = data.sleeping != 0;
// server sends state at the end of the frame. // server sends state at the end of the frame.
// parse and apply the server's delta time to our timestamp. // parse and apply the server's delta time to our timestamp.
@ -889,7 +884,7 @@ public override void OnDeserialize(NetworkReader reader, bool initialState)
if (oneFrameAhead) timestamp += serverDeltaTime; if (oneFrameAhead) timestamp += serverDeltaTime;
// process received state // process received state
OnReceivedState(timestamp, new RigidbodyState(timestamp, Vector3.zero, position, Quaternion.identity, rotation, Vector3.zero, velocity, Vector3.zero, angularVelocity), sleeping); OnReceivedState(timestamp, new RigidbodyState(timestamp, Vector3.zero, position, Quaternion.identity, rotation, Vector3.zero, velocity, Vector3.zero, angularVelocity));//, sleeping);
} }
protected override void OnValidate() protected override void OnValidate()

8
Assets/Mirror/Components/PredictedRigidbody/PredictedSyncData.cs
View File

@ -22,17 +22,19 @@ public struct PredictedSyncData
public Quaternion rotation; // 16 bytes (word aligned) public Quaternion rotation; // 16 bytes (word aligned)
public Vector3 velocity; // 12 bytes (word aligned) public Vector3 velocity; // 12 bytes (word aligned)
public Vector3 angularVelocity; // 12 bytes (word aligned) public Vector3 angularVelocity; // 12 bytes (word aligned)
public byte sleeping; // 1 byte: bool isn't blittable // DO NOT SYNC SLEEPING! this cuts benchmark performance in half(!!!)
// public byte sleeping; // 1 byte: bool isn't blittable
// constructor for convenience // constructor for convenience
public PredictedSyncData(float deltaTime, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 angularVelocity, bool sleeping) public PredictedSyncData(float deltaTime, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 angularVelocity)//, bool sleeping)
{ {
this.deltaTime = deltaTime; this.deltaTime = deltaTime;
this.position = position; this.position = position;
this.rotation = rotation; this.rotation = rotation;
this.velocity = velocity; this.velocity = velocity;
this.angularVelocity = angularVelocity; this.angularVelocity = angularVelocity;
this.sleeping = sleeping ? (byte)1 : (byte)0; // DO NOT SYNC SLEEPING! this cuts benchmark performance in half(!!!)
// this.sleeping = sleeping ? (byte)1 : (byte)0;
} }
} }