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

perf: only recalculate estimate on recv

Browse Source
This commit is contained in:
mischa 2024-04-26 21:35:14 +08:00
parent 2a1ee8a3c9
commit 68a7365232
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Assets/Mirror/Components/ForecastRigidbody/ForecastRigidbody.cs
View File

@ -232,6 +232,10 @@ protected void BeginBlending()
state = ForecastState.BLENDING; state = ForecastState.BLENDING;
// if (debugColors) rend.material.color = blendingAheadColor; set in update depending on ahead/behind // if (debugColors) rend.material.color = blendingAheadColor; set in update depending on ahead/behind
// reset old state
followingStartPositionEstimate = null;
followingStartRotationEstimate = null;
// remember exactly where blending started. // remember exactly where blending started.
predictionEndPosition = predictedRigidbody.position; predictionEndPosition = predictedRigidbody.position;
predictionEndRotation = predictedRigidbody.rotation; predictionEndRotation = predictedRigidbody.rotation;
@ -302,8 +306,8 @@ protected override void ApplySnapshot(NTSnapshot interpolated)
} }
} }
// store the latest FOLLOWING.startPosition guess for visual debugging Vector3? followingStartPositionEstimate;
Vector3 followingStartPositionEstimate = Vector3.zero; Quaternion? followingStartRotationEstimate;
// Prediction uses a Rigidbody, which needs to be moved in FixedUpdate() even while kinematic. // Prediction uses a Rigidbody, which needs to be moved in FixedUpdate() even while kinematic.
double lastReceivedRemoteTime = 0; double lastReceivedRemoteTime = 0;
@ -352,11 +356,9 @@ void UpdateClient()
// => we can sample snapshots @ blendingEndTime (if any). // => we can sample snapshots @ blendingEndTime (if any).
// => if we haven't received it yet, we need to extrpolate based // => if we haven't received it yet, we need to extrpolate based
// on current velocity to guess where we'll be at blendingEndTime. // on current velocity to guess where we'll be at blendingEndTime.
if (!GuessForecastingStartPosition(out Vector3 followStartPosition, out Quaternion followStartRotation))
return;
// store the latest FOLLOWING.startPosition guess for visual debugging // do we have an estimate yet?
followingStartPositionEstimate = followStartPosition; if (!followingStartPositionEstimate.HasValue) return;
// now we have the exact FOLLOW.startPosition, or a best guess. // now we have the exact FOLLOW.startPosition, or a best guess.
// interpolate from where we started to where we are going. // interpolate from where we started to where we are going.
@ -367,8 +369,8 @@ void UpdateClient()
float blendFactor = totalBlendTime > 0 ? Mathf.Clamp01(elapsedBlendTime / totalBlendTime) : 0; // avoids divide by zero float blendFactor = totalBlendTime > 0 ? Mathf.Clamp01(elapsedBlendTime / totalBlendTime) : 0; // avoids divide by zero
// interpolate // interpolate
Vector3 targetPosition = Vector3.Lerp(followStartPosition, predictionEndPosition, blendFactor); Vector3 targetPosition = Vector3.Lerp(followingStartPositionEstimate.Value, predictionEndPosition, blendFactor);
Quaternion targetRotation = Quaternion.Slerp(followStartRotation, predictionEndRotation, blendFactor); Quaternion targetRotation = Quaternion.Slerp(followingStartRotationEstimate.Value, predictionEndRotation, blendFactor);
// set position and rotation // set position and rotation
tf.SetPositionAndRotation(targetPosition, targetRotation); tf.SetPositionAndRotation(targetPosition, targetRotation);
@ -431,10 +433,13 @@ private void OnDrawGizmos()
Gizmos.DrawWireCube(lastReceivedRemotePosition, bounds.size); Gizmos.DrawWireCube(lastReceivedRemotePosition, bounds.size);
// show the latest blending end position guess // show the latest blending end position guess
Gizmos.color = blendingGuessColor;
if (state == ForecastState.BLENDING) if (state == ForecastState.BLENDING)
{ {
Gizmos.DrawWireCube(followingStartPositionEstimate, bounds.size); if (followingStartPositionEstimate.HasValue)
{
Gizmos.color = blendingGuessColor;
Gizmos.DrawWireCube(followingStartPositionEstimate.Value, bounds.size);
}
} }
} }
@ -547,6 +552,22 @@ protected override void OnServerToClientSync(Vector3? position, Quaternion? rota
// position might be null if same as last to save bandwidth // position might be null if same as last to save bandwidth
if (position.HasValue) lastReceivedRemotePosition = position.Value; if (position.HasValue) lastReceivedRemotePosition = position.Value;
// recalculate the FORECASTING.startPosition estimate is only needed
// whenever we receive a new state. doing it in update() would be wasteful.
if (state == ForecastState.BLENDING)
{
if (GuessForecastingStartPosition(out Vector3 followStartPosition, out Quaternion followStartRotation))
{
followingStartPositionEstimate = followStartPosition;
followingStartRotationEstimate = followStartRotation;
}
else
{
followingStartPositionEstimate = null;
followingStartRotationEstimate = null;
}
}
} }
protected override void OnValidate() protected override void OnValidate()