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

Merge pull request #2418 from aws-lumberyard-dev/jillich/RemoveEmfxLegacyImporters

Browse Source 
Removed legacy file loading for anim graphs and motion sets
This commit is contained in:
Benjamin Jillich
2021-07-28 00:03:55 -07:00
committed by GitHub
parent 6868a48bb0 96aa9fde06
commit 5662cb551e
32 changed files with 45 additions and 7310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/CMakeLists.txt
-2
View File
@@ -219,8 +219,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
${CMAKE_CURRENT_SOURCE_DIR}/Tests/TestAssets/EMotionFXBuilderTestAssets/AnimGraphExampleNoDependency.animgraph
${CMAKE_CURRENT_SOURCE_DIR}/Tests/TestAssets/EMotionFXBuilderTestAssets/EmptyAnimGraphExample.animgraph
${CMAKE_CURRENT_SOURCE_DIR}/Tests/TestAssets/EMotionFXBuilderTestAssets/EmptyMotionSetExample.motionset
${CMAKE_CURRENT_SOURCE_DIR}/Tests/TestAssets/EMotionFXBuilderTestAssets/LegacyAnimGraphExample.animgraph
${CMAKE_CURRENT_SOURCE_DIR}/Tests/TestAssets/EMotionFXBuilderTestAssets/LegacyMotionSetExample.motionset
${CMAKE_CURRENT_SOURCE_DIR}/Tests/TestAssets/EMotionFXBuilderTestAssets/MotionSetExample.motionset
${CMAKE_CURRENT_SOURCE_DIR}/Tests/TestAssets/EMotionFXBuilderTestAssets/MotionSetExampleNoDependency.motionset
OUTPUT_SUBDIRECTORY
Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp
+1 -3
View File
@@ -93,9 +93,7 @@ namespace CommandSystem
}
// load anim graph from file
EMotionFX::Importer::AnimGraphSettings settings;
settings.mDisableNodeVisualization = false;
EMotionFX::AnimGraph* animGraph = EMotionFX::GetImporter().LoadAnimGraph(filename.c_str(), &settings);
EMotionFX::AnimGraph* animGraph = EMotionFX::GetImporter().LoadAnimGraph(filename.c_str());
if (!animGraph)
{
outResult = AZStd::string::format("Failed to load anim graph from %s.", filename.c_str());
Gems/EMotionFX/Code/EMotionFX/Pipeline/EMotionFXBuilder/AnimGraphBuilderWorker.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ namespace EMotionFX
AZ_UNUSED(sourceFile);
AZ::ObjectStream::FilterDescriptor loadFilter = AZ::ObjectStream::FilterDescriptor(&AZ::Data::AssetFilterNoAssetLoading, AZ::ObjectStream::FILTERFLAG_IGNORE_UNKNOWN_CLASSES);
AZStd::unique_ptr<AnimGraph> animGraph(GetImporter().LoadAnimGraph(fullPath, nullptr, loadFilter));
AZStd::unique_ptr<AnimGraph> animGraph(GetImporter().LoadAnimGraph(fullPath, loadFilter));
if (!animGraph)
{
Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphAttributeTypes.h
-6
View File
@@ -79,9 +79,6 @@ namespace EMotionFX
AttributePose(AnimGraphPose* pose)
: MCore::Attribute(TYPE_ID) { mValue = pose; }
~AttributePose() {}
uint32 GetDataSize() const override { return 0; }
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override { MCORE_UNUSED(stream); MCORE_UNUSED(streamEndianType); MCORE_UNUSED(version); return false; } // unsupported
};
@@ -130,9 +127,6 @@ namespace EMotionFX
AttributeMotionInstance(MotionInstance* motionInstance)
: MCore::Attribute(TYPE_ID) { mValue = motionInstance; }
~AttributeMotionInstance() {}
uint32 GetDataSize() const override { return 0; }
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override { MCORE_UNUSED(stream); MCORE_UNUSED(streamEndianType); MCORE_UNUSED(version); return false; } // unsupported
};
class AnimGraphPropertyUtils
Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.cpp
-120
View File
@@ -1,120 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include "AnimGraphFileFormat.h"
#include <MCore/Source/Attribute.h>
#include <EMotionFX/Source/Parameter/BoolParameter.h>
#include <EMotionFX/Source/Parameter/ColorParameter.h>
#include <EMotionFX/Source/Parameter/FloatSliderParameter.h>
#include <EMotionFX/Source/Parameter/FloatSpinnerParameter.h>
#include <EMotionFX/Source/Parameter/IntSliderParameter.h>
#include <EMotionFX/Source/Parameter/IntSpinnerParameter.h>
#include <EMotionFX/Source/Parameter/TagParameter.h>
#include <EMotionFX/Source/Parameter/RotationParameter.h>
#include <EMotionFX/Source/Parameter/StringParameter.h>
#include <EMotionFX/Source/Parameter/Vector2Parameter.h>
#include <EMotionFX/Source/Parameter/Vector3GizmoParameter.h>
#include <EMotionFX/Source/Parameter/Vector3Parameter.h>
#include <EMotionFX/Source/Parameter/Vector4Parameter.h>
namespace EMotionFX
{
namespace FileFormat
{
AZ::TypeId GetParameterTypeIdForInterfaceType(uint32 interfaceType)
{
switch (interfaceType)
{
case MCore::ATTRIBUTE_INTERFACETYPE_FLOATSPINNER:
return azrtti_typeid<EMotionFX::FloatSpinnerParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_FLOATSLIDER:
return azrtti_typeid<EMotionFX::FloatSliderParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_INTSPINNER:
return azrtti_typeid<EMotionFX::IntSpinnerParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_INTSLIDER:
return azrtti_typeid<EMotionFX::IntSliderParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_CHECKBOX:
return azrtti_typeid<EMotionFX::BoolParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_VECTOR2:
return azrtti_typeid<EMotionFX::Vector2Parameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_VECTOR3GIZMO:
return azrtti_typeid<EMotionFX::Vector3GizmoParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_VECTOR4:
return azrtti_typeid<EMotionFX::Vector4Parameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_COLOR:
return azrtti_typeid<EMotionFX::ColorParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_STRING:
return azrtti_typeid<EMotionFX::StringParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_VECTOR3:
return azrtti_typeid<EMotionFX::Vector3Parameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_TAG:
return azrtti_typeid<EMotionFX::TagParameter>();
case MCore::ATTRIBUTE_INTERFACETYPE_COMBOBOX:
case MCore::ATTRIBUTE_INTERFACETYPE_PROPERTYSET:
case MCore::ATTRIBUTE_INTERFACETYPE_DEFAULT:
default:
break;
}
return AZ::TypeId();
}
uint32 GetInterfaceTypeForParameterTypeId(const AZ::TypeId& parameterTypeId)
{
if (parameterTypeId == azrtti_typeid<EMotionFX::FloatSpinnerParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_FLOATSPINNER;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::FloatSliderParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_FLOATSLIDER;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::IntSpinnerParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_INTSPINNER;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::IntSliderParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_INTSLIDER;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::BoolParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_CHECKBOX;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::Vector2Parameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_VECTOR2;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::Vector3GizmoParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_VECTOR3GIZMO;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::Vector4Parameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_VECTOR4;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::ColorParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_COLOR;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::StringParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_STRING;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::Vector3Parameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_VECTOR3;
}
else if (parameterTypeId == azrtti_typeid<EMotionFX::TagParameter>())
{
return MCore::ATTRIBUTE_INTERFACETYPE_TAG;
}
return MCORE_INVALIDINDEX32;
}
}
} // namespace EMotionFX
Gems/EMotionFX/Code/EMotionFX/Source/Importer/AnimGraphFileFormat.h
-231
View File
@@ -1,231 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include "SharedFileFormatStructs.h"
#include "AzCore/RTTI/TypeInfo.h"
namespace EMotionFX
{
namespace FileFormat // so now we are in the namespace EMotionFX::FileFormat
{
// collection of animGraph chunk IDs
enum
{
ANIMGRAPH_CHUNK_BLENDNODE = 400,
ANIMGRAPH_CHUNK_STATETRANSITIONS = 401,
ANIMGRAPH_CHUNK_NODECONNECTIONS = 402,
ANIMGRAPH_CHUNK_PARAMETERS = 403,
ANIMGRAPH_CHUNK_NODEGROUPS = 404,
ANIMGRAPH_CHUNK_GROUPPARAMETERS = 405,
ANIMGRAPH_CHUNK_GAMECONTROLLERSETTINGS = 406,
ANIMGRAPH_CHUNK_ADDITIONALINFO = 407,
ANIMGRAPH_FORCE_32BIT = 0xFFFFFFFF
};
enum
{
ANIMGRAPH_NODEFLAG_COLLAPSED = 1 << 0,
ANIMGRAPH_NODEFLAG_VISUALIZED = 1 << 1,
ANIMGRAPH_NODEFLAG_DISABLED = 1 << 2,
ANIMGRAPH_NODEFLAG_VIRTUALFINALOUTPUT = 1 << 3
};
/*
AnimGraph_Header
ANIMGRAPH_CHUNK_PARAMETERS: (global animgraph parameters)
uint32 numParameters
AnimGraph_ParamInfo[numParameters]
ANIMGRAPH_CHUNK_BLENDNODE:
AnimGraph_NodeHeader
ANIMGRAPH_CHUNK_NODECONNECTIONS: (for last loaded BLENDNODE)
uint32 numConnections
AnimGraph_NodeConnection[numConnections]
ANIMGRAPH_CHUNK_STATETRANSITIONS: (for last loaded node, assumed to be a state machine)
uint32 numStateTransitions
uint32 blendNodeIndex (the state machine the transitions are for)
AnimGraph_StateTransition[numStateTransitions]
ANIMGRAPH_CHUNK_NODEGROUPS:
uint32 numNodeGroups
AnimGraph_NodeGroup[numNodeGroups]
ANIMGRAPH_CHUNK_GAMECONTROLLERSETTINGS:
uint32 activePresetIndex
uint32 numPresets
AnimGraph_GameControllerPreset[numPresets]
*/
// AnimGraph file header
struct AnimGraph_Header
{
char mFourCC[4];
uint8 mEndianType;
uint32 mFileVersion;
uint32 mNumNodes;
uint32 mNumStateTransitions;
uint32 mNumNodeConnections;
uint32 mNumParameters;
// followed by:
// string mName;
// string mCopyright;
// string mDescription;
// string mCompany;
// string mEMFXVersion;
// string mEMStudioBuildDate;
};
// additional info
struct AnimGraph_AdditionalInfo
{
uint8 mUnitType;
};
// the node header
struct AnimGraph_NodeHeader
{
uint32 mTypeID;
uint32 mParentIndex;
uint32 mVersion;
uint32 mNumCustomDataBytes; // number of bytes of node custom data to follow
uint32 mNumChildNodes;
uint32 mNumAttributes;
int32 mVisualPosX;
int32 mVisualPosY;
uint32 mVisualizeColor;
uint8 mFlags;
// followed by:
// string mName;
// animGraphNode->Save(...) or animGraphNode->Load(...), writing or reading mNumBytes bytes
};
struct AnimGraph_ParameterInfo
{
uint32 mNumComboValues;
uint32 mInterfaceType;
uint32 mAttributeType;
uint16 mFlags;
char mHasMinMax;
// followed by:
// string mName
// string mInternalName
// string mDescription
// if (mHasMinMax == 1)
// {
// AnimGraph_Attribute mMinValue
// AnimGraph_Attribute mMaxValue
// }
// AnimGraph_Attribute mDefaultValue
// string mComboValues[mNumComboValues]
};
// a node connection
struct AnimGraph_NodeConnection
{
uint32 mSourceNode;
uint32 mTargetNode;
uint16 mSourceNodePort;
uint16 mTargetNodePort;
};
// a state transition
struct AnimGraph_StateTransition
{
uint32 mSourceNode;
uint32 mDestNode;
int32 mStartOffsetX;
int32 mStartOffsetY;
int32 mEndOffsetX;
int32 mEndOffsetY;
uint32 mNumConditions;
// followed by:
// AnimGraph_NodeHeader (and its followed by data, EXCEPT THE NAME STRING, which is skipped)
// AnimGraph_NodeHeader[mConditions] (and its followed by data, EXCEPT THE NAME STRING, which is skipped)
};
// a node group
struct AnimGraph_NodeGroup
{
FileColor mColor;
uint8 mIsVisible;
uint32 mNumNodes;
// followed by:
// string mName
// uint32[mNumNodes] (node indices that belong to the group)
};
// a group parameter
struct AnimGraph_GroupParameter
{
uint32 mNumParameters;
uint8 mCollapsed;
// followed by:
// string mName
// uint32[mNumParameters] (parameter indices that belong to the group)
};
// a game controller parameter info
struct AnimGraph_GameControllerParameterInfo
{
uint8 mAxis;
uint8 mMode;
uint8 mInvert;
// followed by:
// string mName
};
// a game controller button info
struct AnimGraph_GameControllerButtonInfo
{
uint8 mButtonIndex;
uint8 mMode;
// followed by:
// string mString
};
// a game controller preset
struct AnimGraph_GameControllerPreset
{
uint32 mNumParameterInfos;
uint32 mNumButtonInfos;
// followed by:
// string mName
// AnimGraph_GameControllerParameterInfo[mNumParameterInfos]
// AnimGraph_GameControllerButtonInfo[mNumButtonInfos]
};
// Conversion functions to support attributes with the old serialization.
// Once we deprecate the old format we can remove these two functions.
AZ::TypeId GetParameterTypeIdForInterfaceType(uint32 interfaceType);
uint32 GetInterfaceTypeForParameterTypeId(const AZ::TypeId& parameterTypeId);
} // namespace FileFormat
} // namespace EMotionFX
Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.cpp
+1 -934
View File
@@ -23,6 +23,7 @@
#include <MCore/Source/AttributeFactory.h>
#include <MCore/Source/AzCoreConversions.h>
#include <MCore/Source/Distance.h>
#include <MCore/Source/File.h>
#include <MCore/Source/ReflectionSerializer.h>
#include <MCore/Source/StringConversions.h>
#include <MCore/Source/MCoreSystem.h>
@@ -53,7 +54,6 @@
#include "../AnimGraphTransitionCondition.h"
#include "../MCore/Source/Endian.h"
#include "../NodeMap.h"
#include "LegacyAnimGraphNodeParser.h"
#include <EMotionFX/Source/Importer/ActorFileFormat.h>
#include <EMotionFX/Source/TwoStringEventData.h>
@@ -245,14 +245,10 @@ namespace EMotionFX
{
mFileHighVersion = 1;
mFileLowVersion = 0;
mIsUnicodeFile = true;
// allocate the string buffer used for reading in variable sized strings
mStringStorageSize = 256;
mStringStorage = (char*)MCore::Allocate(mStringStorageSize, EMFX_MEMCATEGORY_IMPORTER);
mBlendNodes.SetMemoryCategory(EMFX_MEMCATEGORY_IMPORTER);
mBlendNodes.Reserve(1024);
//mConvertString.Reserve( 256 );
}
@@ -281,57 +277,8 @@ namespace EMotionFX
mStringStorage = nullptr;
mStringStorageSize = 0;
//mConvertString.Clear();
// get rid of the blend nodes array
mBlendNodes.Clear();
m_entryNodeIndexToStateMachineIdLookupTable.clear();
}
// check if the strings in the file are encoded using unicode or multi-byte
bool SharedHelperData::GetIsUnicodeFile(const char* dateString, MCore::Array<SharedData*>* sharedData)
{
// find the helper data
SharedData* data = Importer::FindSharedData(sharedData, SharedHelperData::TYPE_ID);
SharedHelperData* helperData = static_cast<SharedHelperData*>(data);
AZStd::vector<AZStd::string> dateParts;
AzFramework::StringFunc::Tokenize(dateString, dateParts, MCore::CharacterConstants::space, false /* keep empty strings */, true /* keep space strings */);
// decode the month
int32 month = 0;
const AZStd::string& monthString = dateParts[0];
const char* monthStrings[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
for (int32 i = 0; i < 12; ++i)
{
if (monthString == monthStrings[i])
{
month = i + 1;
break;
}
}
//int32 day = dateParts[1].ToInt();
int32 year;
if (!AzFramework::StringFunc::LooksLikeInt(dateParts[2].c_str(), &year))
{
return false;
}
// set if the file contains unicode strings or not based on the compilcation date
if (year < 2012 || (year == 2012 && month < 11))
{
helperData->mIsUnicodeFile = false;
}
//LogInfo( "String: '%s', Decoded: %i.%i.%i - isUnicode=%i", dateString, day, month, year, helperData->mIsUnicodeFile );
return helperData->mIsUnicodeFile;
}
const char* SharedHelperData::ReadString(MCore::Stream* file, MCore::Array<SharedData*>* sharedData, MCore::Endian::EEndianType endianType)
{
MCORE_ASSERT(file);
@@ -366,25 +313,6 @@ namespace EMotionFX
return helperData->mStringStorage;
}
// get the array of anim graph nodes
MCore::Array<AnimGraphNode*>& SharedHelperData::GetBlendNodes(MCore::Array<SharedData*>* sharedData)
{
// find the helper data
SharedData* data = Importer::FindSharedData(sharedData, SharedHelperData::TYPE_ID);
SharedHelperData* helperData = static_cast<SharedHelperData*>(data);
return helperData->mBlendNodes;
}
// Get the table of entry state indices to state machines IDs
AZStd::map<AZ::u64, uint32>& SharedHelperData::GetEntryStateToStateMachineTable(MCore::Array<SharedData*>* sharedData)
{
// Find the helper data
SharedData* data = Importer::FindSharedData(sharedData, SharedHelperData::TYPE_ID);
SharedHelperData* helperData = static_cast<SharedHelperData*>(data);
return helperData->m_entryNodeIndexToStateMachineIdLookupTable;
}
//-----------------------------------------------------------------------------
// constructor
@@ -1999,7 +1927,6 @@ namespace EMotionFX
//----------------------------------------------------------------------------------------------------------
//
bool ChunkProcessorActorAttachmentNodes::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
const MCore::Endian::EEndianType endianType = importParams.mEndianType;
@@ -2055,866 +1982,6 @@ namespace EMotionFX
return true;
}
//----------------------------------------------------------------------------------------------------------
// animGraph state transitions
bool ChunkProcessorAnimGraphStateTransitions::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
// read the number of transitions to follow
uint32 numTransitions;
file->Read(&numTransitions, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&numTransitions, importParams.mEndianType);
// read the state machine index
uint32 stateMachineIndex;
file->Read(&stateMachineIndex, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&stateMachineIndex, importParams.mEndianType);
// get the loaded anim graph nodes
MCore::Array<AnimGraphNode*>& blendNodes = SharedHelperData::GetBlendNodes(importParams.mSharedData);
if (stateMachineIndex >= blendNodes.GetLength())
{
if (GetLogging())
{
AZ_Error("EMotionFX", false, "State machine refers to invalid blend node, state machine index: %d, amount of blend node: %d", stateMachineIndex, blendNodes.GetLength());
}
return false;
}
AZ_Assert(azrtti_typeid(blendNodes[stateMachineIndex]) == azrtti_typeid<AnimGraphStateMachine>(), "ChunkProcessorAnimGraphStateTransitions::Process : Unexpected node type expected AnimGraphStateMachine. Found %u instead", azrtti_typeid(blendNodes[stateMachineIndex]));
AnimGraphStateMachine* stateMachine = static_cast<AnimGraphStateMachine*>(blendNodes[stateMachineIndex]);
if (GetLogging())
{
MCore::LogDetailedInfo("- Num transitions for state machine '%s' = %d", blendNodes[stateMachineIndex]->GetName(), numTransitions);
}
stateMachine->ReserveTransitions(numTransitions);
// read the transitions
FileFormat::AnimGraph_StateTransition transition;
for (uint32 i = 0; i < numTransitions; ++i)
{
// read the transition
file->Read(&transition, sizeof(FileFormat::AnimGraph_StateTransition));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&transition.mSourceNode, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&transition.mDestNode, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&transition.mNumConditions, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&transition.mStartOffsetX, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&transition.mStartOffsetY, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&transition.mEndOffsetX, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&transition.mEndOffsetY, importParams.mEndianType);
//----------------------------------------------
// read the node header
FileFormat::AnimGraph_NodeHeader nodeHeader;
file->Read(&nodeHeader, sizeof(FileFormat::AnimGraph_NodeHeader));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mTypeID, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mParentIndex, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mVersion, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mNumCustomDataBytes, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mNumChildNodes, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mNumAttributes, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&nodeHeader.mVisualPosX, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&nodeHeader.mVisualPosY, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mVisualizeColor, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo("- State Transition Node:");
MCore::LogDetailedInfo(" + Type = %d", nodeHeader.mTypeID);
MCore::LogDetailedInfo(" + Version = %d", nodeHeader.mVersion);
MCore::LogDetailedInfo(" + Num data bytes = %d", nodeHeader.mNumCustomDataBytes);
MCore::LogDetailedInfo(" + Num attributes = %d", nodeHeader.mNumAttributes);
MCore::LogDetailedInfo(" + Num conditions = %d", transition.mNumConditions);
MCore::LogDetailedInfo(" + Source node = %d", transition.mSourceNode);
MCore::LogDetailedInfo(" + Dest node = %d", transition.mDestNode);
}
// create the transition object
AnimGraphStateTransition* emfxTransition = nullptr;
if (GetNewTypeIdByOldNodeTypeId(nodeHeader.mTypeID) == azrtti_typeid<AnimGraphStateTransition>())
{
emfxTransition = aznew AnimGraphStateTransition();
}
if (emfxTransition)
{
if (transition.mDestNode >= blendNodes.GetLength())
{
if (GetLogging())
{
AZ_Error("EMotionFX", false, "State machine transition refers to invalid destination blend node, transition index %d, blend node: %d", i, transition.mDestNode);
}
delete emfxTransition;
emfxTransition = nullptr;
}
// A source node index of MCORE_INVALIDINDEX32 indicates that the transition is a wildcard transition. Don't go into error state in this case.
else if (transition.mSourceNode != MCORE_INVALIDINDEX32 && transition.mSourceNode >= blendNodes.GetLength())
{
if (GetLogging())
{
AZ_Error("EMotionFX", false, "State machine transition refers to invalid source blend node, transition index %d, blend node: %d", i, transition.mSourceNode);
}
delete emfxTransition;
emfxTransition = nullptr;
}
else
{
AnimGraphNode* targetNode = blendNodes[transition.mDestNode];
if (targetNode == nullptr)
{
delete emfxTransition;
emfxTransition = nullptr;
}
else
{
AZ_Assert(azrtti_istypeof<AnimGraphStateTransition>(emfxTransition), "ChunkProcessorAnimGraphStateTransitions::Process : Unexpected node type expected AnimGraphStateTransition. Found %u instead", azrtti_typeid(blendNodes[stateMachineIndex]));
// Now apply the transition settings
// Check if we are dealing with a wildcard transition
if (transition.mSourceNode == MCORE_INVALIDINDEX32)
{
emfxTransition->SetSourceNode(nullptr);
emfxTransition->SetIsWildcardTransition(true);
}
else
{
// set the source node
emfxTransition->SetSourceNode(blendNodes[transition.mSourceNode]);
}
// set the destination node
emfxTransition->SetTargetNode(targetNode);
emfxTransition->SetVisualOffsets(transition.mStartOffsetX, transition.mStartOffsetY, transition.mEndOffsetX, transition.mEndOffsetY);
// now read the attributes
if (!LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphStateTransition>(file, nodeHeader.mNumAttributes, importParams.mEndianType, importParams, *emfxTransition))
{
delete emfxTransition;
emfxTransition = nullptr;
AZ_Error("EMotionFX", false, "Unable to parse state transition");
return false;
}
// add the transition to the state machine
stateMachine->AddTransition(emfxTransition);
}
}
}
if (emfxTransition)
{
// iterate through all conditions
for (uint32 c = 0; c < transition.mNumConditions; ++c)
{
// read the condition node header
FileFormat::AnimGraph_NodeHeader conditionHeader;
file->Read(&conditionHeader, sizeof(FileFormat::AnimGraph_NodeHeader));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mTypeID, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mVersion, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mNumCustomDataBytes, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mNumAttributes, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo(" - Transition Condition:");
MCore::LogDetailedInfo(" + Type = %d", conditionHeader.mTypeID);
MCore::LogDetailedInfo(" + Version = %d", conditionHeader.mVersion);
MCore::LogDetailedInfo(" + Num data bytes = %d", conditionHeader.mNumCustomDataBytes);
MCore::LogDetailedInfo(" + Num attributes = %d", conditionHeader.mNumAttributes);
}
AnimGraphTransitionCondition* emfxCondition = nullptr;
if (!LegacyAnimGraphNodeParser::ParseTransitionConditionChunk(file, importParams, conditionHeader, emfxCondition))
{
AZ_Error("EMotionFX", false, "Unable to parse Transition condition of type %u in legacy file", azrtti_typeid(emfxCondition));
delete emfxCondition;
emfxCondition = nullptr;
return false;
}
// add the condition to the transition
emfxTransition->AddCondition(emfxCondition);
}
//emfxTransition->Init( animGraph );
}
// something went wrong with creating the transition
else
{
MCore::LogWarning("Cannot load and instantiate state transition. State transition from %d to %d will be skipped.", transition.mSourceNode, transition.mDestNode);
// skip reading the attributes
if (!ForwardAttributes(file, importParams.mEndianType, nodeHeader.mNumAttributes))
{
return false;
}
// skip reading the node custom data
if (file->Forward(nodeHeader.mNumCustomDataBytes) == false)
{
return false;
}
// iterate through all conditions and skip them as well
for (uint32 c = 0; c < transition.mNumConditions; ++c)
{
// read the condition node header
FileFormat::AnimGraph_NodeHeader conditionHeader;
file->Read(&conditionHeader, sizeof(FileFormat::AnimGraph_NodeHeader));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mTypeID, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mVersion, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mNumCustomDataBytes, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&conditionHeader.mNumAttributes, importParams.mEndianType);
// skip reading the attributes
if (!ForwardAttributes(file, importParams.mEndianType, conditionHeader.mNumAttributes))
{
return false;
}
// skip reading the node custom data
if (file->Forward(conditionHeader.mNumCustomDataBytes) == false)
{
return false;
}
}
}
}
return true;
}
//----------------------------------------------------------------------------------------------------------
// animGraph state transitions
bool ChunkProcessorAnimGraphAdditionalInfo::Process(MCore::File* file, Importer::ImportParameters& /*importParams*/)
{
return file->Forward(sizeof(FileFormat::AnimGraph_AdditionalInfo));
}
//----------------------------------------------------------------------------------------------------------
// animGraph node connections
bool ChunkProcessorAnimGraphNodeConnections::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
// read the number of transitions to follow
uint32 numConnections;
file->Read(&numConnections, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&numConnections, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo("- Num node connections = %d", numConnections);
}
// get the array of currently loaded nodes
MCore::Array<AnimGraphNode*>& blendNodes = SharedHelperData::GetBlendNodes(importParams.mSharedData);
// read the connections
FileFormat::AnimGraph_NodeConnection connection;
for (uint32 i = 0; i < numConnections; ++i)
{
// read the transition
file->Read(&connection, sizeof(FileFormat::AnimGraph_NodeConnection));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&connection.mSourceNode, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&connection.mTargetNode, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt16(&connection.mSourceNodePort, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt16(&connection.mTargetNodePort, importParams.mEndianType);
// log details
if (GetLogging())
{
MCore::LogDetailedInfo(" + Connection #%d = From node %d (port id %d) into node %d (port id %d)", i, connection.mSourceNode, connection.mSourceNodePort, connection.mTargetNode, connection.mTargetNodePort);
}
// get the source and the target node and check if they are valid
AnimGraphNode* sourceNode = blendNodes[connection.mSourceNode];
AnimGraphNode* targetNode = blendNodes[connection.mTargetNode];
if (sourceNode == nullptr || targetNode == nullptr)
{
MCore::LogWarning("EMotionFX::ChunkProcessorAnimGraphNodeConnections() - Connection cannot be created because the source or target node is invalid! (sourcePortID=%d targetPortID=%d sourceNode=%d targetNode=%d)", connection.mSourceNodePort, connection.mTargetNodePort, connection.mSourceNode, connection.mTargetNode);
continue;
}
// create the connection
const uint32 sourcePort = blendNodes[connection.mSourceNode]->FindOutputPortByID(connection.mSourceNodePort);
const uint32 targetPort = blendNodes[connection.mTargetNode]->FindInputPortByID(connection.mTargetNodePort);
if (sourcePort != MCORE_INVALIDINDEX32 && targetPort != MCORE_INVALIDINDEX32)
{
blendNodes[connection.mTargetNode]->AddConnection(blendNodes[connection.mSourceNode], static_cast<uint16>(sourcePort), static_cast<uint16>(targetPort));
}
else
{
MCore::LogWarning("EMotionFX::ChunkProcessorAnimGraphNodeConnections() - Connection cannot be created because the source or target port doesn't exist! (sourcePortID=%d targetPortID=%d sourceNode='%s' targetNode=%s')", connection.mSourceNodePort, connection.mTargetNodePort, blendNodes[connection.mSourceNode]->GetName(), blendNodes[connection.mTargetNode]->GetName());
}
}
return true;
}
//----------------------------------------------------------------------------------------------------------
// animGraph node
bool ChunkProcessorAnimGraphNode::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
AnimGraph* animGraph = importParams.mAnimGraph;
MCORE_ASSERT(animGraph);
// read the node header
FileFormat::AnimGraph_NodeHeader nodeHeader;
file->Read(&nodeHeader, sizeof(FileFormat::AnimGraph_NodeHeader));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mTypeID, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mParentIndex, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mVersion, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mNumCustomDataBytes, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mNumChildNodes, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mNumAttributes, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&nodeHeader.mVisualizeColor, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&nodeHeader.mVisualPosX, importParams.mEndianType);
MCore::Endian::ConvertSignedInt32(&nodeHeader.mVisualPosY, importParams.mEndianType);
const char* nodeName = SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo("- Blend Node:");
MCore::LogDetailedInfo(" + Name = %s", nodeName);
MCore::LogDetailedInfo(" + Parent index = %d", nodeHeader.mParentIndex);
MCore::LogDetailedInfo(" + Type = %d", nodeHeader.mTypeID);
MCore::LogDetailedInfo(" + Version = %d", nodeHeader.mVersion);
MCore::LogDetailedInfo(" + Num data bytes = %d", nodeHeader.mNumCustomDataBytes);
MCore::LogDetailedInfo(" + Num child nodes = %d", nodeHeader.mNumChildNodes);
MCore::LogDetailedInfo(" + Num attributes = %d", nodeHeader.mNumAttributes);
MCore::LogDetailedInfo(" + Visualize Color = %d, %d, %d", MCore::ExtractRed(nodeHeader.mVisualizeColor), MCore::ExtractGreen(nodeHeader.mVisualizeColor), MCore::ExtractBlue(nodeHeader.mVisualizeColor));
MCore::LogDetailedInfo(" + Visual pos = (%d, %d)", nodeHeader.mVisualPosX, nodeHeader.mVisualPosY);
MCore::LogDetailedInfo(" + Collapsed = %s", (nodeHeader.mFlags & FileFormat::ANIMGRAPH_NODEFLAG_COLLAPSED) ? "Yes" : "No");
MCore::LogDetailedInfo(" + Visualized = %s", (nodeHeader.mFlags & FileFormat::ANIMGRAPH_NODEFLAG_VISUALIZED) ? "Yes" : "No");
MCore::LogDetailedInfo(" + Disabled = %s", (nodeHeader.mFlags & FileFormat::ANIMGRAPH_NODEFLAG_DISABLED) ? "Yes" : "No");
MCore::LogDetailedInfo(" + Virtual FinalOut= %s", (nodeHeader.mFlags & FileFormat::ANIMGRAPH_NODEFLAG_VIRTUALFINALOUTPUT) ? "Yes" : "No");
}
AnimGraphNode* node = nullptr;
if (!LegacyAnimGraphNodeParser::ParseAnimGraphNodeChunk(file
, importParams
, nodeName
, nodeHeader
, node))
{
if (importParams.mAnimGraph->GetRootStateMachine() == node)
{
importParams.mAnimGraph->SetRootStateMachine(nullptr);
}
if (node)
{
AnimGraphNode* parentNode = node->GetParentNode();
if (parentNode)
{
parentNode->RemoveChildNodeByPointer(node, false);
}
}
delete node;
node = nullptr;
return false;
}
EMotionFX::GetEventManager().OnCreatedNode(animGraph, node);
return true;
}
//----------------------------------------------------------------------------------------------------------
// animGraph parameters
bool ChunkProcessorAnimGraphParameters::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
AnimGraph* animGraph = importParams.mAnimGraph;
MCORE_ASSERT(animGraph);
// read the number of parameters
uint32 numParams;
file->Read(&numParams, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&numParams, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo("- Num parameters = %d", numParams);
}
// read all parameters
for (uint32 p = 0; p < numParams; ++p)
{
// read the parameter info header
FileFormat::AnimGraph_ParameterInfo paramInfo;
file->Read(&paramInfo, sizeof(FileFormat::AnimGraph_ParameterInfo));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&paramInfo.mNumComboValues, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&paramInfo.mInterfaceType, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&paramInfo.mAttributeType, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt16(&paramInfo.mFlags, importParams.mEndianType);
// check the attribute type
const uint32 attribType = paramInfo.mAttributeType;
if (attribType == 0)
{
MCore::LogError("EMotionFX::ChunkProcessorAnimGraphParameters::Process() - Failed to convert interface type %d to an attribute type.", attribType);
return false;
}
const AZ::TypeId parameterTypeId = EMotionFX::FileFormat::GetParameterTypeIdForInterfaceType(paramInfo.mInterfaceType);
const AZStd::string name = SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
AZStd::unique_ptr<EMotionFX::Parameter> newParam(EMotionFX::ParameterFactory::Create(parameterTypeId));
AZ_Assert(azrtti_istypeof<EMotionFX::ValueParameter>(newParam.get()), "Expected a value parameter");
if (!newParam)
{
MCore::LogError("EMotionFX::ChunkProcessorAnimGraphParameters::Process() - Failed to create parameter: '%s'.", name.c_str());
return false;
}
// read the strings
newParam->SetName(name);
SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType); // We dont use internal name anymore
newParam->SetDescription(SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType));
// log the details
if (GetLogging())
{
MCore::LogDetailedInfo("- Parameter #%d:", p);
MCore::LogDetailedInfo(" + Name = %s", newParam->GetName().c_str());
MCore::LogDetailedInfo(" + Description = %s", newParam->GetDescription().c_str());
MCore::LogDetailedInfo(" + type = %s", newParam->RTTI_GetTypeName());
MCore::LogDetailedInfo(" + Attribute type = %d", paramInfo.mAttributeType);
MCore::LogDetailedInfo(" + Has MinMax = %d", paramInfo.mHasMinMax);
MCore::LogDetailedInfo(" + Flags = %d", paramInfo.mFlags);
}
MCore::Attribute* attr(MCore::GetAttributeFactory().CreateAttributeByType(attribType));
EMotionFX::ValueParameter* valueParameter = static_cast<EMotionFX::ValueParameter*>(newParam.get());
// create the min, max and default value attributes
if (paramInfo.mHasMinMax == 1)
{
// min value
attr->Read(file, importParams.mEndianType);
valueParameter->SetMinValueFromAttribute(attr);
// max value
attr->Read(file, importParams.mEndianType);
valueParameter->SetMaxValueFromAttribute(attr);
}
// default value
attr->Read(file, importParams.mEndianType);
valueParameter->SetDefaultValueFromAttribute(attr);
delete attr;
// Parameters were previously stored in "AttributeSettings". The calss supported
// multiple values, however, the UI did not, so this ended up not being used.
// Support for multiple values in parameters is possible, however we dont need it now.
// Leaving this code as reference
for (uint32 i = 0; i < paramInfo.mNumComboValues; ++i)
{
SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
}
if (!animGraph->AddParameter(newParam.get()))
{
MCore::LogError("EMotionFX::ChunkProcessorAnimGraphParameters::Process() - Failed to add parameter: '%s'.", name.c_str());
return false;
}
newParam.release(); // ownership moved to animGraph
}
return true;
}
// animGraph node groups
bool ChunkProcessorAnimGraphNodeGroups::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
AnimGraph* animGraph = importParams.mAnimGraph;
MCORE_ASSERT(animGraph);
// read the number of node groups
uint32 numNodeGroups;
file->Read(&numNodeGroups, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&numNodeGroups, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo("- Num Node Groups = %d", numNodeGroups);
}
// read all node groups
for (uint32 g = 0; g < numNodeGroups; ++g)
{
// read the node group header
FileFormat::AnimGraph_NodeGroup nodeGroupChunk;
file->Read(&nodeGroupChunk, sizeof(FileFormat::AnimGraph_NodeGroup));
MCore::RGBAColor emfxColor(nodeGroupChunk.mColor.mR, nodeGroupChunk.mColor.mG, nodeGroupChunk.mColor.mB, nodeGroupChunk.mColor.mA);
// convert endian
MCore::Endian::ConvertUnsignedInt32(&nodeGroupChunk.mNumNodes, importParams.mEndianType);
MCore::Endian::ConvertRGBAColor(&emfxColor, importParams.mEndianType);
const AZ::Color color128 = MCore::EmfxColorToAzColor(emfxColor);
const AZ::u32 color32 = color128.ToU32();
const char* groupName = SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
const uint32 numNodes = nodeGroupChunk.mNumNodes;
// create and fill the new node group
AnimGraphNodeGroup* nodeGroup = aznew AnimGraphNodeGroup(groupName);
animGraph->AddNodeGroup(nodeGroup);
nodeGroup->SetIsVisible(nodeGroupChunk.mIsVisible != 0);
nodeGroup->SetColor(color32);
// set the nodes of the node group
MCore::Array<AnimGraphNode*>& blendNodes = SharedHelperData::GetBlendNodes(importParams.mSharedData);
nodeGroup->SetNumNodes(numNodes);
for (uint32 i = 0; i < numNodes; ++i)
{
// read the node index of the current node inside the group
uint32 nodeNr;
file->Read(&nodeNr, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&nodeNr, importParams.mEndianType);
MCORE_ASSERT(nodeNr != MCORE_INVALIDINDEX32);
// set the id of the given node to the group
if (nodeNr != MCORE_INVALIDINDEX32 && blendNodes[nodeNr])
{
nodeGroup->SetNode(i, blendNodes[nodeNr]->GetId());
}
else
{
nodeGroup->SetNode(i, AnimGraphNodeId::InvalidId);
}
}
// log the details
if (GetLogging())
{
MCore::LogDetailedInfo("- Node Group #%d:", g);
MCore::LogDetailedInfo(" + Name = %s", nodeGroup->GetName());
MCore::LogDetailedInfo(" + Color = (%.2f, %.2f, %.2f, %.2f)", static_cast<float>(color128.GetR()), static_cast<float>(color128.GetG()), static_cast<float>(color128.GetB()), static_cast<float>(color128.GetA()));
MCore::LogDetailedInfo(" + Num Nodes = %i", nodeGroup->GetNumNodes());
}
}
return true;
}
// animGraph group parameters
bool ChunkProcessorAnimGraphGroupParameters::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
AnimGraph* animGraph = importParams.mAnimGraph;
MCORE_ASSERT(animGraph);
// read the number of group parameters
uint32 numGroupParameters;
file->Read(&numGroupParameters, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&numGroupParameters, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo("- Num group parameters = %d", numGroupParameters);
}
// Group parameters is going to re-shuffle the value parameter indices, therefore we
// need to update the connections downstream of parameter nodes.
EMotionFX::ValueParameterVector valueParametersBeforeChange = animGraph->RecursivelyGetValueParameters();
// Since relocating a parameter to another parent changes its index, we are going to
// compute all the relationships leaving the value parameters at the root, then relocate
// them.
AZStd::vector<AZStd::pair<const EMotionFX::GroupParameter*, EMotionFX::ParameterVector> > parametersByGroup;
// read all group parameters
for (uint32 g = 0; g < numGroupParameters; ++g)
{
// read the group parameter header
FileFormat::AnimGraph_GroupParameter groupChunk;
file->Read(&groupChunk, sizeof(FileFormat::AnimGraph_GroupParameter));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&groupChunk.mNumParameters, importParams.mEndianType);
const char* groupName = SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
const uint32 numParameters = groupChunk.mNumParameters;
// create and fill the new group parameter
AZStd::unique_ptr<EMotionFX::Parameter> parameter(EMotionFX::ParameterFactory::Create(azrtti_typeid<EMotionFX::GroupParameter>()));
parameter->SetName(groupName);
// Previously collapsed/expanded state in group parameters was stored in the animgraph file. However, that
// would require to check out the animgraph file if you expand/collapse a group. Because this change was not
// done through commands, the dirty state was not properly restored.
// Collapsing state should be more of a setting per-user than something saved in the animgraph
//groupParameter->SetIsCollapsed(groupChunk.mCollapsed != 0);
if (!animGraph->AddParameter(parameter.get()))
{
continue;
}
const EMotionFX::GroupParameter* groupParameter = static_cast<EMotionFX::GroupParameter*>(parameter.release());
parametersByGroup.emplace_back(groupParameter, EMotionFX::ParameterVector());
AZStd::vector<EMotionFX::Parameter*>& parametersInGroup = parametersByGroup.back().second;
// set the parameters of the group parameter
for (uint32 i = 0; i < numParameters; ++i)
{
// read the parameter index
uint32 parameterIndex;
file->Read(&parameterIndex, sizeof(uint32));
MCore::Endian::ConvertUnsignedInt32(&parameterIndex, importParams.mEndianType);
MCORE_ASSERT(parameterIndex != MCORE_INVALIDINDEX32);
if (parameterIndex != MCORE_INVALIDINDEX32)
{
const EMotionFX::Parameter* childParameter = animGraph->FindValueParameter(parameterIndex);
parametersInGroup.emplace_back(const_cast<EMotionFX::Parameter*>(childParameter));
}
}
// log the details
if (GetLogging())
{
MCore::LogDetailedInfo("- Group parameter #%d:", g);
MCore::LogDetailedInfo(" + Name = %s", groupParameter->GetName().c_str());
MCore::LogDetailedInfo(" + Num Parameters = %i", groupParameter->GetNumParameters());
}
}
// Now move the parameters to their groups
for (const AZStd::pair<const EMotionFX::GroupParameter*, EMotionFX::ParameterVector>& groupAndParameters : parametersByGroup)
{
const EMotionFX::GroupParameter* groupParameter = groupAndParameters.first;
for (EMotionFX::Parameter* parameter : groupAndParameters.second)
{
animGraph->TakeParameterFromParent(parameter);
animGraph->AddParameter(const_cast<EMotionFX::Parameter*>(parameter), groupParameter);
}
}
const EMotionFX::ValueParameterVector valueParametersAfterChange = animGraph->RecursivelyGetValueParameters();
AZStd::vector<EMotionFX::AnimGraphObject*> affectedObjects;
animGraph->RecursiveCollectObjectsOfType(azrtti_typeid<EMotionFX::ObjectAffectedByParameterChanges>(), affectedObjects);
for (EMotionFX::AnimGraphObject* affectedObject : affectedObjects)
{
EMotionFX::ObjectAffectedByParameterChanges* affectedObjectByParameterChanges = azdynamic_cast<EMotionFX::ObjectAffectedByParameterChanges*>(affectedObject);
affectedObjectByParameterChanges->ParameterOrderChanged(valueParametersBeforeChange, valueParametersAfterChange);
}
return true;
}
// animGraph game controller settings
bool ChunkProcessorAnimGraphGameControllerSettings::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
uint32 i;
AnimGraph* animGraph = importParams.mAnimGraph;
MCORE_ASSERT(animGraph);
// get the game controller settings for the anim graph and clear it
AnimGraphGameControllerSettings& gameControllerSettings = animGraph->GetGameControllerSettings();
gameControllerSettings.Clear();
// read the number of presets and the active preset index
uint32 activePresetIndex, numPresets;
file->Read(&activePresetIndex, sizeof(uint32));
file->Read(&numPresets, sizeof(uint32));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&activePresetIndex, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&numPresets, importParams.mEndianType);
if (GetLogging())
{
MCore::LogDetailedInfo("- Game Controller Settings (NumPresets=%d, ActivePreset=%d)", numPresets, activePresetIndex);
}
// preallocate memory for the presets
gameControllerSettings.SetNumPresets(numPresets);
// read all presets
for (uint32 p = 0; p < numPresets; ++p)
{
// read the preset chunk
FileFormat::AnimGraph_GameControllerPreset presetChunk;
file->Read(&presetChunk, sizeof(FileFormat::AnimGraph_GameControllerPreset));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&presetChunk.mNumParameterInfos, importParams.mEndianType);
MCore::Endian::ConvertUnsignedInt32(&presetChunk.mNumButtonInfos, importParams.mEndianType);
// read the preset name and get the number of parameter and button infos
const char* presetName = SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
const uint32 numParamInfos = presetChunk.mNumParameterInfos;
const uint32 numButtonInfos = presetChunk.mNumButtonInfos;
// create and fill the new preset
AnimGraphGameControllerSettings::Preset* preset = aznew AnimGraphGameControllerSettings::Preset(presetName);
gameControllerSettings.SetPreset(p, preset);
// read the parameter infos
preset->SetNumParamInfos(numParamInfos);
for (i = 0; i < numParamInfos; ++i)
{
// read the parameter info chunk
FileFormat::AnimGraph_GameControllerParameterInfo paramInfoChunk;
file->Read(&paramInfoChunk, sizeof(FileFormat::AnimGraph_GameControllerParameterInfo));
// read the parameter name
const char* parameterName = SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
// construct and fill the parameter info
AnimGraphGameControllerSettings::ParameterInfo* parameterInfo = aznew AnimGraphGameControllerSettings::ParameterInfo(parameterName);
parameterInfo->m_axis = paramInfoChunk.mAxis;
parameterInfo->m_invert = (paramInfoChunk.mInvert != 0);
parameterInfo->m_mode = (AnimGraphGameControllerSettings::ParameterMode)paramInfoChunk.mMode;
preset->SetParamInfo(i, parameterInfo);
}
// read the button infos
preset->SetNumButtonInfos(numButtonInfos);
for (i = 0; i < numButtonInfos; ++i)
{
// read the button info chunk
FileFormat::AnimGraph_GameControllerButtonInfo buttonInfoChunk;
file->Read(&buttonInfoChunk, sizeof(FileFormat::AnimGraph_GameControllerButtonInfo));
// read the button string
const char* buttonString = SharedHelperData::ReadString(file, importParams.mSharedData, importParams.mEndianType);
// construct and fill the button info
AnimGraphGameControllerSettings::ButtonInfo* buttonInfo = aznew AnimGraphGameControllerSettings::ButtonInfo(buttonInfoChunk.mButtonIndex);
buttonInfo->m_mode = (AnimGraphGameControllerSettings::ButtonMode)buttonInfoChunk.mMode;
buttonInfo->m_string = buttonString;
preset->SetButtonInfo(i, buttonInfo);
}
// log the details
if (GetLogging())
{
MCore::LogDetailedInfo("- Preset '%s':", preset->GetName());
MCore::LogDetailedInfo(" + Num Param Infos = %d", preset->GetNumParamInfos());
MCore::LogDetailedInfo(" + Num Button Infos = %d", preset->GetNumButtonInfos());
}
}
// set the active preset
if (activePresetIndex != MCORE_INVALIDINDEX32)
{
AnimGraphGameControllerSettings::Preset* activePreset = gameControllerSettings.GetPreset(activePresetIndex);
gameControllerSettings.SetActivePreset(activePreset);
}
return true;
}
//----------------------------------------------------------------------------------------------------------
// MotionSet
//----------------------------------------------------------------------------------------------------------
// all submotions in one chunk
bool ChunkProcessorMotionSet::Process(MCore::File* file, Importer::ImportParameters& importParams)
{
const MCore::Endian::EEndianType endianType = importParams.mEndianType;
FileFormat::MotionSetsChunk motionSetsChunk;
file->Read(&motionSetsChunk, sizeof(FileFormat::MotionSetsChunk));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&motionSetsChunk.mNumSets, endianType);
// get the number of motion sets and iterate through them
const uint32 numMotionSets = motionSetsChunk.mNumSets;
for (uint32 i = 0; i < numMotionSets; ++i)
{
FileFormat::MotionSetChunk motionSetChunk;
file->Read(&motionSetChunk, sizeof(FileFormat::MotionSetChunk));
// convert endian
MCore::Endian::ConvertUnsignedInt32(&motionSetChunk.mNumChildSets, endianType);
MCore::Endian::ConvertUnsignedInt32(&motionSetChunk.mNumMotionEntries, endianType);
// get the parent set
const char* parentSetName = SharedHelperData::ReadString(file, importParams.mSharedData, endianType);
GetMotionManager().Lock();
MotionSet* parentSet = GetMotionManager().FindMotionSetByName(parentSetName, importParams.m_isOwnedByRuntime);
GetMotionManager().Unlock();
// read the motion set name and create our new motion set
const char* motionSetName = SharedHelperData::ReadString(file, importParams.mSharedData, endianType);
MotionSet* motionSet = aznew MotionSet(motionSetName, parentSet);
motionSet->SetIsOwnedByRuntime(importParams.m_isOwnedByRuntime);
// set the root motion set to the importer params motion set, this will be returned by the Importer::LoadMotionSet() function
if (parentSet == nullptr)
{
assert(importParams.mMotionSet == nullptr);
importParams.mMotionSet = motionSet;
}
// read the filename and set it
/*const char* motionSetFileName = */ SharedHelperData::ReadString(file, importParams.mSharedData, endianType);
//motionSet->SetFileName( motionSetFileName );
// in case this is not a root motion set add the new motion set as child set to the parent set
if (parentSet)
{
parentSet->AddChildSet(motionSet);
}
// Read all motion entries.
const uint32 numMotionEntries = motionSetChunk.mNumMotionEntries;
motionSet->ReserveMotionEntries(numMotionEntries);
AZStd::string nativeMotionFileName;
for (uint32 j = 0; j < numMotionEntries; ++j)
{
// read the motion entry
const char* motionFileName = SharedHelperData::ReadString(file, importParams.mSharedData, endianType);
nativeMotionFileName = motionFileName;
// read the string id and set it
const char* motionStringID = SharedHelperData::ReadString(file, importParams.mSharedData, endianType);
// add the motion entry to the motion set
MotionSet::MotionEntry* motionEntry = aznew MotionSet::MotionEntry(nativeMotionFileName.c_str(), motionStringID);
motionSet->AddMotionEntry(motionEntry);
}
}
return true;
}
//----------------------------------------------------------------------------------------------------------
// NodeMap
//----------------------------------------------------------------------------------------------------------
Gems/EMotionFX/Code/EMotionFX/Source/Importer/ChunkProcessors.h
-50
View File
@@ -16,8 +16,6 @@
#include "SharedFileFormatStructs.h"
#include "ActorFileFormat.h"
#include "MotionFileFormat.h"
#include "AnimGraphFileFormat.h"
#include "MotionSetFileFormat.h"
#include "NodeMapFileFormat.h"
#include "Importer.h"
#include <AzCore/std/containers/map.h>
@@ -32,7 +30,6 @@ namespace EMotionFX
class Importer;
class AnimGraphNode;
/**
* Shared importer data class.
* Chunks can load data, which might be shared between other chunks during import.
@@ -57,20 +54,11 @@ namespace EMotionFX
virtual void Reset() {}
protected:
/**
* The constructor.
*/
SharedData()
: BaseObject() {}
/**
* The destructor.
*/
virtual ~SharedData() { Reset(); }
};
/**
* Helper class for reading strings from files and file information storage.
*/
@@ -108,34 +96,12 @@ namespace EMotionFX
*/
static const char* ReadString(MCore::Stream* file, MCore::Array<SharedData*>* sharedData, MCore::Endian::EEndianType endianType);
/**
* Get the array of currently loaded anim graph nodes.
* @param sharedData The array which holds the shared data objects.
* @result The array of currently loaded anim graph nodes.
*/
static MCore::Array<AnimGraphNode*>& GetBlendNodes(MCore::Array<SharedData*>* sharedData);
/**
* Get the table to look up a state machine that needs an entry state as they are created.
* @param sharedData The array which holds the shared data objects.
* @result The map whose keys are the indices of entry states and the values are the IDs of the state machines that need those as entry states.
*/
static AZStd::map<AZ::u64, uint32>& GetEntryStateToStateMachineTable(MCore::Array<SharedData*>* sharedData);
/**
* Checks if the strings in the file are encoded using unicode or multi-byte based on the exporter date.
* The first official EMotion FX version to use unicode was compiled on 26th November 2012.
*/
static bool GetIsUnicodeFile(const char* dateString, MCore::Array<SharedData*>* sharedData);
public:
uint32 mFileHighVersion; /**< The high file version. For example 3 in case of v3.10. */
uint32 mFileLowVersion; /**< The low file version. For example 10 in case of v3.10. */
uint32 mStringStorageSize; /**< The size of the string buffer. */
bool mIsUnicodeFile; /**< True in case strings in the file are saved using unicode character set, false in case they are saved using multi-byte. */
char* mStringStorage; /**< The shared string buffer. */
MCore::Array<AnimGraphNode*> mBlendNodes; /**< Array of read anim graph nodes. */
AZStd::map<AZ::u64, uint32> m_entryNodeIndexToStateMachineIdLookupTable;
protected:
/**
* The constructor.
@@ -338,22 +304,6 @@ namespace EMotionFX
EMFX_CHUNKPROCESSOR(ChunkProcessorMotionMorphSubMotions, FileFormat::MOTION_CHUNK_MORPHSUBMOTIONS, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorMotionData, FileFormat::MOTION_CHUNK_MOTIONDATA, 1)
// Anim graph file format chunk processors
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphStateTransitions, FileFormat::ANIMGRAPH_CHUNK_STATETRANSITIONS, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphNodeConnections, FileFormat::ANIMGRAPH_CHUNK_NODECONNECTIONS, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphParameters, FileFormat::ANIMGRAPH_CHUNK_PARAMETERS, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphNodeGroups, FileFormat::ANIMGRAPH_CHUNK_NODEGROUPS, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphGroupParameters, FileFormat::ANIMGRAPH_CHUNK_GROUPPARAMETERS, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphGameControllerSettings, FileFormat::ANIMGRAPH_CHUNK_GAMECONTROLLERSETTINGS, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphNode, FileFormat::ANIMGRAPH_CHUNK_BLENDNODE, 1)
EMFX_CHUNKPROCESSOR(ChunkProcessorAnimGraphAdditionalInfo, FileFormat::ANIMGRAPH_CHUNK_ADDITIONALINFO, 1)
// motion set file format chunk processors
EMFX_CHUNKPROCESSOR(ChunkProcessorMotionSet, FileFormat::CHUNK_MOTIONSET, 1)
// node map file format chunk processors
EMFX_CHUNKPROCESSOR(ChunkProcessorNodeMap, FileFormat::CHUNK_NODEMAP, 1)
//-------------------------------------------------------------------------------------------------
} // namespace EMotionFX
Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.cpp
+34 -486
View File
@@ -156,85 +156,6 @@ namespace EMotionFX
return true;
}
// check if we can process the given motion set file
bool Importer::CheckIfIsValidMotionSetFile(MCore::File* f, MCore::Endian::EEndianType* outEndianType) const
{
MCORE_ASSERT(f->GetIsOpen());
// verify if we actually are dealing with a valid actor file
FileFormat::MotionSet_Header header;
if (f->Read(&header, sizeof(FileFormat::MotionSet_Header)) == 0)
{
MCore::LogError("Failed to read the motion set file header!");
return false;
}
// check the FOURCC
if (header.mFourCC[0] != 'M' || header.mFourCC[1] != 'O' || header.mFourCC[2] != 'S' || header.mFourCC[3] != ' ')
{
return false;
}
// read the chunks
switch (header.mEndianType)
{
case 0:
*outEndianType = MCore::Endian::ENDIAN_LITTLE;
break;
case 1:
*outEndianType = MCore::Endian::ENDIAN_BIG;
break;
default:
MCore::LogError("Unsupported endian type used! (endian type = %d)", header.mEndianType);
return false;
}
;
// yes, it is a valid motionset file!
return true;
}
// check if we can process the given anim graph file
bool Importer::CheckIfIsValidAnimGraphFile(MCore::File* f, MCore::Endian::EEndianType* outEndianType) const
{
MCORE_ASSERT(f->GetIsOpen());
// verify if we actually are dealing with a valid actor file
FileFormat::AnimGraph_Header header;
if (f->Read(&header, sizeof(FileFormat::AnimGraph_Header)) == 0)
{
return false;
}
// check the FOURCC
if (header.mFourCC[0] != 'A' || header.mFourCC[1] != 'N' || header.mFourCC[2] != 'G' || header.mFourCC[3] != 'R')
{
return false;
}
// read the chunks
switch (header.mEndianType)
{
case 0:
*outEndianType = MCore::Endian::ENDIAN_LITTLE;
break;
case 1:
*outEndianType = MCore::Endian::ENDIAN_BIG;
break;
default:
MCore::LogError("Unsupported endian type used! (endian type = %d)", header.mEndianType);
return false;
}
;
// yes, it is a valid anim graph file!
return true;
}
// check if we can process the given node map file
bool Importer::CheckIfIsValidNodeMapFile(MCore::File* f, MCore::Endian::EEndianType* outEndianType) const
{
@@ -599,125 +520,32 @@ namespace EMotionFX
//-------------------------------------------------------------------------------------------------
// try to load a motion set from disk
MotionSet* Importer::LoadMotionSet(AZStd::string filename, MotionSetSettings* settings, const AZ::ObjectStream::FilterDescriptor& loadFilter)
{
EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
const bool isLegacyFile = Importer::CheckFileType(filename.c_str()) == Importer::EFileType::FILETYPE_MOTIONSET;
if (!isLegacyFile)
AZ::SerializeContext* context = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
if (!context)
{
AZ::SerializeContext* context = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
if (!context)
{
AZ_Error("EMotionFX", false, "Can't get serialize context from component application.");
return nullptr;
}
EMotionFX::MotionSet* motionSet = EMotionFX::MotionSet::LoadFromFile(filename, context, loadFilter);
if (motionSet)
{
motionSet->SetFilename(filename.c_str());
}
return motionSet;
}
//////////////////////////////////////////
// Legacy file type loading
//////////////////////////////////////////
// check if we want to load the motion set even if a motion set with the given filename is already inside the motion manager
if (settings == nullptr || settings->mForceLoading == false)
{
// search the motion set inside the motion manager and return it if it already got loaded
MotionSet* motionSet = GetMotionManager().FindMotionSetByFileName(filename.c_str());
if (motionSet)
{
MCore::LogInfo(" + Motion set '%s' already loaded, returning already loaded motion set from the MotionManager.", filename.c_str());
return motionSet;
}
}
if (GetLogging())
{
MCore::LogInfo("- Trying to load motion set from file '%s'...", filename.c_str());
}
// try to open the file from disk
MCore::DiskFile f;
if (f.Open(filename.c_str(), MCore::DiskFile::READ) == false)
{
if (GetLogging())
{
MCore::LogError(" + Failed to open the file for motion set.");
}
AZ_Error("EMotionFX", false, "Can't get serialize context from component application.");
return nullptr;
}
// retrieve the filesize
const size_t fileSize = f.GetFileSize();
// create a temporary buffer for the file
uint8* fileBuffer = (uint8*)MCore::Allocate(fileSize, EMFX_MEMCATEGORY_IMPORTER);
// read in the complete file
f.Read(fileBuffer, fileSize);
// close the file again
f.Close();
// create the motion set reading from memory
MotionSet* result = LoadMotionSet(fileBuffer, fileSize, settings);
if (result)
EMotionFX::MotionSet* motionSet = EMotionFX::MotionSet::LoadFromFile(filename, context, loadFilter);
if (motionSet)
{
result->SetFilename(filename.c_str());
}
// delete the filebuffer again
MCore::Free(fileBuffer);
// check if it worked :)
if (result == nullptr)
{
if (GetLogging())
{
MCore::LogError(" + Failed to load motion set from file '%s'.", filename.c_str());
}
}
else
{
if (GetLogging())
{
MCore::LogInfo(" + Loading successfully finished.");
}
}
// return the result
return result;
}
MotionSet* Importer::LoadMotionSet(uint8* memoryStart, size_t lengthInBytes, MotionSetSettings* settings)
{
// Legacy file type loading.
MCore::MemoryFile memFile;
memFile.Open(memoryStart, lengthInBytes);
const bool isLegacyFile = Importer::CheckFileType(&memFile) == Importer::EFileType::FILETYPE_MOTIONSET;
if (isLegacyFile)
{
// Open the memory file again as CheckFileType() is closing it at the end.
memFile.Open(memoryStart, lengthInBytes);
EMotionFX::MotionSet* motionSet = LoadMotionSet(&memFile, settings);
motionSet->SetFilename(filename.c_str());
if (settings)
{
motionSet->SetIsOwnedByRuntime(settings->m_isOwnedByRuntime);
}
return motionSet;
}
return motionSet;
}
MotionSet* Importer::LoadMotionSet(uint8* memoryStart, size_t lengthInBytes, MotionSetSettings* settings)
{
AZ::SerializeContext* context = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
if (!context)
@@ -734,58 +562,6 @@ namespace EMotionFX
return motionSet;
}
// try to load a motion set from a file
MotionSet* Importer::LoadMotionSet(MCore::File* f, MotionSetSettings* settings)
{
MCORE_ASSERT(f);
MCORE_ASSERT(f->GetIsOpen());
// create the shared data
MCore::Array<SharedData*> sharedData;
sharedData.SetMemoryCategory(EMFX_MEMCATEGORY_IMPORTER);
PrepareSharedData(sharedData);
// load the file header
FileFormat::MotionSet_Header fileHeader;
f->Read(&fileHeader, sizeof(FileFormat::MotionSet_Header));
if (fileHeader.mFourCC[0] != 'M' || fileHeader.mFourCC[1] != 'O' || fileHeader.mFourCC[2] != 'S' || fileHeader.mFourCC[3] != ' ')
{
MCore::LogError("The motion set file is not a valid file.");
f->Close();
return nullptr;
}
// get the endian type
MCore::Endian::EEndianType endianType = (MCore::Endian::EEndianType)fileHeader.mEndianType;
// init the import parameters
ImportParameters params;
params.mSharedData = &sharedData;
params.mEndianType = endianType;
params.m_isOwnedByRuntime = settings ? settings->m_isOwnedByRuntime : false;
// read the chunks
while (ProcessChunk(f, params))
{
}
// close the file and return a pointer to the actor we loaded
f->Close();
// get rid of shared data
ResetSharedData(sharedData);
sharedData.Clear();
// check if the motion set got set
if (params.mMotionSet == nullptr)
{
return nullptr;
}
return params.mMotionSet;
}
//-------------------------------------------------------------------------------------------------
// load a node map by filename
@@ -1087,19 +863,6 @@ namespace EMotionFX
RegisterChunkProcessor(aznew ChunkProcessorMotionMorphSubMotions());
RegisterChunkProcessor(aznew ChunkProcessorMotionData());
// AnimGraph file format
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphParameters());
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphNodeGroups());
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphNode());
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphStateTransitions());
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphNodeConnections());
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphGroupParameters());
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphGameControllerSettings());
RegisterChunkProcessor(aznew ChunkProcessorAnimGraphAdditionalInfo());
// motion set file format
RegisterChunkProcessor(aznew ChunkProcessorMotionSet());
// node map
RegisterChunkProcessor(aznew ChunkProcessorNodeMap());
}
@@ -1232,6 +995,18 @@ namespace EMotionFX
return FILETYPE_UNKNOWN;
}
AZStd::string fileExtension;
AZ::StringFunc::Path::GetExtension(filename, fileExtension);
if (fileExtension == ".animgraph")
{
return FILETYPE_ANIMGRAPH;
}
if (fileExtension == ".motionset")
{
return FILETYPE_MOTIONSET;
}
// try to open the file from disk
MCore::MemoryFile memoryFile;
memoryFile.Open();
@@ -1272,14 +1047,6 @@ namespace EMotionFX
return FILETYPE_MOTION;
}
// check for motion set
file->Seek(0);
if (CheckIfIsValidMotionSetFile(file, &endianType))
{
file->Close();
return FILETYPE_MOTIONSET;
}
// check for node map
file->Seek(0);
if (CheckIfIsValidNodeMapFile(file, &endianType))
@@ -1288,14 +1055,6 @@ namespace EMotionFX
return FILETYPE_NODEMAP;
}
// check for anim graph
file->Seek(0);
if (CheckIfIsValidAnimGraphFile(file, &endianType))
{
file->Close();
return FILETYPE_ANIMGRAPH;
}
// close the file again
file->Close();
@@ -1304,124 +1063,30 @@ namespace EMotionFX
//---------------------------------------------------------
// load anim graph by filename
AnimGraph* Importer::LoadAnimGraph(AZStd::string filename, AnimGraphSettings* settings, const AZ::ObjectStream::FilterDescriptor& loadFilter)
AnimGraph* Importer::LoadAnimGraph(AZStd::string filename, const AZ::ObjectStream::FilterDescriptor& loadFilter)
{
EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
const bool isLegacyFile = Importer::CheckFileType(filename.c_str()) == Importer::EFileType::FILETYPE_ANIMGRAPH;
if (!isLegacyFile)
AZ::SerializeContext* context = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
if (!context)
{
AZ::SerializeContext* context = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
if (!context)
{
AZ_Error("EMotionFX", false, "Can't get serialize context from component application.");
return nullptr;
}
EMotionFX::AnimGraph* animGraph = EMotionFX::AnimGraph::LoadFromFile(filename, context, loadFilter);
if (animGraph)
{
animGraph->SetFileName(filename.c_str());
animGraph->RemoveInvalidConnections(); // Remove connections that have nullptr source node's, which happens when connections point to unknown nodes.
}
return animGraph;
}
//////////////////////////////////////////
// Legacy file type loading
//////////////////////////////////////////
// check if we want to load the anim graph even if a anim graph with the given filename is already inside the anim graph manager
if (settings == nullptr || settings->mForceLoading == false)
{
// search the anim graph inside the anim graph manager and return it if it already got loaded
AnimGraph* animGraph = GetAnimGraphManager().FindAnimGraphByFileName(filename.c_str());
if (animGraph)
{
MCore::LogInfo(" + Anim graph '%s' already loaded, returning already loaded anim graph from the AnimGraphManager.", filename.c_str());
return animGraph;
}
}
if (GetLogging())
{
MCore::LogInfo("- Trying to load anim graph from file '%s'...", filename.c_str());
}
// try to open the file from disk
MCore::DiskFile f;
if (!f.Open(filename.c_str(), MCore::DiskFile::READ))
{
if (GetLogging())
{
MCore::LogError(" + Failed to open the file for anim graph '%s', anim graph not loaded!", filename.c_str());
}
AZ_Error("EMotionFX", false, "Can't get serialize context from component application.");
return nullptr;
}
// retrieve the filesize
const size_t fileSize = f.GetFileSize();
// create a temporary buffer for the file
uint8* fileBuffer = (uint8*)MCore::Allocate(fileSize, EMFX_MEMCATEGORY_IMPORTER);
// read in the complete file
f.Read(fileBuffer, fileSize);
// close the file again
f.Close();
// create the actor reading from memory
AnimGraph* result = LoadAnimGraph(fileBuffer, fileSize, settings);
if (result)
EMotionFX::AnimGraph* animGraph = EMotionFX::AnimGraph::LoadFromFile(filename, context, loadFilter);
if (animGraph)
{
result->SetFileName(filename.c_str());
result->RemoveInvalidConnections(); // Remove connections that have nullptr source node's, which happens when connections point to unknown nodes.
animGraph->SetFileName(filename.c_str());
animGraph->RemoveInvalidConnections(); // Remove connections that have nullptr source node's, which happens when connections point to unknown nodes.
}
// delete the filebuffer again
MCore::Free(fileBuffer);
// check if it worked
if (result == nullptr)
{
if (GetLogging())
{
MCore::LogError(" + Failed to load anim graph from file '%s'", filename.c_str());
}
}
else
{
if (GetLogging())
{
MCore::LogInfo(" + Loading successfully finished");
}
}
// return the result
return result;
return animGraph;
}
// load the anim graph from memory
AnimGraph* Importer::LoadAnimGraph(uint8* memoryStart, size_t lengthInBytes, AnimGraphSettings* settings)
AnimGraph* Importer::LoadAnimGraph(uint8* memoryStart, size_t lengthInBytes)
{
// Legacy file type loading.
MCore::MemoryFile memFile;
memFile.Open(memoryStart, lengthInBytes);
const bool isLegacyFile = Importer::CheckFileType(&memFile) == Importer::EFileType::FILETYPE_ANIMGRAPH;
if (isLegacyFile)
{
// Open the memory file again as CheckFileType() is closing it at the end.
memFile.Open(memoryStart, lengthInBytes);
return LoadAnimGraph(&memFile, settings);
}
AZ::SerializeContext* context = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
if (!context)
@@ -1434,123 +1099,6 @@ namespace EMotionFX
return animGraph;
}
// load a anim graph from a file object
AnimGraph* Importer::LoadAnimGraph(MCore::File* f, AnimGraphSettings* settings)
{
MCORE_ASSERT(f);
MCORE_ASSERT(f->GetIsOpen());
// execute the pre-passes
if (f->GetType() != MCore::MemoryFile::TYPE_ID)
{
MCore::LogError("Given file is not a memory file. Cannot process pre-passes.");
return nullptr;
}
// copy over the actor settings, or use defaults
AnimGraphSettings animGraphSettings;
if (settings)
{
animGraphSettings = *settings;
}
// create the shared data
MCore::Array<SharedData*> sharedData;
sharedData.SetMemoryCategory(EMFX_MEMCATEGORY_IMPORTER);
PrepareSharedData(sharedData);
//-----------------------------------------------
// load the file header
FileFormat::AnimGraph_Header fileHeader;
f->Read(&fileHeader, sizeof(FileFormat::AnimGraph_Header));
if (fileHeader.mFourCC[0] != 'A' || fileHeader.mFourCC[1] != 'N' || fileHeader.mFourCC[2] != 'G' || fileHeader.mFourCC[3] != 'R')
{
MCore::LogError("The anim graph file is not a valid anim graph file.");
f->Close();
return nullptr;
}
// get the endian type
MCore::Endian::EEndianType endianType = (MCore::Endian::EEndianType)fileHeader.mEndianType;
// convert endian of the integer values
MCore::Endian::ConvertUnsignedInt32(&fileHeader.mFileVersion, endianType);
MCore::Endian::ConvertUnsignedInt32(&fileHeader.mNumNodes, endianType);
MCore::Endian::ConvertUnsignedInt32(&fileHeader.mNumStateTransitions, endianType);
MCore::Endian::ConvertUnsignedInt32(&fileHeader.mNumNodeConnections, endianType);
MCore::Endian::ConvertUnsignedInt32(&fileHeader.mNumParameters, endianType);
// read the anim graph name, create it, and read the other remaining info strings
SharedHelperData::ReadString(f, &sharedData, endianType);
AnimGraph* animGraph = aznew AnimGraph();
if (GetLogDetails())
{
MCore::LogDetailedInfo("Anim Graph:");
SharedHelperData::ReadString(f, &sharedData, endianType); // copyright
SharedHelperData::ReadString(f, &sharedData, endianType); // description
MCore::LogDetailedInfo(" + Company = %s", SharedHelperData::ReadString(f, &sharedData, endianType)); // company
MCore::LogDetailedInfo(" + EMotion FX Version= %s", SharedHelperData::ReadString(f, &sharedData, endianType)); // emfx version
MCore::LogDetailedInfo(" + EMStudio Build = %s", SharedHelperData::ReadString(f, &sharedData, endianType)); // emstudio build
MCore::LogDetailedInfo(" + Num nodes = %d", fileHeader.mNumNodes);
MCore::LogDetailedInfo(" + Num transitions = %d", fileHeader.mNumStateTransitions);
MCore::LogDetailedInfo(" + Num connections = %d", fileHeader.mNumNodeConnections);
MCore::LogDetailedInfo(" + Num parameters = %d", fileHeader.mNumParameters);
MCore::LogDetailedInfo(" + File version = %d", fileHeader.mFileVersion);
MCore::LogDetailedInfo(" + Endian type = %d", fileHeader.mEndianType);
}
else
{
SharedHelperData::ReadString(f, &sharedData, endianType); // copyright
SharedHelperData::ReadString(f, &sharedData, endianType); // description
SharedHelperData::ReadString(f, &sharedData, endianType); // company
SharedHelperData::ReadString(f, &sharedData, endianType); // emfx version
SharedHelperData::ReadString(f, &sharedData, endianType); // emstudio build
}
// init the import parameters
ImportParameters params;
params.mSharedData = &sharedData;
params.mEndianType = endianType;
params.mAnimGraph = animGraph;
params.mAnimGraphSettings = &animGraphSettings;
// pre-allocate the blend nodes array to prevent reallocs
MCore::Array<AnimGraphNode*>& blendNodes = SharedHelperData::GetBlendNodes(params.mSharedData);
blendNodes.Reserve(fileHeader.mNumNodes);
// process all chunks
while (ProcessChunk(f, params))
{
}
// close the file and return a pointer to the actor we loaded
f->Close();
// get rid of shared data
ResetSharedData(sharedData);
sharedData.Clear();
// recursively update attributes of all state machines and blend tree nodes
if (animGraph->GetRootStateMachine())
{
animGraph->InitAfterLoading();
animGraph->RemoveInvalidConnections(true); // Remove connections that have nullptr source node's, which happens when connections point to unknown nodes.
}
else
{
delete animGraph;
animGraph = nullptr;
}
// return the created actor
return animGraph;
}
// extract the file information from an actor file
bool Importer::ExtractActorFileInfo(FileInfo* outInfo, const char* filename) const
{
Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.h
+2 -63
View File
@@ -108,18 +108,15 @@ namespace EMotionFX
MCore::Array<uint32> mChunkIDsToIgnore; /**< Add the ID's of the chunks you wish to ignore. */
};
/**
* The motion set import options.
* This can be used in combination with the LoadMotionSet method.
*/
struct EMFX_API MotionSetSettings
{
bool mForceLoading = false; /**< Set to true in case you want to load the motion set even if a motion set with the given filename is already inside the motion manager. */
bool m_isOwnedByRuntime = false;
};
/**
* The node map import options.
* This can be used in combination with the LoadNodeMap method.
@@ -130,30 +127,15 @@ namespace EMotionFX
bool mLoadNodes = true; /**< Add nodes to the map? (default=true) */
};
/**
* The anim graph import settings.
*/
struct EMFX_API AnimGraphSettings
{
bool mForceLoading = false; /**< Set to true in case you want to load the anim graph even if an anim graph with the given filename is already inside the anim graph manager. */
bool mDisableNodeVisualization = true; /**< Force disabling of node visualization code execution inside the anim graph nodes? */
};
struct EMFX_API ImportParameters
{
Actor* mActor = nullptr;
Motion* mMotion = nullptr;
MotionSet* mMotionSet = nullptr;
Importer::ActorSettings* mActorSettings = nullptr;
Importer::MotionSettings* mMotionSettings = nullptr;
MCore::Array<SharedData*>* mSharedData = nullptr;
MCore::Endian::EEndianType mEndianType = MCore::Endian::ENDIAN_LITTLE;
AnimGraph* mAnimGraph = nullptr;
Importer::AnimGraphSettings* mAnimGraphSettings = nullptr;
NodeMap* mNodeMap = nullptr;
Importer::NodeMapSettings* mNodeMapSettings = nullptr;
bool m_isOwnedByRuntime = false;
@@ -250,43 +232,24 @@ namespace EMotionFX
//-------------------------------------------------------------------------------------------------
/**
* Load a anim graph file from a given file object.
* @param f The file object.
* @param settings The importer settings, or nullptr to use default settings.
* @result The anim graph object, or nullptr when failed.
*/
AnimGraph* LoadAnimGraph(MCore::File* f, AnimGraphSettings* settings = nullptr);
/**
* Load a anim graph file by filename.
* @param filename The filename to load from.
* @param settings The anim graph importer settings, or nullptr to use default settings.
* @param loadFilter The filter descriptor for loading anim graph from file
* @result The anim graph object, or nullptr in case loading failed.
*/
AnimGraph* LoadAnimGraph(AZStd::string, AnimGraphSettings* settings = nullptr, const AZ::ObjectStream::FilterDescriptor& loadFilter = AZ::ObjectStream::FilterDescriptor(nullptr, AZ::ObjectStream::FILTERFLAG_IGNORE_UNKNOWN_CLASSES));
AnimGraph* LoadAnimGraph(AZStd::string, const AZ::ObjectStream::FilterDescriptor& loadFilter = AZ::ObjectStream::FilterDescriptor(nullptr, AZ::ObjectStream::FILTERFLAG_IGNORE_UNKNOWN_CLASSES));
/**
* Load a anim graph file from a memory location.
* @param memoryStart The start address of the file in memory.
* @param lengthInBytes The length of the file, in bytes.
* @param settings The settings to use during loading, or nullptr when you want to use default settings, which would load everything.
* @result The anim graph object, or nullptr in case loading failed.
*/
AnimGraph* LoadAnimGraph(uint8* memoryStart, size_t lengthInBytes, AnimGraphSettings* settings = nullptr);
AnimGraph* LoadAnimGraph(uint8* memoryStart, size_t lengthInBytes);
//-------------------------------------------------------------------------------------------------
/**
* Load a motion set from a given file.
* A file does not have to be stored on disk, but can also be in memory or in an archive or on some network stream. Anything is possible.
* @param f The file to load the motion set from (after load, the file will be closed).
* @param settings The motion set importer settings, or nullptr to use default settings.
* @result The motion set object, or nullptr in case loading failed.
*/
MotionSet* LoadMotionSet(MCore::File* f, MotionSetSettings* settings = nullptr);
/**
* Loads a motion set from a file on disk.
* @param filename The name of the file on disk.
@@ -430,30 +393,6 @@ namespace EMotionFX
*/
bool CheckIfIsValidMotionFile(MCore::File* f, MCore::Endian::EEndianType* outEndianType) const;
/**
* Verify if the given file is a valid motion set file that can be processed by the importer.
* Please note that the specified must already been opened and must also be pointing to the location where the
* XPM file header will be stored (the start of the file). The file will not be closed after this method!
* The endian type of the file will be written inside the outEndianType parameter.
* Also note that the file position (read position / cursor) will point after the header after this function has been executed.
* @param f The file to perform the check on.
* @param outEndianType The value that will contain the endian type used by the file.
* @result Returns true when the file is a valid actor file that can be processed by the importer. Otherwise false is returned.
*/
bool CheckIfIsValidMotionSetFile(MCore::File* f, MCore::Endian::EEndianType* outEndianType) const;
/**
* Verify if the given file is a valid anim graph file that can be processed by the importer.
* Please note that the specified must already been opened and must also be pointing to the location where the
* XPM file header will be stored (the start of the file). The file will not be closed after this method!
* The endian type of the file will be written inside the outEndianType parameter.
* Also note that the file position (read position / cursor) will point after the header after this function has been executed.
* @param f The file to perform the check on.
* @param outEndianType The value that will contain the endian type used by the file.
* @result Returns true when the file is a valid actor file that can be processed by the importer. Otherwise false is returned.
*/
bool CheckIfIsValidAnimGraphFile(MCore::File* f, MCore::Endian::EEndianType* outEndianType) const;
/**
* Verify if the given file is a valid node map file that can be processed by the importer.
* Please note that the specified must already been opened and must also be pointing to the location where the
Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.cpp
-4772
View File
File diff suppressed because it is too large Load Diff
Gems/EMotionFX/Code/EMotionFX/Source/Importer/LegacyAnimGraphNodeParser.h
-259
View File
@@ -1,259 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/std/string/string.h>
#include <AzCore/Math/Vector2.h>
#include <MCore/Source/Endian.h>
#include <MCore/Source/LogManager.h>
#include "Importer.h"
#include "AnimGraphFileFormat.h"
#include "../AnimGraphObject.h"
#include <MCore/Source/File.h>
#include <EMotionFX/Source/AnimGraphObjectIds.h>
#include "../AnimGraphNode.h"
namespace EMotionFX
{
class AnimGraphNode;
class AnimGraphStateMachine;
class AnimGraphStateTransition;
class AnimGraphTransitionCondition;
class BlendTreeVector4ComposeNode;
class BlendTreeVector3ComposeNode;
class BlendTreeVector2ComposeNode;
class BlendTreeMorphTargetNode;
class BlendTreeFloatConstantNode;
class BlendTreeLookAtNode;
class BlendTreeTwoLinkIKNode;
class BlendTreeFloatMath1Node;
class AnimGraphStateTransition;
class AnimGraphStateMachine;
class BlendTreeRangeRemapperNode;
class BlendTreeSmoothingNode;
class BlendTreeVector3Math2Node;
class BlendTreeVector3Math1Node;
class BlendTreeFloatMath2Node;
class BlendTreeBlend2LegacyNode;
class AnimGraphVector2Condition;
class AnimGraphTimeCondition;
class AnimGraphTagCondition;
class AnimGraphStateCondition;
class AnimGraphPlayTimeCondition;
class AnimGraphParameterCondition;
class AnimGraphMotionCondition;
class BlendTreeBlendNNode;
class BlendTreeMaskLegacyNode;
class BlendTreeTransformNode;
class BlendTreeAccumTransformNode;
class AnimGraphMotionNode;
class BlendTreeVector4DecomposeNode;
class BlendTreeVector3DecomposeNode;
class BlendTreeVector2DecomposeNode;
class BlendTree;
class BlendTreePoseSwitchNode;
class BlendSpace2DNode;
class BlendSpace1DNode;
class BlendTreeParameterNode;
class AnimGraphExitNode;
class AnimGraphEntryNode;
class BlendTreeMirrorPoseNode;
class BlendTreeDirectionToWeightNode;
class AnimGraphBindPoseNode;
class BlendTreeFinalNode;
class AnimGraphNode;
class BlendTreeMotionFrameNode;
class BlendTreeFloatConditionNode;
class BlendTreeFloatSwitchNode;
class BlendTreeBoolLogicNode;
const AZ::TypeId GetNewTypeIdByOldNodeTypeId(uint32 oldNodeTypeId);
enum LegacyAttributeTypeId
{
ATTRIBUTE_FLOAT_TYPE_ID = 0x00000001,
ATTRIBUTE_INT32_TYPE_ID = 0x00000002,
ATTRIBUTE_BOOL_TYPE_ID = 0x00000004
};
enum LegacyERotationOrder
{
ROTATIONORDER_ZYX = 0,
ROTATIONORDER_ZXY = 1,
ROTATIONORDER_YZX = 2,
ROTATIONORDER_YXZ = 3,
ROTATIONORDER_XYZ = 4,
ROTATIONORDER_XZY = 5
};
class LegacyAttributeHeader
{
public:
LegacyAttributeHeader() { }
AZ::u32 GetAttributeType() const
{
return m_attribType;
}
AZ::u32 GetAttributeSize() const
{
return m_attributeSize;
}
static bool Parse(MCore::File* stream, MCore::Endian::EEndianType endianType, LegacyAttributeHeader& attributeHeader);
private:
LegacyAttributeHeader(const LegacyAttributeHeader& src) :
m_attribType(src.m_attribType)
, m_attributeSize(src.m_attributeSize)
, m_name(src.m_name)
{ }
AZ::u32 m_attribType;
AZ::u32 m_attributeSize;
AZStd::string m_name;
};
template <class T>
class LegacyAttribute
{
public:
bool Parse(MCore::File* stream, MCore::Endian::EEndianType endianType);
const T& GetValue() const;
private:
T m_value;
};
class LegacyAnimGraphNodeParser
{
public:
static bool ParseAnimGraphNodeChunk(MCore::File* file,
Importer::ImportParameters& importParams,
const char* nodeName,
FileFormat::AnimGraph_NodeHeader& nodeHeader,
AnimGraphNode*& node);
static bool ParseTransitionConditionChunk(MCore::File* file,
Importer::ImportParameters& importParams,
const FileFormat::AnimGraph_NodeHeader& nodeHeader,
AnimGraphTransitionCondition*& transitionCondition);
template <class T>
static bool ParseLegacyAttributes(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
static bool Forward(MCore::File* stream, size_t numBytes);
private:
static bool InitializeNodeGeneralData(const char* nodeName, Importer::ImportParameters& importParams, FileFormat::AnimGraph_NodeHeader& nodeHeader, AnimGraphNode* node);
static bool GetBlendSpaceNodeEvaluatorTypeId(uint32 legacyIndex, AZ::TypeId& value);
static bool ConvertFloatAttributeValueToBool(float value);
static bool TryGetFloatFromAttribute(MCore::File* stream, MCore::Endian::EEndianType endianType, const LegacyAttributeHeader& attributeHeader, float& outputValue);
template <class T>
static bool ParseAnimGraphNode(MCore::File* file,
Importer::ImportParameters& importParams,
const char* nodeName,
FileFormat::AnimGraph_NodeHeader& nodeHeader,
AnimGraphNode*& node)
{
node = aznew T();
node->SetAnimGraph(importParams.mAnimGraph);
if (!InitializeNodeGeneralData(nodeName, importParams, nodeHeader, node))
{
MCore::LogError("Error on initializing node general data");
return false;
}
if (!ParseLegacyAttributes<T>(file, nodeHeader.mNumAttributes, importParams.mEndianType, importParams, *node))
{
MCore::LogError("Unable to parse node legacy attributes");
return false;
}
return true;
}
template <class T>
static bool ParseAnimGraphTransitionCondition(MCore::File* file,
Importer::ImportParameters& importParams,
const FileFormat::AnimGraph_NodeHeader& header,
AnimGraphTransitionCondition*& transitionCondition)
{
transitionCondition = aznew T();
return ParseLegacyAttributes<T>(file, header.mNumAttributes, importParams.mEndianType, importParams, *transitionCondition);
}
};
template<class T, template<class> class LegacyAttribute>
class LegacyAttributeArray
{
public:
bool Parse(MCore::File* stream, MCore::Endian::EEndianType endianType);
const AZStd::vector< LegacyAttribute<T> >& GetValue() const;
private:
bool PopulateAttributeDynamicArray(MCore::File* stream, MCore::Endian::EEndianType endianType);
AZStd::vector< LegacyAttribute<T> > m_attributes;
// Used when reading version 2 attribute array
uint32 m_elementTypeId;
};
class LegacyAttributeSettingsParser
{
public:
static bool Parse(MCore::File* stream, MCore::Endian::EEndianType endianType);
};
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector4ComposeNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector3ComposeNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector2ComposeNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeMorphTargetNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeFloatConstantNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeLookAtNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeTwoLinkIKNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeFloatMath1Node>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphStateTransition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphStateMachine>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeRangeRemapperNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeSmoothingNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector3Math2Node>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector3Math1Node>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeFloatMath2Node>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeBlend2LegacyNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphVector2Condition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphTimeCondition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphTagCondition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphStateCondition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphPlayTimeCondition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphParameterCondition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphMotionCondition>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeBlendNNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeMaskLegacyNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeTransformNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeAccumTransformNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphMotionNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector4DecomposeNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector3DecomposeNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeVector2DecomposeNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTree>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreePoseSwitchNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendSpace2DNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendSpace1DNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeParameterNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphExitNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphEntryNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeMirrorPoseNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeDirectionToWeightNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphBindPoseNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeFinalNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<AnimGraphNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeMotionFrameNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeFloatConditionNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeFloatSwitchNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
template<> bool LegacyAnimGraphNodeParser::ParseLegacyAttributes<BlendTreeBoolLogicNode>(MCore::File* stream, uint32 numAttributes, MCore::Endian::EEndianType endianType, Importer::ImportParameters& importParams, AnimGraphObject& animGraphObject);
} // Namespace EMotionFX
Gems/EMotionFX/Code/EMotionFX/Source/Importer/MotionSetFileFormat.h
-60
View File
@@ -1,60 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
// include the shared structs
#include "SharedFileFormatStructs.h"
namespace EMotionFX
{
namespace FileFormat
{
// the chunks
enum
{
CHUNK_MOTIONSET = 500
};
struct MotionSet_Header
{
uint8 mFourCC[4]; // must be "MOS "
uint8 mHiVersion; // high version (2 in case of v2.34)
uint8 mLoVersion; // low version (34 in case of v2.34)
uint8 mEndianType; // the endian in which the data is saved [0=little, 1=big]
};
struct MotionSetsChunk
{
uint32 mNumSets; // the number of motion sets
// followed by:
// motionSets[mNumSets]
};
struct MotionSetChunk
{
uint32 mNumChildSets; // the number of child motion sets
uint32 mNumMotionEntries; // the number of motion entries
// followed by:
// string : the name of the parent set
// string : the name of the motion set
// string : the filename and path information (e.g. "Root/Motions/Human_Male/" // obsolete, this got removed and is now just an empty string
// motionEntries[mNumMotionEntries]: motion entries
// MotionEntry:
// string : motion filename without path (e.g. "Walk.motion")
// string : motion set string id (e.g. "WALK")
};
} // namespace FileFormat
} // namespace EMotionFX
Gems/EMotionFX/Code/EMotionFX/Source/Importer/SharedFileFormatStructs.h
+2 -26
View File
@@ -7,6 +7,7 @@
*/
#pragma once
#include <MCore/Source/Config.h>
namespace EMotionFX
@@ -20,8 +21,6 @@ namespace EMotionFX
SHARED_CHUNK_TIMESTAMP = 51
};
// a chunk
struct FileChunk
{
uint32 mChunkID; // the chunk ID
@@ -29,7 +28,6 @@ namespace EMotionFX
uint32 mVersion; // the version of the chunk
};
// color [0..1] range
struct FileColor
{
@@ -39,16 +37,12 @@ namespace EMotionFX
float mA; // alpha
};
// a 2D vector
struct FileVector2
{
float mX;
float mY;
};
// a 3D vector
struct FileVector3
{
float mX; // x+ = to the right
@@ -56,7 +50,6 @@ namespace EMotionFX
float mZ; // z+ = up
};
// a compressed 3D vector
struct File16BitVector3
{
@@ -65,7 +58,6 @@ namespace EMotionFX
uint16 mZ; // z+ = up
};
// a compressed 3D vector
struct File8BitVector3
{
@@ -74,8 +66,6 @@ namespace EMotionFX
uint8 mZ; // z+ = up
};
// a quaternion
struct FileQuaternion
{
float mX;
@@ -84,7 +74,6 @@ namespace EMotionFX
float mW;
};
// the 16 bit component quaternion
struct File16BitQuaternion
{
@@ -94,7 +83,6 @@ namespace EMotionFX
int16 mW;
};
// a time stamp chunk
struct FileTime
{
@@ -105,17 +93,5 @@ namespace EMotionFX
int8 mMinutes;
int8 mSeconds;
};
// attribute
struct FileAttribute
{
uint32 mDataType;
uint32 mNumBytes;
uint32 mFlags;
// followed by:
// uint8 mData[mNumBytes];
};
} // namespace FileFormat
} // namespace EMotionFX
} // namespace EMotionFX
Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake
-5
View File
@@ -364,16 +364,11 @@ set(FILES
Source/TwoStringEventData.h
Source/Importer/ChunkProcessors.cpp
Source/Importer/ChunkProcessors.h
Source/Importer/LegacyAnimGraphNodeParser.cpp
Source/Importer/LegacyAnimGraphNodeParser.h
Source/Importer/Importer.cpp
Source/Importer/Importer.h
Source/Importer/MotionSetFileFormat.h
Source/Importer/NodeMapFileFormat.h
Source/Importer/SharedFileFormatStructs.h
Source/Importer/ActorFileFormat.h
Source/Importer/AnimGraphFileFormat.cpp
Source/Importer/AnimGraphFileFormat.h
Source/Importer/MotionFileFormat.h
Source/Parameter/BoolParameter.cpp
Source/Parameter/BoolParameter.h
Gems/EMotionFX/Code/MCore/Source/Attribute.cpp
+1 -28
View File
@@ -6,7 +6,6 @@
*
*/
// include required headers
#include "Attribute.h"
#include "AttributeFactory.h"
#include "AttributeString.h"
@@ -14,20 +13,15 @@
namespace MCore
{
// constructor
Attribute::Attribute(uint32 typeID)
{
mTypeID = typeID;
}
// destructor
Attribute::~Attribute()
{
}
// equal operator
Attribute& Attribute::operator=(const Attribute& other)
{
if (&other != this)
@@ -36,25 +30,4 @@ namespace MCore
}
return *this;
}
// read the attribute
bool Attribute::Read(Stream* stream, Endian::EEndianType sourceEndianType)
{
// read the version
uint8 version;
if (stream->Read(&version, sizeof(uint8)) == 0)
{
return false;
}
// read the data
const bool result = ReadData(stream, sourceEndianType, version);
if (result == false)
{
return false;
}
return true;
}
} // namespace MCore
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/Attribute.h
-23
View File
@@ -8,7 +8,6 @@
#pragma once
// include the required headers
#include "StandardHeaders.h"
#include "MemoryManager.h"
#include "Endian.h"
@@ -28,7 +27,6 @@ namespace MCore
// forward declarations
class AttributeSettings;
// the attribute interface types
enum : uint32
{
@@ -49,12 +47,6 @@ namespace MCore
ATTRIBUTE_INTERFACETYPE_DEFAULT = 0xFFFFFFFF// use the default attribute type that the specific attribute class defines as default
};
/**
*
*
*
*/
class MCORE_API Attribute
{
friend class AttributeFactory;
@@ -70,10 +62,6 @@ namespace MCore
virtual uint32 GetClassSize() const = 0;
virtual uint32 GetDefaultInterfaceType() const = 0;
// These two members and ReadData can go away once we put the old-format parser
bool Read(Stream* stream, MCore::Endian::EEndianType sourceEndianType);
virtual uint32 GetDataSize() const = 0; // data only
Attribute& operator=(const Attribute& other);
virtual void NetworkSerialize(EMotionFX::Network::AnimGraphSnapshotChunkSerializer&) {};
@@ -82,16 +70,5 @@ namespace MCore
uint32 mTypeID; /**< The unique type ID of the attribute class. */
Attribute(uint32 typeID);
/**
* Read the attribute info and data from a given stream.
* Please note that the endian information of the actual data is not being converted. You have to handle that yourself.
* The data endian conversion could be done with for example the static Attribute::ConvertDataEndian method.
* @param stream The stream to read the info and data from.
* @param endianType The endian type in which the data is stored in the stream.
* @param version The version of the attribute.
* @result Returns true when successful, or false when reading failed.
*/
virtual bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) = 0;
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeBool.h
-18
View File
@@ -63,23 +63,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) {}
~AttributeBool() {}
uint32 GetDataSize() const override { return sizeof(int8); }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
MCORE_UNUSED(streamEndianType);
int8 streamValue;
if (stream->Read(&streamValue, sizeof(int8)) == 0)
{
return false;
}
mValue = (streamValue == 0) ? false : true;
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeColor.h
-22
View File
@@ -79,27 +79,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) { }
~AttributeColor() {}
uint32 GetDataSize() const override { return sizeof(RGBAColor); }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
// read the value
RGBAColor streamValue;
if (stream->Read(&streamValue, sizeof(RGBAColor)) == 0)
{
return false;
}
// convert endian
Endian::ConvertRGBAColor(&streamValue, streamEndianType);
mValue = streamValue;
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeFloat.h
-18
View File
@@ -57,8 +57,6 @@ namespace MCore
private:
float mValue; /**< The float value. */
uint32 GetDataSize() const override { return sizeof(float); }
AttributeFloat()
: Attribute(TYPE_ID)
, mValue(0.0f) {}
@@ -66,21 +64,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) {}
~AttributeFloat() {}
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
float streamValue;
if (stream->Read(&streamValue, sizeof(float)) == 0)
{
return false;
}
Endian::ConvertFloat(&streamValue, streamEndianType);
mValue = streamValue;
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeInt32.h
-18
View File
@@ -64,23 +64,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) {}
~AttributeInt32() {}
uint32 GetDataSize() const override { return sizeof(int32); }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
int32 streamValue;
if (stream->Read(&streamValue, sizeof(int32)) == 0)
{
return false;
}
Endian::ConvertSignedInt32(&streamValue, streamEndianType);
mValue = streamValue;
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributePointer.h
-13
View File
@@ -66,18 +66,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(pointer) { }
~AttributePointer() {}
uint32 GetDataSize() const override { return sizeof(void*); }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(stream);
MCORE_UNUSED(streamEndianType);
MCORE_UNUSED(version);
MCore::LogWarning("MCore::AttributePointer::ReadData() - Pointer attributes cannot be read from disk.");
return false;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeQuaternion.h
-21
View File
@@ -82,26 +82,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) {}
~AttributeQuaternion() { }
uint32 GetDataSize() const override { return sizeof(AZ::Quaternion); }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
// read the value
AZ::Quaternion streamValue;
if (stream->Read(&streamValue, sizeof(AZ::Quaternion)) == 0)
{
return false;
}
// convert endian
Endian::ConvertQuaternion(&streamValue, streamEndianType);
mValue = streamValue;
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeString.h
-35
View File
@@ -72,40 +72,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) { }
~AttributeString() { mValue.clear(); }
uint32 GetDataSize() const override
{
return sizeof(uint32) + static_cast<uint32>(mValue.size());
}
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
// read the number of characters
uint32 numCharacters;
if (stream->Read(&numCharacters, sizeof(uint32)) == 0)
{
return false;
}
// convert endian
Endian::ConvertUnsignedInt32(&numCharacters, streamEndianType);
if (numCharacters == 0)
{
mValue.clear();
return true;
}
mValue.resize(numCharacters);
if (stream->Read(mValue.data(), numCharacters) == 0)
{
return false;
}
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeVector2.h
-22
View File
@@ -78,27 +78,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) { }
~AttributeVector2() { }
uint32 GetDataSize() const override { return sizeofVector2; }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
// read the value
AZ::Vector2 streamValue;
if (stream->Read(&streamValue, sizeofVector2) == 0)
{
return false;
}
// convert endian
Endian::ConvertVector2(&streamValue, streamEndianType);
mValue = streamValue;
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeVector3.h
-22
View File
@@ -79,27 +79,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) { }
~AttributeVector3() { }
uint32 GetDataSize() const override { return sizeof(AZ::Vector3); }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
// read the value
AZ::PackedVector3f streamValue(0.0f);
if (stream->Read(&streamValue, sizeof(AZ::PackedVector3f)) == 0)
{
return false;
}
// convert endian
mValue = AZ::Vector3(streamValue.GetX(), streamValue.GetY(), streamValue.GetZ());
Endian::ConvertVector3(&mValue, streamEndianType);
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/MCore/Source/AttributeVector4.h
-22
View File
@@ -75,27 +75,5 @@ namespace MCore
: Attribute(TYPE_ID)
, mValue(value) { }
~AttributeVector4() { }
uint32 GetDataSize() const override { return sizeof(AZ::Vector4); }
// read from a stream
bool ReadData(MCore::Stream* stream, MCore::Endian::EEndianType streamEndianType, uint8 version) override
{
MCORE_UNUSED(version);
// read the value
AZ::Vector4 streamValue;
if (stream->Read(&streamValue, sizeof(AZ::Vector4)) == 0)
{
return false;
}
// convert endian
Endian::ConvertVector4(&streamValue, streamEndianType);
mValue = streamValue;
return true;
}
};
} // namespace MCore
Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp
+1 -2
View File
@@ -53,8 +53,7 @@ namespace EMotionFX
AnimGraphAsset* assetData = asset.GetAs<AnimGraphAsset>();
assetData->m_emfxAnimGraph.reset(EMotionFX::GetImporter().LoadAnimGraph(
assetData->m_emfxNativeData.data(),
assetData->m_emfxNativeData.size(),
nullptr));
assetData->m_emfxNativeData.size()));
if (assetData->m_emfxAnimGraph)
{
Gems/EMotionFX/Code/Tests/EMotionFXBuilderTests.cpp
-20
View File
@@ -97,16 +97,6 @@ namespace EMotionFX
ASSERT_EQ(productDependencies.size(), 0);
}
TEST_F(EMotionFXBuilderTests, TestLegacyAnimGraphAsset_NoDependency_OutputNoProductDependencies)
{
const AZStd::string fileName = "@devroot@/Gems/EMotionFX/Code/Tests/TestAssets/EMotionFXBuilderTestAssets/LegacyAnimGraphExample.animgraph";
AZStd::vector<AssetBuilderSDK::ProductDependency> productDependencies;
EMotionFXBuilder::AnimGraphBuilderWorker builderWorker;
ASSERT_TRUE(builderWorker.ParseProductDependencies(ResolvePath(fileName.c_str()), fileName, productDependencies));
ASSERT_EQ(productDependencies.size(), 0);
}
TEST_F(EMotionFXBuilderTests, TestMotionSetAsset_HasReferenceNode_OutputProductDependencies)
{
const AZStd::string fileName = "@devroot@/Gems/EMotionFX/Code/Tests/TestAssets/EMotionFXBuilderTestAssets/MotionSetExample.motionset";
@@ -150,14 +140,4 @@ namespace EMotionFX
AZ_TEST_STOP_ASSERTTEST(2);
ASSERT_EQ(productDependencies.size(), 0);
}
TEST_F(EMotionFXBuilderTests, TestLegacyMotionSetAsset_ReferenceMotionAssets_OutputProductDependencies)
{
const AZStd::string fileName = "@devroot@/Gems/EMotionFX/Code/Tests/TestAssets/EMotionFXBuilderTestAssets/LegacyMotionSetExample.motionset";
ProductPathDependencySet productDependencies;
EMotionFXBuilder::MotionSetBuilderWorker builderWorker;
ASSERT_TRUE(builderWorker.ParseProductDependencies(ResolvePath(fileName.c_str()), fileName, productDependencies));
ASSERT_EQ(productDependencies.size(), 25);
}
} // namespace EMotionFX
Gems/EMotionFX/Code/Tests/TestAssets/EMotionFXBuilderTestAssets/LegacyAnimGraphExample.animgraph
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33ff8a4f75b5ad918a833113fb45a21e9075b66a9d0ed8563ee34d93ae905aaf
size 50863
Gems/EMotionFX/Code/Tests/TestAssets/EMotionFXBuilderTestAssets/LegacyMotionSetExample.motionset
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ed5c6c8376df150ebddc8b16714012991c1892a94d2b8ad943a7f96563771e0
size 2518
Gems/EMotionFX/Code/Tests/TestAssets/Rin/rin.animgraph
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33ff8a4f75b5ad918a833113fb45a21e9075b66a9d0ed8563ee34d93ae905aaf
size 50863
oid sha256:8825feb4f0946979f8a1258cdf20bb71e358b7597eca1aaed552c2b0a17b2bd9
size 464733