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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
+23 -20
View File
@@ -20,7 +20,7 @@
#include <AzFramework/Physics/Ragdoll.h>
#include <AzFramework/Physics/RagdollPhysicsBus.h>
#include <AzFramework/Physics/World.h>
#include <AzFramework/Physics/PhysicsScene.h>
#include <AzFramework/Visibility/BoundsBus.h>
#include <LmbrCentral/Animation/AttachmentComponentBus.h>
@@ -163,6 +163,16 @@ namespace EMotionFX
//////////////////////////////////////////////////////////////////////////
ActorComponent::ActorComponent(const Configuration* configuration)
: m_debugDrawRoot(false)
, m_sceneFinishSimHandler([this](
[[maybe_unused]] AzPhysics::SceneHandle sceneHandle,
float fixedDeltatime
)
{
if (m_actorInstance)
{
m_actorInstance->PostPhysicsUpdate(fixedDeltatime);
}
}, aznumeric_cast<int32_t>(AzPhysics::SceneEvents::PhysicsStartFinishSimulationPriority::Animation))
{
if (configuration)
{
@@ -216,7 +226,7 @@ namespace EMotionFX
{
AzFramework::RagdollPhysicsNotificationBus::Handler::BusDisconnect();
AzFramework::CharacterPhysicsDataRequestBus::Handler::BusDisconnect();
Physics::WorldNotificationBus::Handler::BusDisconnect();
m_sceneFinishSimHandler.Disconnect();
ActorComponentRequestBus::Handler::BusDisconnect();
AZ::TickBus::Handler::BusDisconnect();
ActorComponentNotificationBus::Handler::BusDisconnect();
@@ -330,9 +340,9 @@ namespace EMotionFX
newActor->CheckFinalizeActor();
}
bool ActorComponent::IsWorldNotificationBusConnected(AZ::Crc32 worldId) const
bool ActorComponent::IsPhysicsSceneSimulationFinishEventConnected() const
{
return Physics::WorldNotificationBus::Handler::BusIsConnectedId(worldId);
return m_sceneFinishSimHandler.IsConnected();
}
void ActorComponent::CheckActorCreation()
@@ -408,7 +418,10 @@ namespace EMotionFX
// Send general mesh creation notification to interested parties.
LmbrCentral::MeshComponentNotificationBus::Event(entityId, &LmbrCentral::MeshComponentNotifications::OnMeshCreated, m_configuration.m_actorAsset);
AzFramework::CharacterPhysicsDataNotificationBus::Event(entityId, &AzFramework::CharacterPhysicsDataNotifications::OnRagdollConfigurationReady);
Physics::RagdollConfiguration ragdollConfiguration;
[[maybe_unused]] bool ragdollConfigValid = GetRagdollConfiguration(ragdollConfiguration);
AZ_Assert(ragdollConfigValid, "Ragdoll Configuration is not valid");
AzFramework::CharacterPhysicsDataNotificationBus::Event(entityId, &AzFramework::CharacterPhysicsDataNotifications::OnRagdollConfigurationReady, ragdollConfiguration);
}
//////////////////////////////////////////////////////////////////////////
@@ -527,19 +540,6 @@ namespace EMotionFX
return AZ::TICK_PRE_RENDER;
}
void ActorComponent::OnPostPhysicsSubtick(float fixedDeltaTime)
{
if (m_actorInstance)
{
m_actorInstance->PostPhysicsUpdate(fixedDeltaTime);
}
}
int ActorComponent::GetPhysicsTickOrder()
{
return WorldNotifications::Animation;
}
//////////////////////////////////////////////////////////////////////////
void ActorComponent::OnActorInstanceCreated(ActorInstance* actorInstance)
{
@@ -643,7 +643,10 @@ namespace EMotionFX
RagdollInstance* ragdollInstance = m_actorInstance->GetRagdollInstance();
AZ_Assert(ragdollInstance, "As the ragdoll passed in ActorInstance::SetRagdoll() is valid, a valid ragdoll instance is expected to exist.");
Physics::WorldNotificationBus::Handler::BusConnect(ragdollInstance->GetRagdollWorldId());
if (auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
{
sceneInterface->RegisterSceneSimulationFinishHandler(ragdollInstance->GetRagdollSceneHandle(), m_sceneFinishSimHandler);
}
}
}
@@ -651,7 +654,7 @@ namespace EMotionFX
{
if (m_actorInstance)
{
Physics::WorldNotificationBus::Handler::BusDisconnect();
m_sceneFinishSimHandler.Disconnect();
m_actorInstance->SetRagdoll(nullptr);
}
}
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
+5 -9
View File
@@ -21,7 +21,7 @@
#include <AzFramework/Physics/RagdollPhysicsBus.h>
#include <AzFramework/Physics/CharacterPhysicsDataBus.h>
#include <AzFramework/Physics/World.h>
#include <AzFramework/Physics/Common/PhysicsEvents.h>
#include <AzFramework/API/AtomActiveInterface.h>
#include <Integration/Assets/ActorAsset.h>
@@ -45,7 +45,6 @@ namespace EMotionFX
, private LmbrCentral::AttachmentComponentNotificationBus::Handler
, private AzFramework::CharacterPhysicsDataRequestBus::Handler
, private AzFramework::RagdollPhysicsNotificationBus::Handler
, protected Physics::WorldNotificationBus::Handler
, private EMotionFX::ActorNotificationBus::Handler
{
public:
@@ -160,12 +159,11 @@ namespace EMotionFX
void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
bool IsPhysicsSceneSimulationFinishEventConnected() const;
void SetActorAsset(AZ::Data::Asset<ActorAsset> actorAsset);
AZ::Data::Asset<ActorAsset> GetActorAsset() const { return m_configuration.m_actorAsset; }
// Physics::WorldNotificationBus::Handler
bool IsWorldNotificationBusConnected(AZ::Crc32 worldId) const;
private:
// AZ::TransformNotificationBus::MultiHandler
void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
@@ -174,10 +172,6 @@ namespace EMotionFX
void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
int GetTickOrder() override;
// Physics::WorldNotifications::Handler
void OnPostPhysicsSubtick(float fixedDeltaTime) override;
int GetPhysicsTickOrder() override;
// ActorNotificationBus::Handler
void OnActorReady(Actor* actor) override;
@@ -194,6 +188,8 @@ namespace EMotionFX
AZStd::unique_ptr<RenderActorInstance> m_renderActorInstance;
bool m_debugDrawRoot; ///< Enables drawing of actor root and facing.
AzPhysics::SceneEvents::OnSceneSimulationFinishHandler m_sceneFinishSimHandler;
};
} //namespace Integration
} // namespace EMotionFX