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

EMFX - Refactor the emfx actor asset loading. (#1101)

Browse Source 
Refactor emfx asset loading. The mesh asset, skinMetaAsset and morphTargetMeta asset are part of the dependency.
This commit is contained in:
rhongAMZ
2021-06-03 19:59:29 -07:00
committed by GitHub
parent 64872e024e
commit fe98c34f50
10 changed files with 137 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
+5 -41
View File
@@ -154,17 +154,15 @@ namespace EMotionFX
Actor* actor = m_configuration.m_actorAsset->GetActor();
if (actor)
{
OnActorReady(actor);
CheckActorCreation();
}
}
//////////////////////////////////////////////////////////////////////////
ActorComponent::ActorComponent(const Configuration* configuration)
: m_debugDrawRoot(false)
, m_sceneFinishSimHandler([this](
[[maybe_unused]] AzPhysics::SceneHandle sceneHandle,
float fixedDeltatime
)
, m_sceneFinishSimHandler([this]([[maybe_unused]] AzPhysics::SceneHandle sceneHandle,
float fixedDeltatime)
{
if (m_actorInstance)
{
@@ -192,18 +190,9 @@ namespace EMotionFX
if (cfg.m_actorAsset.GetId().IsValid())
{
EMotionFX::ActorNotificationBus::Handler::BusDisconnect();
AZ::Data::AssetBus::Handler::BusDisconnect();
EMotionFX::ActorNotificationBus::Handler::BusConnect();
AZ::Data::AssetBus::Handler::BusConnect(cfg.m_actorAsset.GetId());
cfg.m_actorAsset.QueueLoad();
// In case the asset was already loaded fully, create the actor directly.
if (cfg.m_actorAsset.IsReady() &&
cfg.m_actorAsset->GetActor())
{
cfg.m_actorAsset->GetActor()->LoadRemainingAssets();
}
}
AZ::TickBus::Handler::BusConnect();
@@ -231,7 +220,6 @@ namespace EMotionFX
LmbrCentral::AttachmentComponentNotificationBus::Handler::BusDisconnect();
AZ::TransformNotificationBus::MultiHandler::BusDisconnect();
AZ::Data::AssetBus::Handler::BusDisconnect();
EMotionFX::ActorNotificationBus::Handler::BusDisconnect();
DestroyActor();
m_configuration.m_actorAsset.Release();
@@ -314,28 +302,12 @@ namespace EMotionFX
Actor* actor = m_configuration.m_actorAsset->GetActor();
AZ_Assert(m_configuration.m_actorAsset.IsReady() && actor, "Actor asset should be loaded and actor valid.");
actor->LoadRemainingAssets();
actor->CheckFinalizeActor();
CheckActorCreation();
}
void ActorComponent::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset)
{
DestroyActor();
m_configuration.m_actorAsset = asset;
const Actor* oldActor = m_configuration.m_actorAsset->GetActor();
AZ::Data::Asset<AZ::RPI::ModelAsset> meshAsset = oldActor->GetMeshAsset();
AZ::Data::Asset<AZ::RPI::SkinMetaAsset> skinMetaAsset = oldActor->GetSkinMetaAsset();
AZ::Data::Asset<AZ::RPI::MorphTargetMetaAsset> morphTargetMetaAsset = oldActor->GetMorphTargetMetaAsset();
m_configuration.m_actorAsset = asset;
Actor* newActor = m_configuration.m_actorAsset->GetActor();
AZ_Assert(m_configuration.m_actorAsset.IsReady() && newActor, "Actor asset should be loaded and actor valid.");
newActor->SetMeshAsset(meshAsset);
newActor->SetSkinMetaAsset(skinMetaAsset);
newActor->SetMorphTargetMetaAsset(morphTargetMetaAsset);
newActor->CheckFinalizeActor();
OnAssetReady(asset);
}
bool ActorComponent::IsPhysicsSceneSimulationFinishEventConnected() const
@@ -850,13 +822,5 @@ namespace EMotionFX
m_actorInstance->RemoveAttachment(targetActorInstance);
}
}
void ActorComponent::OnActorReady(Actor* actor)
{
if (m_configuration.m_actorAsset && m_configuration.m_actorAsset->GetActor() == actor)
{
CheckActorCreation();
}
}
} // namespace Integration
} // namespace EMotionFX