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

[EMotionFX] Avoid using invalid Aabbs #3048

Browse Source 
Merge pull request #3048 from aws-lumberyard-dev/burelc/SPEC-7957
This commit is contained in:
Benjamin Jillich
2021-08-12 00:06:42 -07:00
committed by GitHub
parent 3f34fa5636 c28026a022
commit 1f23297abb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
+7 -3
View File
@@ -621,7 +621,7 @@ namespace EMotionFX
}
// Expand the bounding volume by a tolerance area in case set.
if (!AZ::IsClose(m_boundsExpandBy, 0.0f))
if (!AZ::IsClose(m_boundsExpandBy, 0.0f) && m_aabb.IsValid())
{
const AZ::Vector3 center = m_aabb.GetCenter();
const AZ::Vector3 halfExtents = m_aabb.GetExtents() * 0.5f;
@@ -1416,8 +1416,12 @@ namespace EMotionFX
*outResult = m_staticAabb;
EMFX_SCALECODE(
outResult->SetMin(m_staticAabb.GetMin() * m_worldTransform.m_scale);
outResult->SetMax(m_staticAabb.GetMax() * m_worldTransform.m_scale);)
if (m_staticAabb.IsValid())
{
outResult->SetMin(m_staticAabb.GetMin() * m_worldTransform.m_scale);
outResult->SetMax(m_staticAabb.GetMax() * m_worldTransform.m_scale);
}
)
outResult->Translate(m_worldTransform.m_position);
}