birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6030 from aws-lumberyard-dev/ragdoll-collider-alignment

Browse Source 
fix alignment of autosized ragdoll colliders
This commit is contained in:
greerdv
2021-12-02 11:13:38 +00:00
committed by GitHub
parent 0e5c9c3867 dbba71fe3a
commit 6150a60e57
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/PhysicsSetup.cpp
+3 -3
View File
@@ -273,7 +273,7 @@ namespace EMotionFX
{
AZ::Vector3 boneCenter = nodeTransform.GetTranslation() + 0.5f * boneDirection;
float sumDistanceFromAxisSq = 0.0f;
float boneLengthSqReciprocal = 1.0f / boneDirection.GetLengthSq();
float boneLengthSqReciprocal = 1.0f / (boneLength * boneLength);
for (int i = 0; i < numMeshPoints; i++)
{
meshPoints[i] -= boneCenter;
@@ -299,7 +299,7 @@ namespace EMotionFX
{
Physics::CapsuleShapeConfiguration* capsule = static_cast<Physics::CapsuleShapeConfiguration*>(collider.second.get());
capsule->m_height = boneDirection.GetLength();
if (AZ::IsClose(localBoneDirection.GetLength(), 1.0f))
if (!localBoneDirection.IsZero())
{
collider.first->m_rotation = AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), localBoneDirection.GetNormalized());
}
@@ -309,7 +309,7 @@ namespace EMotionFX
}
else if (colliderType == azrtti_typeid<Physics::BoxShapeConfiguration>())
{
if (AZ::IsClose(localBoneDirection.GetLength(), 1.0f))
if (!localBoneDirection.IsZero())
{
collider.first->m_rotation = AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), localBoneDirection.GetNormalized());
}