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/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
+12 -5
View File
@@ -87,7 +87,7 @@ namespace PhysX
AZ::TransformNotificationBus::Handler::BusConnect(GetEntityId());
Physics::CharacterRequestBus::Handler::BusConnect(GetEntityId());
Physics::CollisionFilteringRequestBus::Handler::BusConnect(GetEntityId());
Physics::WorldBodyRequestBus::Handler::BusConnect(GetEntityId());
AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusConnect(GetEntityId());
}
void CharacterControllerComponent::Deactivate()
@@ -95,7 +95,7 @@ namespace PhysX
DestroyController();
Physics::CollisionFilteringRequestBus::Handler::BusDisconnect();
Physics::WorldBodyRequestBus::Handler::BusDisconnect();
AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusDisconnect();
AZ::TransformNotificationBus::Handler::BusDisconnect();
Physics::CharacterRequestBus::Handler::BusDisconnect();
}
@@ -215,11 +215,20 @@ namespace PhysX
return AZ::Aabb::CreateNull();
}
AzPhysics::SimulatedBody* CharacterControllerComponent::GetWorldBody()
AzPhysics::SimulatedBody* CharacterControllerComponent::GetSimulatedBody()
{
return GetCharacter();
}
AzPhysics::SimulatedBodyHandle CharacterControllerComponent::GetSimulatedBodyHandle() const
{
if (m_controller)
{
return m_controller->m_bodyHandle;
}
return AzPhysics::InvalidSimulatedBodyHandle;
}
AzPhysics::SceneQueryHit CharacterControllerComponent::RayCast(const AzPhysics::RayCastRequest& request)
{
if (m_controller)
@@ -456,7 +465,5 @@ namespace PhysX
m_preSimulateHandler.Disconnect();
CharacterControllerRequestBus::Handler::BusDisconnect();
Physics::WorldBodyNotificationBus::Event(GetEntityId(), &Physics::WorldBodyNotifications::OnPhysicsDisabled);
}
} // namespace PhysX