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

Remove physics world body notification bus (#576)

Browse Source
This commit is contained in:
amzn-sean
2021-05-07 14:12:07 +01:00
committed by GitHub
parent cb44a7ebb2
commit cb4e394784
43 changed files with 203 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp
+3 -3
View File
@@ -19,8 +19,8 @@
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Math/IntersectSegment.h>
#include <AzFramework/Physics/WorldBodyBus.h>
#include <AzFramework/Physics/Common/PhysicsSceneQueries.h>
#include <AzFramework/Physics/Components/SimulatedBodyComponentBus.h>
#include <SurfaceData/SurfaceDataSystemRequestBus.h>
#include <SurfaceData/Utility/SurfaceDataUtility.h>
@@ -221,7 +221,7 @@ namespace SurfaceData
}
AzPhysics::SceneQueryHit result;
Physics::WorldBodyRequestBus::EventResult(result, GetEntityId(), &Physics::WorldBodyRequestBus::Events::RayCast, request);
AzPhysics::SimulatedBodyComponentRequestsBus::EventResult(result, GetEntityId(), &AzPhysics::SimulatedBodyComponentRequestsBus::Events::RayCast, request);
if (result)
{
@@ -319,7 +319,7 @@ namespace SurfaceData
colliderValidBeforeUpdate = m_colliderBounds.IsValid();
m_colliderBounds = AZ::Aabb::CreateNull();
Physics::WorldBodyRequestBus::EventResult(m_colliderBounds, GetEntityId(), &Physics::WorldBodyRequestBus::Events::GetAabb);
AzPhysics::SimulatedBodyComponentRequestsBus::EventResult(m_colliderBounds, GetEntityId(), &AzPhysics::SimulatedBodyComponentRequestsBus::Events::GetAabb);
colliderValidAfterUpdate = m_colliderBounds.IsValid();
}
Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp
+6 -5
View File
@@ -23,7 +23,7 @@
#include <AzFramework/Physics/Common/PhysicsSceneQueries.h>
#include <AzFramework/Physics/Shape.h>
#include <AzFramework/Physics/WorldBodyBus.h>
#include <AzFramework/Physics/Components/SimulatedBodyComponentBus.h>
namespace UnitTest
{
@@ -45,12 +45,12 @@ namespace UnitTest
};
class MockPhysicsWorldBusProvider
: public Physics::WorldBodyRequestBus::Handler
: public AzPhysics::SimulatedBodyComponentRequestsBus::Handler
{
public:
MockPhysicsWorldBusProvider(const AZ::EntityId& id, AZ::Vector3 inPosition, bool setHitResult, const SurfaceData::SurfacePoint& hitResult)
{
Physics::WorldBodyRequestBus::Handler::BusConnect(id);
AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusConnect(id);
// Whether or not the test should return a successful hit, we still want to create a valid
// AABB so that the SurfaceData component registers itself as a provider.
@@ -73,14 +73,15 @@ namespace UnitTest
virtual ~MockPhysicsWorldBusProvider()
{
Physics::WorldBodyRequestBus::Handler::BusDisconnect();
AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusDisconnect();
}
// Minimal mocks needed to mock out this ebus
void EnablePhysics() override {}
void DisablePhysics() override {}
bool IsPhysicsEnabled() const override { return true; }
AzPhysics::SimulatedBody* GetWorldBody() override { return nullptr; }
AzPhysics::SimulatedBody* GetSimulatedBody() override { return nullptr; }
AzPhysics::SimulatedBodyHandle GetSimulatedBodyHandle() const override { return AzPhysics::InvalidSimulatedBodyHandle; }
// Functional mocks to mock out the data needed by the component
AZ::Aabb GetAabb() const override { return m_aabb; }