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

do proper ship shit

Browse Source
This commit is contained in:
JohnCorby 2023-03-10 21:28:42 -08:00
parent 2da9b69b9e
commit 245a91bae5
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
QSB/ShipSync/TransformSync/ShipTransformSync.cs
View File

@ -1,5 +1,3 @@
using QSB.HUD;
using QSB.Player;
using QSB.Syncs.Sectored.Rigidbodies;
using QSB.Utility;
using UnityEngine;
@ -67,19 +65,28 @@ public class ShipTransformSync : SectoredRigidbodySync
{
_lastSetPositionTime = Time.unscaledTime;
var playerBody = Locator.GetPlayerBody();
var relPos = AttachedTransform.ToRelPos(playerBody.GetPosition());
var relRot = AttachedTransform.ToRelRot(playerBody.GetRotation());
SetPosition(AttachedRigidbody, targetPos);
SetRotation(AttachedRigidbody, targetRot);
playerBody.SetPosition(AttachedTransform.FromRelPos(relPos));
playerBody.SetRotation(AttachedTransform.FromRelRot(relRot));
if (!Physics.autoSyncTransforms)
if (!PlayerState.IsAttached())
{
Physics.SyncTransforms();
var playerBody = Locator.GetPlayerBody();
var relPos = AttachedTransform.ToRelPos(playerBody.GetPosition());
var relRot = AttachedTransform.ToRelRot(playerBody.GetRotation());
SetPosition(AttachedRigidbody, targetPos);
SetRotation(AttachedRigidbody, targetRot);
playerBody.SetPosition(AttachedTransform.FromRelPos(relPos));
playerBody.SetRotation(AttachedTransform.FromRelRot(relRot));
if (!Physics.autoSyncTransforms)
{
Physics.SyncTransforms();
}
}
else
{
SetPosition(AttachedRigidbody, targetPos);
SetRotation(AttachedRigidbody, targetRot);
GlobalMessenger.FireEvent("PlayerRepositioned");
}
}
}
@ -126,7 +133,7 @@ public class ShipTransformSync : SectoredRigidbodySync
private bool ShouldMovePlayer =>
(PlayerState.IsInsideShip() || PlayerState.InZeroG())
&& Vector3.Distance(AttachedTransform.position, Locator.GetPlayerBody().GetPosition()) < 100;
PlayerState.IsInsideShip() ||
(PlayerState.InZeroG() && Vector3.Distance(AttachedTransform.position, Locator.GetPlayerBody().GetPosition()) < 100);
protected override bool UseInterpolation => !ShouldMovePlayer;
}