Remove physics world body notification bus (#576)

Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp

@@ -62,8 +62,6 @@ namespace PhysX
 
     void StaticRigidBodyComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        // Not compatible with cry engine colliders
-        incompatible.push_back(AZ_CRC("ColliderService", 0x902d4e93));
         // There can be only one StaticRigidBodyComponent per entity
         incompatible.push_back(AZ_CRC("PhysXStaticRigidBodyService", 0xaae8973b));
         // Cannot have both StaticRigidBodyComponent and RigidBodyComponent
@@ -75,11 +73,6 @@ namespace PhysX
         dependent.push_back(AZ_CRC("PhysXColliderService", 0x4ff43f7c));
     }
 
-    PhysX::StaticRigidBody* StaticRigidBodyComponent::GetStaticRigidBody()
-    {
-        return m_staticRigidBody;
-    }
-
     void StaticRigidBodyComponent::InitStaticRigidBody()
     {
         AZ::Transform transform = AZ::Transform::CreateIdentity();
@@ -117,8 +110,7 @@ namespace PhysX
 
         InitStaticRigidBody();
 
-        Physics::WorldBodyRequestBus::Handler::BusConnect(GetEntityId());
-        Physics::WorldBodyNotificationBus::Event(GetEntityId(), &Physics::WorldBodyNotifications::OnPhysicsEnabled);
+        AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusConnect(GetEntityId());
     }
 
     void StaticRigidBodyComponent::Deactivate()
@@ -130,7 +122,7 @@ namespace PhysX
             m_staticRigidBody = nullptr;
         }
 
-        Physics::WorldBodyRequestBus::Handler::BusDisconnect();
+        AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusDisconnect();
         AZ::TransformNotificationBus::Handler::BusDisconnect();
     }
 
@@ -149,8 +141,6 @@ namespace PhysX
         {
             sceneInterface->EnableSimulationOfBody(m_attachedSceneHandle, m_staticRigidBodyHandle);
         }
-
-        Physics::WorldBodyNotificationBus::Event(GetEntityId(), &Physics::WorldBodyNotifications::OnPhysicsEnabled);
     }
 
     void StaticRigidBodyComponent::DisablePhysics()
@@ -159,8 +149,6 @@ namespace PhysX
         {
             sceneInterface->DisableSimulationOfBody(m_attachedSceneHandle, m_staticRigidBodyHandle);
         }
-
-        Physics::WorldBodyNotificationBus::Event(GetEntityId(), &Physics::WorldBodyNotifications::OnPhysicsDisabled);
     }
 
     bool StaticRigidBodyComponent::IsPhysicsEnabled() const
@@ -173,7 +161,12 @@ namespace PhysX
         return m_staticRigidBody->GetAabb();
     }
 
-    AzPhysics::SimulatedBody* StaticRigidBodyComponent::GetWorldBody()
+    AzPhysics::SimulatedBodyHandle StaticRigidBodyComponent::GetSimulatedBodyHandle() const
+    {
+        return m_staticRigidBodyHandle;
+    }
+
+    AzPhysics::SimulatedBody* StaticRigidBodyComponent::GetSimulatedBody()
     {
         return m_staticRigidBody;
     }