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

merge from main

Browse Source
This commit is contained in:
greerdv
2021-05-19 12:14:25 +01:00
parent b113f09a71 85feef74dc
commit 7def4741cd
11816 changed files with 189923 additions and 1002401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/Utils.cpp
+4 -4
View File
@@ -770,7 +770,7 @@ namespace PhysX
return worldPosAabb;
}
Physics::ShapeConfigurationList colliderShapes;
AzPhysics::ShapeColliderPairList colliderShapes;
GetColliderShapeConfigsFromAsset(physicsAssetConfig,
colliderConfiguration,
hasNonUniformScale,
@@ -812,7 +812,7 @@ namespace PhysX
void GetColliderShapeConfigsFromAsset(const Physics::PhysicsAssetShapeConfiguration& assetConfiguration,
const Physics::ColliderConfiguration& originalColliderConfiguration, bool hasNonUniformScale,
AZ::u8 subdivisionLevel, Physics::ShapeConfigurationList& resultingColliderShapes)
AZ::u8 subdivisionLevel, AzPhysics::ShapeColliderPairList& resultingColliderShapes)
{
if (!assetConfiguration.m_asset.IsReady())
{
@@ -896,13 +896,13 @@ namespace PhysX
const Physics::ColliderConfiguration& originalColliderConfiguration, bool hasNonUniformScale,
AZ::u8 subdivisionLevel, AZStd::vector<AZStd::shared_ptr<Physics::Shape>>& resultingShapes)
{
Physics::ShapeConfigurationList resultingColliderShapeConfigs;
AzPhysics::ShapeColliderPairList resultingColliderShapeConfigs;
GetColliderShapeConfigsFromAsset(assetConfiguration, originalColliderConfiguration,
hasNonUniformScale, subdivisionLevel, resultingColliderShapeConfigs);
resultingShapes.reserve(resultingShapes.size() + resultingColliderShapeConfigs.size());
for (const Physics::ShapeConfigurationPair& shapeConfigPair : resultingColliderShapeConfigs)
for (const AzPhysics::ShapeColliderPair& shapeConfigPair : resultingColliderShapeConfigs)
{
// Scale the collider offset
shapeConfigPair.first->m_position *= shapeConfigPair.second->m_scale;