mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-26 09:35:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix velocity sync

Browse Source
This commit is contained in:
Mister_Nebula 2021-06-13 19:43:03 +01:00
parent e914dcd36e
commit 93047f590d
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
QSB/Syncs/RigidbodySync/UnparentedBaseRigidbodySync.cs
View File

@ -21,8 +21,8 @@ namespace QSB.Syncs.RigidbodySync
protected bool _isInitialized; protected bool _isInitialized;
protected IntermediaryTransform _intermediaryTransform; protected IntermediaryTransform _intermediaryTransform;
protected Vector3 _velocity; protected Vector3 _relativeVelocity;
protected Vector3 _angularVelocity; protected Vector3 _relativeAngularVelocity;
protected Vector3 _prevVelocity; protected Vector3 _prevVelocity;
protected Vector3 _prevAngularVelocity; protected Vector3 _prevAngularVelocity;
private string _logName => $"{NetId}:{GetType().Name}"; private string _logName => $"{NetId}:{GetType().Name}";
@ -70,18 +70,18 @@ namespace QSB.Syncs.RigidbodySync
var worldPos = _intermediaryTransform.GetPosition(); var worldPos = _intermediaryTransform.GetPosition();
var worldRot = _intermediaryTransform.GetRotation(); var worldRot = _intermediaryTransform.GetRotation();
var velocity = _velocity; var relativeVelocity = _relativeVelocity;
var angularVelocity = _angularVelocity; var relativeAngularVelocity = _relativeAngularVelocity;
writer.Write(worldPos); writer.Write(worldPos);
SerializeRotation(writer, worldRot); SerializeRotation(writer, worldRot);
writer.Write(velocity); writer.Write(relativeVelocity);
writer.Write(angularVelocity); writer.Write(relativeAngularVelocity);
_prevPosition = worldPos; _prevPosition = worldPos;
_prevRotation = worldRot; _prevRotation = worldRot;
_prevVelocity = velocity; _prevVelocity = relativeVelocity;
_prevAngularVelocity = angularVelocity; _prevAngularVelocity = relativeAngularVelocity;
} }
public override void DeserializeTransform(QNetworkReader reader) public override void DeserializeTransform(QNetworkReader reader)
@ -97,8 +97,8 @@ namespace QSB.Syncs.RigidbodySync
var pos = reader.ReadVector3(); var pos = reader.ReadVector3();
var rot = DeserializeRotation(reader); var rot = DeserializeRotation(reader);
var vel = reader.ReadVector3(); var relativeVelocity = reader.ReadVector3();
var angVel = reader.ReadVector3(); var relativeAngularVelocity = reader.ReadVector3();
if (HasAuthority) if (HasAuthority)
{ {
@ -112,8 +112,8 @@ namespace QSB.Syncs.RigidbodySync
_intermediaryTransform.SetPosition(pos); _intermediaryTransform.SetPosition(pos);
_intermediaryTransform.SetRotation(rot); _intermediaryTransform.SetRotation(rot);
_velocity = vel; _relativeVelocity = relativeVelocity;
_angularVelocity = angVel; _relativeAngularVelocity = relativeAngularVelocity;
if (_intermediaryTransform.GetPosition() == Vector3.zero) if (_intermediaryTransform.GetPosition() == Vector3.zero)
{ {
@ -165,8 +165,8 @@ namespace QSB.Syncs.RigidbodySync
{ {
_intermediaryTransform.EncodePosition(AttachedObject.transform.position); _intermediaryTransform.EncodePosition(AttachedObject.transform.position);
_intermediaryTransform.EncodeRotation(AttachedObject.transform.rotation); _intermediaryTransform.EncodeRotation(AttachedObject.transform.rotation);
_velocity = GetRelativeVelocity(); _relativeVelocity = GetRelativeVelocity();
_angularVelocity = AttachedObject.GetRelativeAngularVelocity(ReferenceTransform.GetAttachedOWRigidbody()); _relativeAngularVelocity = AttachedObject.GetRelativeAngularVelocity(ReferenceTransform.GetAttachedOWRigidbody());
return; return;
} }
@ -189,11 +189,15 @@ namespace QSB.Syncs.RigidbodySync
AttachedObject.SetRotation(targetRot); AttachedObject.SetRotation(targetRot);
} }
SetVelocity(AttachedObject, ReferenceTransform.GetAttachedOWRigidbody().GetPointVelocity(targetPos) + _velocity); var currentVelocity = GetRelativeVelocity();
AttachedObject.SetAngularVelocity(ReferenceTransform.GetAttachedOWRigidbody().GetAngularVelocity() + _angularVelocity); var targetVelocity = ReferenceTransform.GetAttachedOWRigidbody().GetPointVelocity(targetPos) + _relativeVelocity;
var adjustedTarget = targetVelocity + Locator.GetCenterOfTheUniverse().GetStaticFrameWorldVelocity();
SetVelocity(AttachedObject, targetVelocity);
AttachedObject.SetAngularVelocity(ReferenceTransform.GetAttachedOWRigidbody().GetAngularVelocity() + _relativeAngularVelocity);
} }
private void SetVelocity(OWRigidbody rigidbody, Vector3 newVelocity) private void SetVelocity(OWRigidbody rigidbody, Vector3 relativeVelocity)
{ {
var isRunningKinematic = rigidbody.RunningKinematicSimulation(); var isRunningKinematic = rigidbody.RunningKinematicSimulation();
var currentVelocity = rigidbody.GetValue<Vector3>("_currentVelocity"); var currentVelocity = rigidbody.GetValue<Vector3>("_currentVelocity");
@ -201,16 +205,16 @@ namespace QSB.Syncs.RigidbodySync
if (isRunningKinematic) if (isRunningKinematic)
{ {
var kinematicRigidbody = rigidbody.GetValue<KinematicRigidbody>("_kinematicRigidbody"); var kinematicRigidbody = rigidbody.GetValue<KinematicRigidbody>("_kinematicRigidbody");
kinematicRigidbody.velocity = newVelocity + Locator.GetCenterOfTheUniverse().GetStaticFrameWorldVelocity(); kinematicRigidbody.velocity = relativeVelocity + Locator.GetCenterOfTheUniverse().GetStaticFrameWorldVelocity();
} }
else else
{ {
var normalRigidbody = rigidbody.GetValue<Rigidbody>("_rigidbody"); var normalRigidbody = rigidbody.GetValue<Rigidbody>("_rigidbody");
normalRigidbody.velocity = newVelocity + Locator.GetCenterOfTheUniverse().GetStaticFrameWorldVelocity(); normalRigidbody.velocity = relativeVelocity + Locator.GetCenterOfTheUniverse().GetStaticFrameWorldVelocity();
} }
rigidbody.SetValue("_lastVelocity", currentVelocity); rigidbody.SetValue("_lastVelocity", currentVelocity);
rigidbody.SetValue("_currentVelocity", newVelocity); rigidbody.SetValue("_currentVelocity", relativeVelocity);
} }
public void SetReferenceTransform(Transform transform) public void SetReferenceTransform(Transform transform)
@ -252,8 +256,8 @@ namespace QSB.Syncs.RigidbodySync
return true; return true;
} }
var velocityChangeMagnitude = (_velocity - _prevVelocity).magnitude; var velocityChangeMagnitude = (_relativeVelocity - _prevVelocity).magnitude;
var angularVelocityChangeMagnitude = (_angularVelocity - _prevAngularVelocity).magnitude; var angularVelocityChangeMagnitude = (_relativeAngularVelocity - _prevAngularVelocity).magnitude;
if (velocityChangeMagnitude > 1E-03f) if (velocityChangeMagnitude > 1E-03f)
{ {
return true; return true;
@ -268,7 +272,7 @@ namespace QSB.Syncs.RigidbodySync
} }
public float GetVelocityChangeMagnitude() public float GetVelocityChangeMagnitude()
=> (_velocity - _prevVelocity).magnitude; => (_relativeVelocity - _prevVelocity).magnitude;
public Vector3 GetRelativeVelocity() public Vector3 GetRelativeVelocity()
{ {
@ -289,7 +293,7 @@ namespace QSB.Syncs.RigidbodySync
return Vector3.zero; return Vector3.zero;
} }
var pointVelocity = attachedRigid.GetPointVelocity(AttachedObject.transform.position); var pointVelocity = attachedRigid.GetPointVelocity(AttachedObject.transform.position);
return pointVelocity - AttachedObject.GetVelocity(); return AttachedObject.GetVelocity() - pointVelocity;
} }
private void OnRenderObject() private void OnRenderObject()