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/Blast/Code/Source/Actor/BlastActorImpl.cpp
+8 -8
View File
@@ -20,7 +20,7 @@
#include <AzFramework/Physics/Shape.h>
#include <AzFramework/Physics/SystemBus.h>
#include <AzFramework/Physics/Utils.h>
#include <AzFramework/Physics/WorldBodyBus.h>
#include <AzFramework/Physics/Components/SimulatedBodyComponentBus.h>
#include <Blast/BlastActor.h>
#include <Family/BlastFamily.h>
#include <NvBlastExtPxAsset.h>
@@ -164,7 +164,7 @@ namespace Blast
AZ::Transform BlastActorImpl::GetTransform() const
{
return GetWorldBody()->GetTransform();
return GetSimulatedBody()->GetTransform();
}
const BlastFamily& BlastActorImpl::GetFamily() const
@@ -177,19 +177,19 @@ namespace Blast
return m_tkActor;
}
AzPhysics::SimulatedBody* BlastActorImpl::GetWorldBody()
AzPhysics::SimulatedBody* BlastActorImpl::GetSimulatedBody()
{
AzPhysics::SimulatedBody* worldBody = nullptr;
Physics::WorldBodyRequestBus::EventResult(
worldBody, m_entity->GetId(), &Physics::WorldBodyRequests::GetWorldBody);
AzPhysics::SimulatedBodyComponentRequestsBus::EventResult(
worldBody, m_entity->GetId(), &AzPhysics::SimulatedBodyComponentRequests::GetSimulatedBody);
return worldBody;
}
const AzPhysics::SimulatedBody* BlastActorImpl::GetWorldBody() const
const AzPhysics::SimulatedBody* BlastActorImpl::GetSimulatedBody() const
{
AzPhysics::SimulatedBody* worldBody = nullptr;
Physics::WorldBodyRequestBus::EventResult(
worldBody, m_entity->GetId(), &Physics::WorldBodyRequests::GetWorldBody);
AzPhysics::SimulatedBodyComponentRequestsBus::EventResult(
worldBody, m_entity->GetId(), &AzPhysics::SimulatedBodyComponentRequests::GetSimulatedBody);
return worldBody;
}