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/Tests/Benchmarks/PhysXBenchmarkWashingMachine.cpp
+10 -6
View File
@@ -13,6 +13,7 @@
#ifdef HAVE_BENCHMARK
#include <Benchmarks/PhysXBenchmarkWashingMachine.h>
#include <AzCore/std/smart_ptr/make_shared.h>
#include <AzFramework/Physics/PhysicsScene.h>
#include <AzFramework/Physics/PhysicsSystem.h>
#include <AzFramework/Physics/SystemBus.h>
@@ -96,9 +97,12 @@ namespace PhysX::Benchmarks
config.m_position.SetY((cylinderRadius + halfCylinderWallThickness) * std::sin(AZ::Constants::TwoPi * i / NumCylinderSide) + position.GetY());
config.m_position.SetZ(z);
config.m_orientation = AZ::Quaternion::CreateRotationZ(AZ::Constants::HalfPi + (cylinderTheta * i));
Physics::ColliderConfiguration colliderConfig;
Physics::BoxShapeConfiguration shapeConfiguration(AZ::Vector3(cylinderRadius, cylinderWallThickness, cylinderHeight));
config.m_colliderAndShapeData = AzPhysics::ShapeColliderPair(&colliderConfig, &shapeConfiguration);
auto shapeConfiguration = AZStd::make_shared<Physics::BoxShapeConfiguration>(
AZ::Vector3(cylinderRadius, cylinderWallThickness, cylinderHeight));
config.m_colliderAndShapeData = AzPhysics::ShapeColliderPair(
AZStd::make_shared<Physics::ColliderConfiguration>(), shapeConfiguration);
m_cylinder[i] = scene->AddSimulatedBody(&config);
}
@@ -114,9 +118,9 @@ namespace PhysX::Benchmarks
bladeRigidBodyConfig.m_position = position;
bladeRigidBodyConfig.m_position.SetZ(position.GetZ() + (bladeHeight / 2.0f));
bladeRigidBodyConfig.m_orientation = AZ::Quaternion::CreateRotationZ(0.0f);
Physics::ColliderConfiguration bladeColliderConfig;
Physics::BoxShapeConfiguration bladeShapeConfiguration(AZ::Vector3(bladeLength, 1.0f, bladeHeight));
bladeRigidBodyConfig.m_colliderAndShapeData = AZStd::make_pair(&bladeColliderConfig, &bladeShapeConfiguration);
auto bladeShapeConfiguration = AZStd::make_shared<Physics::BoxShapeConfiguration>(AZ::Vector3(bladeLength, 1.0f, bladeHeight));
bladeRigidBodyConfig.m_colliderAndShapeData = AzPhysics::ShapeColliderPair(
AZStd::make_shared<Physics::ColliderConfiguration>(), bladeShapeConfiguration);
m_blade = scene->AddSimulatedBody(&bladeRigidBodyConfig);
}