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

PredictedRigidbody: CorrectionMode instead of bool to support more modes soon

Browse Source
This commit is contained in:
mischa 2023-11-17 10:39:31 +01:00
parent 55e8ca57e7
commit 0655f77922
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,12 @@ public static RigidbodyState Interpolate(RigidbodyState a, RigidbodyState b, flo
}
}
public enum CorrectionMode
{
Set, // rigidbody.position/rotation = ...
Move, // rigidbody.MovePosition/Rotation
}
[RequireComponent(typeof(Rigidbody))]
public class PredictedRigidbody : NetworkBehaviour
{
@ -75,8 +81,8 @@ public class PredictedRigidbody : NetworkBehaviour
public bool oneFrameAhead = true;
[Header("Smoothing")]
[Tooltip("Enable this to use Rigidbody's MovePosition/Rotation instead of directly setting .position/.rotation. This is recommended!")]
public bool smoothCorrection = true;
[Tooltip("Configure how to apply the corrected state.")]
public CorrectionMode correctionMode = CorrectionMode.Move;
[Header("Debugging")]
public float lineTime = 10;
@ -117,12 +123,12 @@ void ApplyState(Vector3 position, Quaternion rotation, Vector3 velocity)
{
// Rigidbody .position teleports, while .MovePosition interpolates
// TODO is this a good idea? what about next capture while it's interpolating?
if (smoothCorrection)
if (correctionMode == CorrectionMode.Move)
{
rb.MovePosition(position);
rb.MoveRotation(rotation);
}
else
else if (correctionMode == CorrectionMode.Set)
{
rb.position = position;
rb.rotation = rotation;