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

Prediction: RigidbodyState moved to separate file

Browse Source
This commit is contained in:
mischa 2024-01-08 17:48:08 +01:00
parent 10b3b234a4
commit 609c3e1e41
3 changed files with 63 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,53 +6,6 @@
namespace Mirror
{
struct RigidbodyState : PredictedState
{
public double timestamp { get; private set; }
// we want to store position delta (last + delta = current), and current.
// this way we can apply deltas on top of corrected positions to get the corrected final position.
public Vector3 positionDelta { get; set; } // delta to get from last to this position
public Vector3 position { get; set; }
public Quaternion rotation; // TODO delta rotation?
public Vector3 velocityDelta { get; set; } // delta to get from last to this velocity
public Vector3 velocity { get; set; }
public RigidbodyState(
double timestamp,
Vector3 positionDelta, Vector3 position,
Quaternion rotation,
Vector3 velocityDelta, Vector3 velocity)
{
this.timestamp = timestamp;
this.positionDelta = positionDelta;
this.position = position;
this.rotation = rotation;
this.velocityDelta = velocityDelta;
this.velocity = velocity;
}
// adjust the deltas after inserting a correction between this one and the previous one.
public void AdjustDeltas(float multiplier)
{
positionDelta = Vector3.Lerp(Vector3.zero, positionDelta, multiplier);
// TODO if we have have a rotation delta, then scale it here too
velocityDelta = Vector3.Lerp(Vector3.zero, velocityDelta, multiplier);
}
public static RigidbodyState Interpolate(RigidbodyState a, RigidbodyState b, float t)
{
return new RigidbodyState
{
position = Vector3.Lerp(a.position, b.position, t),
rotation = Quaternion.Slerp(a.rotation, b.rotation, t),
velocity = Vector3.Lerp(a.velocity, b.velocity, t)
};
}
}
public enum CorrectionMode
{
Set, // rigidbody.position/rotation = ...

52
Assets/Mirror/Components/PredictedRigidbody/RigidbodyState.cs Normal file
View File

@ -0,0 +1,52 @@
// PredictedRigidbody stores a history of its rigidbody states.
using UnityEngine;
namespace Mirror
{
public struct RigidbodyState : PredictedState
{
public double timestamp { get; private set; }
// we want to store position delta (last + delta = current), and current.
// this way we can apply deltas on top of corrected positions to get the corrected final position.
public Vector3 positionDelta { get; set; } // delta to get from last to this position
public Vector3 position { get; set; }
public Quaternion rotation; // TODO delta rotation?
public Vector3 velocityDelta { get; set; } // delta to get from last to this velocity
public Vector3 velocity { get; set; }
public RigidbodyState(
double timestamp,
Vector3 positionDelta, Vector3 position,
Quaternion rotation,
Vector3 velocityDelta, Vector3 velocity)
{
this.timestamp = timestamp;
this.positionDelta = positionDelta;
this.position = position;
this.rotation = rotation;
this.velocityDelta = velocityDelta;
this.velocity = velocity;
}
// adjust the deltas after inserting a correction between this one and the previous one.
public void AdjustDeltas(float multiplier)
{
positionDelta = Vector3.Lerp(Vector3.zero, positionDelta, multiplier);
// TODO if we have have a rotation delta, then scale it here too
velocityDelta = Vector3.Lerp(Vector3.zero, velocityDelta, multiplier);
}
public static RigidbodyState Interpolate(RigidbodyState a, RigidbodyState b, float t)
{
return new RigidbodyState
{
position = Vector3.Lerp(a.position, b.position, t),
rotation = Quaternion.Slerp(a.rotation, b.rotation, t),
velocity = Vector3.Lerp(a.velocity, b.velocity, t)
};
}
}
}

11
Assets/Mirror/Components/PredictedRigidbody/RigidbodyState.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ed0e1c0c874c4c9db6be2d5885bb7bee
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3}
userData:
assetBundleName:
assetBundleVariant: