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

[LYN-4727] Version converter for motion group that ports XML serialized object-based commands to Json event data

Browse Source
This commit is contained in:
Benjamin Jillich
2021-06-25 16:17:17 +02:00
parent bf0816fb69
commit a462df2991
1 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.cpp
+57 -1
View File
@@ -16,9 +16,11 @@
#include <SceneAPIExt/Rules/MetaDataRule.h>
#include <SceneAPIExt/Rules/MotionRangeRule.h>
#include <SceneAPIExt/Rules/MotionCompressionSettingsRule.h>
#include <SceneAPIExt/Rules/MotionMetaDataRule.h>
#include <SceneAPIExt/Rules/MotionSamplingRule.h>
#include <SceneAPIExt/Groups/MotionGroup.h>
#include <EMotionFX/CommandSystem/Source/MetaData.h>
#include <EMotionFX/Source/MotionData/NonUniformMotionData.h>
namespace EMotionFX
@@ -89,7 +91,7 @@ namespace EMotionFX
serializeContext->Class<IMotionGroup, AZ::SceneAPI::DataTypes::IGroup>()->Version(1);
serializeContext->Class<MotionGroup, IMotionGroup>()->Version(5, VersionConverter)
serializeContext->Class<MotionGroup, IMotionGroup>()->Version(6, VersionConverter)
->Field("name", &MotionGroup::m_name)
->Field("selectedRootBone", &MotionGroup::m_selectedRootBone)
->Field("id", &MotionGroup::m_id)
@@ -225,6 +227,60 @@ namespace EMotionFX
}
}
// Motion meta data introduced (no more string- or object-based commands stored in the former meta data rule)
if (version < 6)
{
AZ::SerializeContext::DataElementNode* ruleContainerNode = classElement.FindSubElement(AZ_CRC("rules", 0x899a993c));
if (!ruleContainerNode)
{
AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Can't find rule container.\n");
return false;
}
AZ::SerializeContext::DataElementNode* rulesNode = ruleContainerNode->FindSubElement(AZ_CRC("rules", 0x899a993c));
if (!rulesNode)
{
AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Can't find rules within rule container.\n");
return false;
}
const int numRules = rulesNode->GetNumSubElements();
for (int i = 0; i < numRules; ++i)
{
AZ::SerializeContext::DataElementNode& sharedPointerNode = rulesNode->GetSubElement(i);
if (sharedPointerNode.GetNumSubElements() == 1)
{
AZ::SerializeContext::DataElementNode& currentRuleNode = sharedPointerNode.GetSubElement(0);
if (currentRuleNode.GetId() == azrtti_typeid<Rule::MetaDataRule>())
{
// Read the old, command-based meta data rule and retrieve the command objects.
Rule::MetaDataRule oldMetaDataRule;
currentRuleNode.GetData<Rule::MetaDataRule>(oldMetaDataRule);
const AZStd::vector<MCore::Command*>& commands = oldMetaDataRule.GetMetaData<const AZStd::vector<MCore::Command*>&>();
// Apply the commands onto a temporary motion.
auto motion = new EMotionFX::Motion("");
motion->SetMotionData(aznew EMotionFX::NonUniformMotionData());
CommandSystem::MetaData::ApplyMetaDataOnMotion(motion, commands);
// Construct the new motion meta data rule.
auto metaData = AZStd::make_shared<EMotionFX::Pipeline::Rule::MotionMetaData>(motion->GetMotionExtractionFlags(), motion->GetEventTable());
auto metaDataRule = AZStd::make_shared<EMotionFX::Pipeline::Rule::MotionMetaDataRule>(metaData);
// Add the new motion meta data rule.
AZ::SceneAPI::Containers::RuleContainer ruleContainer;
ruleContainerNode->GetDataHierarchy<AZ::SceneAPI::Containers::RuleContainer>(context, ruleContainer);
ruleContainer.RemoveRule(i);
ruleContainer.AddRule(metaDataRule);
ruleContainerNode->SetData(context, ruleContainer);
motion->Destroy();
break;
}
}
}
}
return result;
}
}