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

Merge branch 'main' into genewalt_emfx_ReleaseUnusedRawAssetDataAfterInit

Browse Source
This commit is contained in:
Gene Walters
2021-04-21 16:19:53 -07:00
parent 1ef7d5c14b 7a6b0c16b7
commit 49bd9dacae
407 changed files with 25585 additions and 23427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp
+24 -6
View File
@@ -378,18 +378,36 @@ namespace EMotionFX
}
}
NodeIndexContainer AnimGraphComponent::s_emptyNodeIndexContainer = {};
const NodeIndexContainer& AnimGraphComponent::GetActiveStates() const
{
const AZStd::shared_ptr<AnimGraphSnapshot> snapshot = m_animGraphInstance->GetSnapshot();
AZ_Error("EMotionFX", snapshot, "Call GetActiveStates function but no snapshot is created for this instance.");
return snapshot->GetActiveNodes();
if (m_animGraphInstance)
{
const AZStd::shared_ptr<AnimGraphSnapshot> snapshot = m_animGraphInstance->GetSnapshot();
if (snapshot)
{
AZ_Warning("EMotionFX", false, "Call GetActiveStates function but no snapshot is created for this instance.");
return snapshot->GetActiveNodes();
}
}
return s_emptyNodeIndexContainer;
}
MotionNodePlaytimeContainer AnimGraphComponent::s_emptyMotionNodePlaytimeContainer = {};
const MotionNodePlaytimeContainer& AnimGraphComponent::GetMotionPlaytimes() const
{
const AZStd::shared_ptr<AnimGraphSnapshot> snapshot = m_animGraphInstance->GetSnapshot();
AZ_Error("EMotionFX", snapshot, "Call GetActiveStates function but no snapshot is created for this instance.");
return snapshot->GetMotionNodePlaytimes();
if (m_animGraphInstance)
{
const AZStd::shared_ptr<AnimGraphSnapshot> snapshot = m_animGraphInstance->GetSnapshot();
if (snapshot)
{
AZ_Warning("EMotionFX", false, "Call GetActiveStates function but no snapshot is created for this instance.");
return snapshot->GetMotionNodePlaytimes();
}
}
return s_emptyMotionNodePlaytimeContainer;
}
void AnimGraphComponent::UpdateActorExternal(float deltatime)
Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.h
+2
View File
@@ -155,7 +155,9 @@ namespace EMotionFX
bool HasSnapshot() const override;
void CreateSnapshot(bool isAuthoritative) override;
void SetActiveStates(const NodeIndexContainer& activeStates) override;
static NodeIndexContainer s_emptyNodeIndexContainer;
const NodeIndexContainer& GetActiveStates() const override;
static MotionNodePlaytimeContainer s_emptyMotionNodePlaytimeContainer;
void SetMotionPlaytimes(const MotionNodePlaytimeContainer& motionNodePlaytimes) override;
const MotionNodePlaytimeContainer& GetMotionPlaytimes() const override;
void UpdateActorExternal(float deltatime) override;