fixes AzFramework

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-03 14:57:08 -07:00
parent 2e79451280
commit b52fab0c0c
4 changed files with 27 additions and 4 deletions
@@ -102,7 +102,7 @@ namespace AzFramework
virtual void PopMatrix() {}
protected:
~DebugDisplayRequests() = default;
virtual ~DebugDisplayRequests() = default;
};
/// Inherit from DebugDisplayRequestBus::Handler to implement the DebugDisplayRequests interface.
@@ -34,6 +34,7 @@ namespace AzFramework
{
}
using AZ::SettingsRegistryInterface::Visitor::Visit;
void Visit(AZStd::string_view path, AZStd::string_view, AZ::SettingsRegistryInterface::Type,
AZStd::string_view value) override
{
@@ -19,6 +19,8 @@ namespace UnitTest
{
public:
TestDebugDisplayRequests();
~TestDebugDisplayRequests() override = default;
const AZStd::vector<AZ::Vector3>& GetPoints() const;
void ClearPoints();
//! Returns the AABB of the points generated from received draw calls.
@@ -27,7 +29,9 @@ namespace UnitTest
// DebugDisplayRequests ...
void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
void DrawSolidBox(const AZ::Vector3& min, const AZ::Vector3& max) override;
using AzFramework::DebugDisplayRequests::DrawWireQuad;
void DrawWireQuad(float width, float height) override;
using AzFramework::DebugDisplayRequests::DrawQuad;
void DrawQuad(float width, float height) override;
void DrawTriangles(const AZStd::vector<AZ::Vector3>& vertices, const AZ::Color& color) override;
void DrawTrianglesIndexed(const AZStd::vector<AZ::Vector3>& vertices, const AZStd::vector<AZ::u32>& indices, const AZ::Color& color) override;
@@ -20,8 +20,7 @@ namespace Benchmark
class BM_Octree
: public benchmark::Fixture
{
public:
void SetUp([[maybe_unused]] const ::benchmark::State& state) override
void internalSetUp()
{
// Create the SystemAllocator if not available
if (!AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady())
@@ -72,7 +71,7 @@ namespace Benchmark
});
}
void TearDown([[maybe_unused]] const ::benchmark::State& state) override
void internalTearDown()
{
m_octreeSystemComponent->DestroyVisibilityScene(m_visScene);
delete m_octreeSystemComponent;
@@ -91,6 +90,25 @@ namespace Benchmark
}
}
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();
}
void InsertEntries(uint32_t entryCount)
{
for (uint32_t i = 0; i < entryCount; ++i)