Skip to content

Consider model scale#11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
H3idi-X merged 1 commit into from
Oct 15, 2021
Merged

Consider model scale #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Runtime/Colliders/SpringCapsuleCollider.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ public void DrawGizmos(Color drawColor)
endRingPoints = new Vector3[PointCount];
}

var worldRadius = transform.TransformDirection(radius, 0f, 0f).magnitude;
var worldRadius = transform.TransformVector(radius, 0f, 0f).magnitude;

var startCapOrigin = transform.position;
var endCapOrigin = transform.TransformPoint(0f, height, 0f);
Expand DownExpand Up@@ -221,7 +221,7 @@ private void DrawPickBox()
var start = transform.position;
var end = transform.TransformPoint(0f, height, 0f);
var center = 0.5f * (start + end);
var worldRadius = 1.5f * transform.TransformDirection(radius, 0f, 0f).magnitude;
var worldRadius = 1.5f * transform.TransformVector(radius, 0f, 0f).magnitude;
var size = new Vector3(
Mathf.Abs(end.x - start.x) + worldRadius,
Mathf.Abs(end.y - start.y) + worldRadius,
Expand DownExpand Up@@ -259,7 +259,7 @@ SpringBone.CollisionStatus collisionStatus
var localContactPoint = new Vector3(originToContactPoint.x, localMoverPosition.y, originToContactPoint.z);
var worldContactPoint = transform.TransformPoint(localContactPoint);
var worldNormal = transform.TransformDirection(localNormal).normalized;
var worldRadius = transform.TransformDirection(localMoverRadius, 0f, 0f).magnitude;
var worldRadius = transform.TransformVector(localMoverRadius, 0f, 0f).magnitude;
m_colliderDebugger.RecordCollision(
worldContactPoint,
worldNormal,
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Colliders/SpringPanelCollider.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ ref Vector3 hitNormal
}

var localTailPosition = transform.InverseTransformPoint(tailPosition);
var localTailRadius = transform.InverseTransformDirection(tailRadius, 0f, 0f).magnitude;
var localTailRadius = transform.InverseTransformVector(tailRadius, 0f, 0f).magnitude;
if (localTailPosition.z >= localTailRadius)
{
return SpringBone.CollisionStatus.NoCollision;
}

var localHeadPosition = transform.InverseTransformPoint(headPosition);
var localLength = transform.InverseTransformDirection(length, 0f, 0f).magnitude;
var localLength = transform.InverseTransformVector(length, 0f, 0f).magnitude;

var halfWidth = 0.5f * width;
var halfHeight = 0.5f * height;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Colliders/SpringSphereCollider.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ ref Vector3 hitNormal
{
var localHeadPosition = transform.InverseTransformPoint(headPosition);
var localTailPosition = transform.InverseTransformPoint(tailPosition);
var localTailRadius = transform.InverseTransformDirection(tailRadius, 0f, 0f).magnitude;
var localTailRadius = transform.InverseTransformVector(tailRadius, 0f, 0f).magnitude;

#if UNITY_EDITOR
var originalLocalTailPosition = localTailPosition;
Expand DownExpand Up@@ -141,7 +141,7 @@ public static Vector3 ComputeNewTailPosition(Circle3 intersection, Vector3 tailP

public void DrawGizmos(Color drawColor)
{
var worldRadius = transform.TransformDirection(radius, 0f, 0f).magnitude;
var worldRadius = transform.TransformVector(radius, 0f, 0f).magnitude;
// For picking
Gizmos.color = new Color(0f, 0f, 0f, 0f);
Gizmos.DrawWireSphere(transform.position, worldRadius);
Expand Down
6 changes: 3 additions & 3 deletions Runtime/SpringBone.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ private bool CheckForCollision()
{
var desiredPosition = currTipPos;
var headPosition = transform.position;
var scaledRadius = transform.TransformDirection(radius, 0f, 0f).magnitude;
var scaledRadius = transform.TransformVector(radius, 0f, 0f).magnitude;
var hitNormal = new Vector3(0f, 0f, 1f);

var hadCollision = false;
Expand DownExpand Up@@ -333,7 +333,7 @@ private bool CheckForGroundCollision()
// Todo: this assumes a flat ground parallel to the xz plane
var worldHeadPosition = transform.position;
var worldTailPosition = currTipPos;
var worldRadius = transform.TransformDirection(radius, 0f, 0f).magnitude;
var worldRadius = transform.TransformVector(radius, 0f, 0f).magnitude;
var worldLength = (currTipPos - worldHeadPosition).magnitude;
var groundHeight = manager.groundHeight;
worldHeadPosition.y -= groundHeight;
Expand DownExpand Up@@ -432,7 +432,7 @@ private Vector3 ApplyLengthLimits(float deltaTime)
public void DrawSpringBoneCollision()
{
var childPosition = ComputeChildPosition();
var worldRadius = transform.TransformDirection(radius, 0f, 0f).magnitude;
var worldRadius = transform.TransformVector(radius, 0f, 0f).magnitude;
// For picking
Gizmos.DrawSphere(childPosition, worldRadius);

Expand Down