From 08c3bb6bd76a24113961f59535705f6a2b719650 Mon Sep 17 00:00:00 2001 From: greerdv Date: Fri, 9 Jul 2021 19:39:07 +0100 Subject: [PATCH] some tidying up Signed-off-by: greerdv --- .../AzFramework/Physics/Common/PhysicsSceneQueries.cpp | 2 -- .../AzFramework/Physics/ShapeConfiguration.cpp | 9 --------- Gems/PhysX/Code/Tests/PhysXScriptTest.cpp | 10 +++------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp index 51202a235d..02597123db 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp +++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp @@ -292,8 +292,6 @@ namespace AzPhysics return OverlapRequestHelpers::CreateCapsuleOverlapRequest( height, radius, pose, nullptr); }); - - } } diff --git a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp index a260b6b187..a122b48d91 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp +++ b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp @@ -63,15 +63,6 @@ namespace Physics ; } } - - if (auto behaviorContext = azrtti_cast(context)) - { - behaviorContext->Class() - ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common) - ->Attribute(AZ::Script::Attributes::Module, "physics") - ->Attribute(AZ::Script::Attributes::Category, "PhysX") - ->Property("Radius", BehaviorValueProperty(&SphereShapeConfiguration::m_radius)); - } } SphereShapeConfiguration::SphereShapeConfiguration(float radius) diff --git a/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp b/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp index c8e366443b..d2d5b664d2 100644 --- a/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp +++ b/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp @@ -19,10 +19,6 @@ #include #include -#include -#include -#include - namespace PhysX { static AZStd::map s_testEntities; @@ -135,7 +131,7 @@ namespace PhysX EXPECT_TRUE(GetScriptContext()->Execute(luaCode)); } - TEST_F(PhysXScriptTest, SimulatedBodyRaycast_RaycastNotInteractingCollisionFilters_ReturnsNoHit) + TEST_F(PhysXScriptTest, SimulatedBodyRaycast_RaycastNonInteractingCollisionFilters_ReturnsNoHits) { s_testEntities.insert( { @@ -249,7 +245,7 @@ namespace PhysX EXPECT_TRUE(GetScriptContext()->Execute(luaCode)); } - TEST_F(PhysXScriptTest, SceneRaycast_RaycastNotInteractingCollisionFilters_ReturnsNoHits) + TEST_F(PhysXScriptTest, SceneRaycast_RaycastNonInteractingCollisionFilters_ReturnsNoHits) { s_testEntities.insert( { @@ -335,7 +331,7 @@ namespace PhysX EXPECT_TRUE(GetScriptContext()->Execute(luaCode)); } - TEST_F(PhysXScriptTest, BoxCast_NotInteractingCollisionFilters_ReturnsNoHits) + TEST_F(PhysXScriptTest, BoxCast_NonInteractingCollisionFilters_ReturnsNoHits) { s_testEntities.insert( {