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

Adapted loading calls to removed legacy file loading

Browse Source 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
This commit is contained in:
Benjamin Jillich
2021-07-26 09:59:19 +02:00
parent abc501e535
commit ff2649d0c8
5 changed files with 3 additions and 13 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/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/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)
{