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

combined the 2 physics shape collider config pair types into 1(#778)

Browse Source
This commit is contained in:
amzn-sean
2021-05-18 12:39:07 +01:00
committed by GitHub
parent c4fa373e43
commit 672dad7fea
41 changed files with 225 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/BaseColliderComponent.cpp
+3 -3
View File
@@ -104,7 +104,7 @@ namespace PhysX
}
}
void BaseColliderComponent::SetShapeConfigurationList(const Physics::ShapeConfigurationList& shapeConfigList)
void BaseColliderComponent::SetShapeConfigurationList(const AzPhysics::ShapeColliderPairList& shapeConfigList)
{
if (GetEntity()->GetState() == AZ::Entity::State::Active)
{
@@ -115,7 +115,7 @@ namespace PhysX
m_shapeConfigList = shapeConfigList;
}
Physics::ShapeConfigurationList BaseColliderComponent::GetShapeConfigurations()
AzPhysics::ShapeColliderPairList BaseColliderComponent::GetShapeConfigurations()
{
return m_shapeConfigList;
}
@@ -319,7 +319,7 @@ namespace PhysX
{
AZ_Assert(IsMeshCollider(), "InitMeshCollider called for a non-mesh collider.");
const Physics::ShapeConfigurationPair& shapeConfigurationPair = *(m_shapeConfigList.begin());
const AzPhysics::ShapeColliderPair& shapeConfigurationPair = *(m_shapeConfigList.begin());
const Physics::ColliderConfiguration& componentColliderConfiguration = *(shapeConfigurationPair.first.get());
const Physics::PhysicsAssetShapeConfiguration& physicsAssetConfiguration =
*(static_cast<const Physics::PhysicsAssetShapeConfiguration*>(shapeConfigurationPair.second.get()));