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

Gems/PhysX

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-03 20:37:48 -07:00
parent 4a972d96f9
commit 27cdf174cf
5 changed files with 128 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp
+44 -8
View File
@@ -136,8 +136,8 @@ namespace PhysX::Benchmarks
class PhysXRigidbodyBenchmarkFixture
: public PhysXBaseBenchmarkFixture
{
public:
virtual void SetUp([[maybe_unused]] const ::benchmark::State &state) override
protected:
virtual void internalSetUp()
{
PhysXBaseBenchmarkFixture::SetUpInternal();
//need to get the Physics::System to be able to spawn the rigid bodies
@@ -146,11 +146,29 @@ namespace PhysX::Benchmarks
m_terrainEntity = PhysX::TestUtils::CreateFlatTestTerrain(m_testSceneHandle, RigidBodyConstants::TerrainSize, RigidBodyConstants::TerrainSize);
}
virtual void TearDown([[maybe_unused]] const ::benchmark::State &state) override
virtual void internalTearDown()
{
m_terrainEntity = nullptr;
PhysXBaseBenchmarkFixture::TearDownInternal();
}
public:
void SetUp(const benchmark::State&) override
{
internalSetUp();
}
void SetUp(benchmark::State&) override
{
internalSetUp();
}
void TearDown(const benchmark::State&) override
{
internalTearDown();
}
void TearDown(benchmark::State&) override
{
internalTearDown();
}
protected:
// PhysXBaseBenchmarkFixture Interface ---------
@@ -312,10 +330,9 @@ namespace PhysX::Benchmarks
class PhysXRigidbodyCollisionsBenchmarkFixture
: public PhysXRigidbodyBenchmarkFixture
{
public:
void SetUp(const ::benchmark::State& state) override
void internalSetUp() override
{
PhysXRigidbodyBenchmarkFixture::SetUp(state);
PhysXRigidbodyBenchmarkFixture::internalSetUp();
m_collisionBeginCount = 0;
m_collisionPersistCount = 0;
@@ -346,11 +363,30 @@ namespace PhysX::Benchmarks
m_defaultScene->RegisterSceneCollisionEventHandler(m_onSceneCollisionHandler);
}
void TearDown(const ::benchmark::State& state) override
void internalTearDown() override
{
m_onSceneCollisionHandler.Disconnect();
PhysXRigidbodyBenchmarkFixture::TearDown(state);
PhysXRigidbodyBenchmarkFixture::internalTearDown();
}
public:
void SetUp(const benchmark::State&) override
{
internalSetUp();
}
void SetUp(benchmark::State&) override
{
internalSetUp();
}
void TearDown(const benchmark::State&) override
{
internalTearDown();
}
void TearDown(benchmark::State&) override
{
internalTearDown();
}
protected: