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

Merge pull request #7576 from aws-lumberyard-dev/aabb-shape-nus

Browse Source 
make aabb shape component incompatible with non-uniform scale component
This commit is contained in:
greerdv
2022-02-14 09:54:31 +00:00
committed by GitHub
parent 645dde9da0 c806b41cff
commit 8ae7653110
5 changed files with 8 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
+5 -4
View File
@@ -89,9 +89,10 @@ namespace LmbrCentral
provided.push_back(AZ_CRC_CE("AxisAlignedBoxShapeService"));
}
void EditorAxisAlignedBoxShapeComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
void EditorAxisAlignedBoxShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
{
dependent.push_back(AZ_CRC_CE("NonUniformScaleService"));
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
}
void EditorAxisAlignedBoxShapeComponent::DisplayEntityViewport(
@@ -104,7 +105,7 @@ namespace LmbrCentral
{
DrawBoxShape(
{ m_aaboxShape.GetBoxConfiguration().GetDrawColor(), m_shapeWireColor, m_aaboxShape.GetBoxConfiguration().IsFilled() },
m_aaboxShape.GetBoxConfiguration(), debugDisplay, m_aaboxShape.GetCurrentNonUniformScale());
m_aaboxShape.GetBoxConfiguration(), debugDisplay);
},
m_aaboxShape.GetCurrentTransform());
}
@@ -168,6 +169,6 @@ namespace LmbrCentral
AZ::Vector3 EditorAxisAlignedBoxShapeComponent::GetBoxScale()
{
return AZ::Vector3(m_aaboxShape.GetCurrentTransform().GetUniformScale() * m_aaboxShape.GetCurrentNonUniformScale());
return AZ::Vector3(m_aaboxShape.GetCurrentTransform().GetUniformScale());
}
} // namespace LmbrCentral