mirror of
https://github.com/misternebula/quantum-space-buddies.git
synced 2025-03-12 13:13:32 +00:00
Vector3.zero check (for null ref trans) was sometimes wrong, and sometimes even happened after accessing the null ref trans XD
This commit is contained in:
parent
7d49de82ef
commit
3d3ad0a22a
@ -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;
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user