mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-23 15:40:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #395 from misternebula/fix_null_ref_trans_issue

Browse Source 
Fix Vector3.Zero null ReferenceTransform check
This commit is contained in:
_nebula 2021-12-04 16:21:13 +00:00 committed by GitHub
commit 6c3d4260be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs
View File

@ -113,14 +113,14 @@ namespace QSB.Syncs.Sectored.Rigidbodies
return true;
}
var targetPos = ReferenceTransform.DecodePos(transform.position);
var targetRot = ReferenceTransform.DecodeRot(transform.rotation);
if (targetPos == Vector3.zero || transform.position == Vector3.zero)
if (transform.position == Vector3.zero)
{
return false;
}
var targetPos = ReferenceTransform.DecodePos(transform.position);
var targetRot = ReferenceTransform.DecodeRot(transform.rotation);
var positionToSet = targetPos;
var rotationToSet = targetRot;

2
QSB/Syncs/Sectored/Transforms/SectoredTransformSync.cs
View File

@ -81,7 +81,7 @@ namespace QSB.Syncs.Sectored.Transforms
var targetPos = transform.position;
var targetRot = transform.rotation;
if (targetPos != Vector3.zero && ReferenceTransform.DecodePos(transform.position) != Vector3.zero)
if (targetPos != Vector3.zero)
{
if (UseInterpolation)
{

10
QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs
View File

@ -79,11 +79,6 @@ namespace QSB.Syncs.Unsectored.Rigidbodies
transform.rotation = rot;
_relativeVelocity = relativeVelocity;
_relativeAngularVelocity = relativeAngularVelocity;
if (transform.position == Vector3.zero)
{
// DebugLog.ToConsole($"Warning - {_logName} at (0,0,0)! - Given position was {pos}", MessageType.Warning);
}
}
protected void SetValuesToSync()
@ -105,11 +100,6 @@ namespace QSB.Syncs.Unsectored.Rigidbodies
var targetPos = ReferenceTransform.DecodePos(transform.position);
var targetRot = ReferenceTransform.DecodeRot(transform.rotation);
if (targetPos == Vector3.zero || transform.position == Vector3.zero)
{
return false;
}
var positionToSet = targetPos;
var rotationToSet = targetRot;

24
QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs
View File

@ -45,11 +45,6 @@ namespace QSB.Syncs.Unsectored.Transforms
transform.position = pos;
transform.rotation = rot;
if (transform.position == Vector3.zero)
{
//DebugLog.ToConsole($"Warning - {_logName} at (0,0,0)! - Given position was {pos}", MessageType.Warning);
}
}
protected override bool UpdateTransform()
@ -63,22 +58,15 @@ namespace QSB.Syncs.Unsectored.Transforms
var targetPos = ReferenceTransform.DecodePos(transform.position);
var targetRot = ReferenceTransform.DecodeRot(transform.rotation);
if (targetPos != Vector3.zero && ReferenceTransform.DecodePos(transform.position) != Vector3.zero)
if (UseInterpolation)
{
if (UseInterpolation)
{
AttachedObject.transform.position = SmartSmoothDamp(AttachedObject.transform.position, targetPos);
AttachedObject.transform.rotation = QuaternionHelper.SmoothDamp(AttachedObject.transform.rotation, targetRot, ref _rotationSmoothVelocity, SmoothTime);
}
else
{
AttachedObject.transform.position = targetPos;
AttachedObject.transform.rotation = targetRot;
}
AttachedObject.transform.position = SmartSmoothDamp(AttachedObject.transform.position, targetPos);
AttachedObject.transform.rotation = QuaternionHelper.SmoothDamp(AttachedObject.transform.rotation, targetRot, ref _rotationSmoothVelocity, SmoothTime);
}
else if (targetPos == Vector3.zero)
else
{
DebugLog.ToConsole($"Warning - TargetPos for {LogName} was (0,0,0).", MessageType.Warning);
AttachedObject.transform.position = targetPos;
AttachedObject.transform.rotation = targetRot;
}
return true;